diff --git a/src/components/mechanismTree/index.vue b/src/components/mechanismTree/index.vue index 2c83ad0be..fca2173aa 100644 --- a/src/components/mechanismTree/index.vue +++ b/src/components/mechanismTree/index.vue @@ -2,6 +2,7 @@
{ this.treeData = res.data - console.log(this.treeData); this.nodeKeyId = this.treeData[0].id this.id = res.data[0].id }, e => { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue index 489ce6cf1..959e597f7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step1-9.vue @@ -138,20 +138,20 @@ > + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center">
- - + +
+ prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center">
- - + +
+ prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> { this.histortData = res + console.log(res); }, e => { }) }, diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue index 285a5407a..0fc1b12b8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4-1.vue @@ -199,7 +199,7 @@ sortable="custom" align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> + prop="createTime" + label="创建时间" + sortable="custom" + align="center"> + prop="endTime" + label="完成时间" + align="center"> @@ -258,11 +258,15 @@
+ + @@ -386,6 +390,7 @@ ids: [], addForm: { unit: '', // 单位 + unitName: '', esName: '', // 企标名称 planStatus: '', // 计划状态 reviseStatus: '', // 制修订状态 @@ -446,20 +451,27 @@ methods: { drawerCheckZRBM (data) { let list = '' + let listName = '' for (let a = 0; a < data.length; a++) { if (list.length > 0) { list += ',' - list += data[a].name + list += data[a].id + listName += ',' + listName += data[a].name } else { - list = data[a].name + list = data[a].id + listName = data[a].name } } this.addForm.unit = list + this.addForm.unitName = listName this.modalshowflagZRBM = false }, choiceZRBM(id) { this.nodeListZRBM = [] - this.nodeListZRBM = id.split(',') + if (id) { + this.nodeListZRBM = id.split(',') + } this.modalshowflagZRBM = true }, QCDWOK () { @@ -629,6 +641,7 @@ this.DrawerType = 'edit' this.addDrawer = true this.addForm = { + unitName:command[0].unitName, id: command[0].id, unit: command[0].unit, // 单位 esName: command[0].esName, // 企标名称