Skip to content

M
mes-ui
Commit 073a6da5 authored by 周远喜's avatar 周远喜
Browse files
Options

ok

parent 05765173
Hide whitespace changes
Inline Side-by-side
Showing with 110 additions and 93 deletions
components/page/dtSpan.vue
View file @ 073a6da5
......@@ -11,7 +11,7 @@ export default {
name: 'dtSpan',
data() {
return {
date:""
date:"33333"
}
},
props: {
......
components/page/treeGrid/EditGrid.vue
View file @ 073a6da5
......@@ -14,7 +14,7 @@
<table>
<thead>
<tr>
<th v-for="(column, index) in cloneColumns" :key="index">
<th v-for="(column, index) in columns" :key="index" :style="tdStyle(column)">
<label v-if="column.type === 'selection'">
<Checkbox v-model="all"></Checkbox>
</label>
......@@ -81,6 +81,13 @@
<div v-if="column.type === 'icons'">
<Icon :type="item[column.key]" size="20" />
</div>
<DTSpan v-if="column.type=='date'" :value="item[column.key]"/>
<div v-if="column.type=='user'">
<User :value="item[column.key]"/>
</div>
<div v-if="column.type=='users'&&item[column.key]">
<User v-for="li in JSON.parse(item[column.key])" :value="li" :key="li" class="ml10"/>
</div>
<state
v-if="column.code"
:code="column.code"
......@@ -108,7 +115,7 @@
{{ renderBody(item, column) }}
</label>
<table-expand
v-if="column.render && !column.type && !column.solt"
v-if="column.render && !column.type&&!column.solt"
:row="item"
:column="column"
:index="snum"
......@@ -656,6 +663,7 @@ export default {
beforeDestroy() {
window.onresize = null;
},
};
</script>
<style lang="less">
......
i18n/locale/zh-CN.js
View file @ 073a6da5
......@@ -1812,7 +1812,7 @@ export default {
upId: '父级',
title: '标题',
status: '状态',
note: '备注',
note: '描述',
startDate: '开始日期',
endDate: '结束日期',
type: '类型',
......
pages/project/plan/add.vue
View file @ 073a6da5
......@@ -43,26 +43,26 @@
><FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber> </FormItem
></Col> -->
<Col :span="12"
<!-- <Col :span="12"
><FormItem :label="l('projectId')" prop="projectId">
<Input v-model="entity.projectId"></Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('upId')" prop="upId">
<Input v-model="entity.upId"></Input> </FormItem
></Col>
<Col :span="12"
></Col> -->
<Col :span="24"
><FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"> </Input> </FormItem
></Col>
<Col :span="12"
<!-- <Col :span="12"
><FormItem :label="l('status')" prop="status">
<Dictionary
code="mes.project_plan.Status"
v-model="entity.status"
type="radio"
></Dictionary> </FormItem
></Col>
></Col> -->
<Col :span="24"
><FormItem :label="l('note')" prop="note">
<Input
......@@ -93,20 +93,24 @@
type="radio"
></Dictionary> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('attachment')" prop="attachment">
<!-- <files ref="refFile" parms="parms" v-model="entity.attachment" files />-->
</FormItem
></Col>
<Col :span="12"
><FormItem :label="l('executor')" prop="executor">
<Input v-model="entity.executor"> </Input> </FormItem
<UserSelect v-model="entity.executor" multiple></UserSelect>
</FormItem>
</Col
>
<Col :span="24"
><FormItem :label="l('attachment')" prop="attachment">
<files
ref="refFile"
parms="parms"
v-model="entity.attachment"
files
/> </FormItem
></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" noClick
>保存</Button
>
<Button type="primary" @click="handleSubmit" noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -124,7 +128,7 @@ export default {
// isDeleted: null,
// deletionTime: null,
// deleterUserId: null,
projectId: "33930562-a9f7-bd95-88ab-d01eb1c4c369",
projectId: this.v.projectId,
upId: this.v.id,
title: "",
status: 0,
......@@ -137,7 +141,7 @@ export default {
},
parmsName: "app=material&eid=1&name=ProjectPlan",
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
title: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
......
pages/project/plan/edit.vue
View file @ 073a6da5
<template>
<Form ref="form" :model="entity" :rules="rules" :label-width="90">
<Row>
<Col :span="12"
<!-- <Col :span="12"
><FormItem :label="l('creationTime')" prop="creationTime">
<DatePicker
type="date"
......@@ -42,26 +42,27 @@
<Col :span="12"
><FormItem :label="l('deleterUserId')" prop="deleterUserId">
<InputNumber v-model="entity.deleterUserId"></InputNumber> </FormItem
></Col>
<Col :span="12"
></Col> -->
<!-- <Col :span="12"
><FormItem :label="l('projectId')" prop="projectId">
<InputNumber v-model="entity.projectId"></InputNumber> </FormItem
<Input v-model="entity.projectId"></Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('upId')" prop="upId">
<InputNumber v-model="entity.upId"></InputNumber> </FormItem
></Col>
<Col :span="12"
<Input v-model="entity.upId"></Input> </FormItem
></Col> -->
<Col :span="24"
><FormItem :label="l('title')" prop="title">
<Input v-model="entity.title"> </Input> </FormItem
></Col>
<Col :span="12"
<!-- <Col :span="12"
><FormItem :label="l('status')" prop="status">
<Dictionary
code="mes.project_plan.Status"
v-model="entity.status"
type="radio"
></Dictionary> </FormItem
></Col>
></Col> -->
<Col :span="24"
><FormItem :label="l('note')" prop="note">
<Input
......@@ -89,19 +90,27 @@
<Dictionary
code="mes.project_plan.Type"
v-model="entity.type"
type="radio"
></Dictionary> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('attachment')" prop="attachment">
<Input v-model="entity.attachment"> </Input> </FormItem
></Col>
<Col :span="12"
><FormItem :label="l('executor')" prop="executor">
<Input v-model="entity.executor"> </Input> </FormItem
<UserSelect v-model="entity.executor" multiple></UserSelect>
</FormItem>
</Col
>
<Col :span="24"
><FormItem :label="l('attachment')" prop="attachment">
<files
ref="refFile"
parms="parms"
v-model="entity.attachment"
files
/> </FormItem
></Col>
</Row>
<FormItem>
<Button type="primary" @click="handleSubmit" v-noClick>保存</Button>
<Button type="primary" @click="handleSubmit" noClick>保存</Button>
<Button @click="handleClose" class="ml20">取消</Button>
</FormItem>
</Form>
......@@ -114,15 +123,15 @@ export default {
return {
entity: {},
rules: {
name: [{ required: true, message: "必填", trigger: "blur" }],
title: [{ required: true, message: "必填", trigger: "blur" }],
},
};
},
props: {
eid: Number,
eid: [Number,String],
},
mounted() {
if (this.eid > 0) {
if (this.eid) {
this.load(this.eid);
}
},
......@@ -130,6 +139,7 @@ export default {
load(v) {
Api.get({ id: v }).then((r) => {
this.entity = r.result;
this.entity.executor=JSON.parse(this.entity.executor);
});
},
handleSubmit() {
......@@ -161,7 +171,7 @@ export default {
},
watch: {
eid(v) {
if (v != 0) {
if (v) {
this.load(v);
}
},
......
pages/project/plan/index.vue
View file @ 073a6da5
<template>
<div>
<Card class="mb20">
<p slot="extra">
<Icon type="ios-arrow-down" />
</p>
项目信息
<op/>
<Actions />
</Card>
<Card>
<TreeGrid :columns="columns" ref="grid" :items="list"
<EditGrid :columns="columns" ref="grid" :items="list"
>
<template slot="easySearch"><Form ref="formInline" :model="easySearch" inline><FormItem prop="keys"><Input placeholder="请输入关键字标题" v-model="easySearch.keys.value" /> </FormItem>
<FormItem><Button type="primary" @click="search">查询</Button></FormItem>
<FormItem><Button type="primary" @click="search">查询</Button>
</FormItem>
</Form></template>
<!-- <template slot="searchForm">
<Search />
......@@ -20,7 +13,7 @@
<template slot="buttons">
<Button type="primary" @click="add(null)">新增</Button>
</template>
</TreeGrid>
</EditGrid>
</Card>
<Modal v-model="modal" :title="title" width="1200" footer-hide>
<component :is="detail" :eid="curId" :v="row" @on-close="cancel" @on-ok="ok" />
......@@ -41,7 +34,10 @@ export default {
description: "project_plan 10/19/2020 10:23:07 AM",
},
props:{
v:{
eid:{
type:String
},
data:{
type:Object,
default:()=>{
return {
......@@ -100,11 +96,11 @@ export default {
h(
"op",
{
attrs: { icon: "ios-trash",
attrs: { icon: "md-arrow-dropright-circle",
type: "icon",
title: "复制",
oprate: "add",
msg: "确认要移出排产吗？" },
title: "派发",
oprate: "edit",
},
on: { click: () => this.copy(params.row.id) },
},
),
......@@ -114,7 +110,7 @@ export default {
attrs: { icon: "md-add",
type: "icon",
title: "新增子任务",
oprate: "add",},
oprate: "edit",},
on: { click: () => this.add(params.row) },
}
),
......@@ -169,9 +165,10 @@ export default {
key: "startDate",
title: this.l("startDate"),
align: "left",
high: true,
high: true
,type:"date"
},
{ key: "endDate", title: this.l("endDate"), align: "left", high: true },
{ key: "endDate", title: this.l("endDate"), align: "left", high: true,type:"date" },
// {
// key: "attachment",
// title: this.l("attachment"),
......@@ -183,6 +180,7 @@ export default {
title: this.l("executor"),
align: "left",
high: true,
type:"users",
},
],
};
......@@ -198,7 +196,7 @@ export default {
ok() {
this.search();
this.modal = false;
this.curId = 0;
this.curId = null;
},
search() {
// this.$refs.grid.reload(this.easySearch);
......@@ -206,7 +204,7 @@ export default {
conditions: [{
fieldName:"projectId",
conditionalType: 'Equal',
fieldValue:this.v.id
fieldValue:this.eid
}],
// conditions: []
};
......@@ -214,7 +212,7 @@ export default {
let res = r.result;
var data = this.$u.toTree(
res,
"33930562-a9f7-bd95-88ab-d01eb1c4c369",
null,
(u) => {
// console.log(u);
u.expanded = true;
......@@ -236,8 +234,16 @@ export default {
// }
// },
add(row) {
this.curId=row.id;
this.row=row
if(row){
this.curId=row.id;
this.row=row
}else{
this.curId=null;
this.row={
projectId:this.data.id
}
}
this.title = "新增";
this.detail = () => import("./add");
this.modal = true;
......@@ -269,31 +275,10 @@ export default {
});
},
cancel() {
this.curId = 0;
this.curId = null;
this.modal = false;
},
l(key) {
/*
project_plan:{
creationTime:'创建时间',
creatorUserId:'创建人',
lastModificationTime:'更新时间',
lastModifierUserId:'更新人',
isDeleted:'删除人',
deletionTime:'删除时间',
deleterUserId:'删除人',
projectId:'项目id',
upId:'父级',
title:'标题',
status:'状态',
note:'备注',
startDate:'开始日期',
endDate:'结束日期',
type:'类型',
attachment:'附件',
executor:'执行人',
}
*/
let vkey = "project_plan" + "." + key;
return this.$t(vkey) || key;
},
......
pages/project/project/add.vue
View file @ 073a6da5
......@@ -89,7 +89,7 @@
v-model="entity.endDate"
></DatePicker> </FormItem
></Col>
<!-- <TimeDifference :timeValue="timeValue"></TimeDifference> -->
<TimeDifference :timeValue="timeValue"></TimeDifference>
<Col :span="12"
><FormItem :label="l('type')" prop="type">
<Dictionary
......
pages/project/project/detail.vue
View file @ 073a6da5
......@@ -18,17 +18,27 @@
</div>
<ul>
<li>
<a @click="details"> <Icon type="ios-log-in" />&nbsp;详情 </a>
<a @click="details"> <Icon type="ios-log-in" />详情 </a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="template"> <Icon type="ios-photos" />&nbsp;模板 </a>
<a @click="template"> <Icon type="ios-photos" />模版</a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="task"> <Icon type="md-create" />&nbsp;任务 </a>
<a @click="task"> <Icon type="md-create" />任务 </a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="task"> <Icon type="md-create" />成员 </a>
&nbsp;
<span>|</span>
</li>
<li>
<a @click="task"> <Icon type="md-create" />动态 </a>
&nbsp;
<span>|</span>
</li>
......@@ -37,7 +47,7 @@
<div class="body-document">
<h4 v-text="title"></h4>
<keep-alive>
<component v-bind:is="detail" :eid="eid"></component>
<component v-bind:is="detail" :eid="eid" :data="entity"></component>
</keep-alive>
</div>
</div>
......@@ -88,12 +98,12 @@ export default {
},
template() {
// this.curId = this.eid;
this.title = "模板";
// this.detail = () => import("./add");
this.title = "项目模板";
this.detail = () => import("../plan");
},
task() {
// this.curId = this.eid;
this.title = "任务";
this.title = "项目任务";
// this.detail = () => import("./add");
},
l(key) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment