diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue index 7a653f206..9c254a3a2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/cancel.vue @@ -37,10 +37,10 @@ - + @@ -70,18 +70,18 @@ - + - + @@ -181,17 +181,17 @@ label="制修订状态"> @@ -339,13 +339,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue index 2c1a0851c..3625153cd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/delay.vue @@ -37,10 +37,10 @@ - + @@ -78,18 +78,18 @@ - + - + @@ -197,17 +197,17 @@ label="制修订状态"> @@ -361,13 +361,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue index d8fa3bc70..bf18da11c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/establish.vue @@ -64,17 +64,33 @@ placeholder="请选择计划标准发布时间"> - - - - + +
+ + +
+ 手动查找 +
+
+ + + + + + + + + + + + + + + + + + @@ -118,6 +155,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', roleType: '', @@ -197,6 +237,20 @@ export default { }) }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit.length > 0) { + let str = this.qbfsForm.unit.replace(/,/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index d55961518..fcd6efb7b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -81,16 +81,21 @@ placeholder="请选择初稿完成时间"> - - - - + +
+ + +
+ 手动查找 +
+
@@ -107,7 +112,7 @@ @click.native="choiceZRRS('1')">
- + @@ -207,17 +212,17 @@ label="制修订状态"> @@ -272,6 +277,27 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + + + + + + + @@ -286,6 +312,9 @@ export default { props: ['message'], data(){ return { + QCDWmodal: false, + QCDWValue: [], + QCDWList: [], drawerTitle2: '', drawerTitle: '', type: '', @@ -404,6 +433,20 @@ export default { } }, methods: { + QCDWOK () { + let arr1 = [] + if (this.qbfsForm.unit.length > 0) { + let str = this.qbfsForm.unit.replace(/,/g, ',') + arr1 = str.split(',') + } + let arr2 = arr1.concat(this.QCDWValue) + this.qbfsForm.unit = Array.from(new Set(arr2)).join(',') + this.QCDWmodal = false + }, + QCDWClick () { + this.QCDWValue = [] + this.QCDWmodal = true + }, choiceZRR() { this.nodeList = []; this.drawerTitle = '请选择工作组组长'; diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index 027d2d449..f26e7448b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -37,10 +37,10 @@ - + @@ -69,18 +69,18 @@ - + - + @@ -188,17 +188,17 @@ label="制修订状态"> @@ -349,13 +349,13 @@ export default { this.qbfsForm.esId = this.selectList[0].id this.qbfsForm.esName = this.selectList[0].esName this.qbfsForm.draftTime = this.selectList[0].draftTime - this.qbfsForm.drafter = this.selectList[0].drafter + this.qbfsForm.drafterName = this.selectList[0].drafterName this.qbfsForm.planStatus = this.selectList[0].planStatus this.qbfsForm.releaseTime = this.selectList[0].releaseTime - this.qbfsForm.resPerson = this.selectList[0].resPerson + this.qbfsForm.resPersonName = this.selectList[0].resPersonName this.qbfsForm.reviseStatus = this.selectList[0].reviseStatus this.qbfsForm.unit = this.selectList[0].unit - this.qbfsForm.wgLeader = this.selectList[0].wgLeader + this.qbfsForm.wgLeaderName = this.selectList[0].wgLeaderName this.ListModel = false } },