From f5b48aa1ace14f82b3fa2560c1e516c24ee0c179 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 7 Mar 2022 14:50:58 +0800 Subject: [PATCH 01/41] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=9A=82=E6=97=B6=E6=B3=A8=E9=87=8A=E6=8E=89=E5=82=AC=E5=8A=9E?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/processDetail/index.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index d8cb45bf9..dc6551056 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -38,11 +38,11 @@ - 催办 + + + + +
Date: Mon, 7 Mar 2022 14:53:26 +0800 Subject: [PATCH 02/41] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7=E9=A9=B3=E5=9B=9E?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=BF=9B=E5=85=A5=E9=A1=B5=E9=9D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 2 +- .../qbzxdjhgk/component/merge.vue | 2 +- .../pages/creatProcess/qbzxdjhgk/step1.vue | 56 +++++++++++-------- .../tabComponents/processCenter/index.vue | 2 +- 4 files changed, 36 insertions(+), 26 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 48daaee9f..491634fc6 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1674,7 +1674,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '企标制修订计划整改') { + }else if(row.taskInfo === '重新起草') { this.$router.push({ name: 'qbzxdjhgkStep1', query: { diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue index eb413388b..f41b18984 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/merge.vue @@ -786,7 +786,7 @@ export default { _this: this }, res => { this.workData = res.data.records; - this.total = res.data.total; + this.totalNo = res.data.total; }, e => { }); }, diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index ed5506ad4..372939517 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -275,6 +275,7 @@ export default { }, data() { return { + submitFlag: '', toggleType: '5', comFlag: 1, active: "1", @@ -338,7 +339,8 @@ export default { if(this.taskId){ this.approvalFlag = true this.processTable() - this.getData(); + //被驳回时调用 + this.getHistoryData() } }, methods: { @@ -355,16 +357,6 @@ export default { }, e => { }) }, - getDatas(){ - queryTaskFirst({ - bpnId: this.$route.query.bpnId - }).then(res => { - let mes = JSON.parse(res.mes) - this.roleForm = mes.roleForm - this.qbfsForm = mes.qbfsForm - this.commentText = mes.commentText - }); - }, getData() { this.formLoading = true this.showFlag = false @@ -375,11 +367,29 @@ export default { this.getFormFieldList(mes); }); }, + getHistoryData() { + this.submitFlag = '重新起草' + this.showFlag = false + this.formLoading = true + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + } + }).catch(e => { + }) + }) + }, /** * @description: 动态表单读取 */ getFormFieldList(item) { - let type = item.qbfsForm.type + console.log(item); + let type = item.type || item.qbfsForm.type this.$nextTick(() => { switch (type){ case '1': @@ -398,18 +408,18 @@ export default { this.comName = "establish" break } - this.qbfsForm = item.qbfsForm; + this.qbfsForm = item.qbfsForm || item; this.formLoading = false; - this.roleForm.dockUser = item.roleForm.dockUser; - this.roleForm.dockUserName = item.roleForm.dockUserName; - this.roleForm.countersigner = item.roleForm.countersigner; - this.roleForm.countersignerName = item.roleForm.countersignerName; - this.roleForm.approver = item.roleForm.approver; - this.roleForm.approverName = item.roleForm.approverName; - this.roleForm.engineer = item.roleForm.engineer; - this.roleForm.engineerName = item.roleForm.engineerName; - this.roleForm.examine = item.roleForm.examine; - this.roleForm.examineName = item.roleForm.examineName; + this.roleForm.dockUser = item.dockUser || item.roleForm.dockUser; + this.roleForm.dockUserName = item.dockUserName || item.roleForm.dockUserName; + this.roleForm.countersigner = item.countersigner || item.roleForm.countersigner; + this.roleForm.countersignerName = item.countersignerName || item.roleForm.countersignerName; + this.roleForm.approver = item.approver ||item.roleForm.approver; + this.roleForm.approverName = item.approverName || item.roleForm.approverName; + this.roleForm.engineer = item.engineer || item.roleForm.engineer; + this.roleForm.engineerName = item.engineerName || item.roleForm.engineerName; + this.roleForm.examine = item.examine || item.roleForm.examine; + this.roleForm.examineName = item.examineName || item.roleForm.examineName; }); }, handleTabs(name) { diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 25581178b..b79b864d6 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2184,7 +2184,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '企标制修订计划整改') { + }else if(row.taskInfo === '重新起草') { this.$router.push({ name: 'qbzxdjhgkStep1', query:{ From f21499afe078ad32e0df0fcff0acad1dfc24960d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 7 Mar 2022 16:00:20 +0800 Subject: [PATCH 03/41] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4=20=20=E5=8D=95=E5=85=83?= =?UTF-8?q?=E6=A8=A1=E5=9D=97=E5=8F=98=E5=9E=8B=E5=8F=B7=E5=B1=95=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step3.vue | 2 +- .../pages/creatProcess/bzrk/step4.vue | 21 ++++++++++++++----- 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index c39d5759b..9e2199b2c 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -1186,10 +1186,10 @@ export default { }, handleSubmit() { this.isSubmit = true + this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index 231233b99..d0fb69bfe 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -875,10 +875,11 @@ :lazy=true :multiple=true :check-strictly=true - :show-checkBox=true :modalShowFlag="modalShowFlag4" :drawerTitle="drawerTitle" :url="url" + :type="'TRUCK'" + :show-checkBox="showCheckBox" :urlChild="urlChild" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel" @popoverHideCancel="popoverHideModelCancel"> @@ -895,6 +896,7 @@ :drawerTitle="drawerTitle" :url="url" :type="'CAR'" + :show-checkBox="showCheckBox" :urlChild="urlChild" :defaultProps="defaultModelProps" :checkedKeys="defaultCheckedKeys3" :nodeKey="nodeKeyModel" @popoverHide="popoverHideModel2" @popoverHideCancel="popoverHideModelCancel2"> @@ -1596,6 +1598,7 @@ export default { commentText: '', // 意见 title: '', // 新增编辑抽屉标题 ListModel: false, // 新增编辑抽屉开关 + showCheckBox: true, // 树形控件是否展示多选框 active: '1', // 默认显示 isSubmit: false, saveLoading: false, @@ -1988,11 +1991,19 @@ export default { this.modalShowFlag4 = true this.url = '' this.urlChild = '' - this.url = "sarModelTree/list" + this.url = "sarModelTree/listByType" this.urlChild = "sarModelTree/childByList" this.key3++ }, - + choiceZRR5(type, title, id) { + this.drawerTitle = title + this.modalShowFlag5 = true + this.url = '' + this.urlChild = '' + this.url = "sarModelTree/listByType" + this.urlChild = "sarModelTree/childByList" + this.key4++ + }, choiceTree(type, title, id) { this.drawerTitle = title this.getListTree(this.form) @@ -2801,10 +2812,10 @@ export default { if (res.ok) { this.fileInfoHandle(); this.isSubmit = true + this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -2829,10 +2840,10 @@ export default { } else { this.fileInfoHandle(); this.isSubmit = true + this.form.submitType = this.submitType this.form.commentText = this.commentText this.form.approvalOpinion = this.approvalOpinion const json = JSON.stringify(this.form); - json.submitType = this.submitType this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, From fa2484a5e9b7b3e4c63822d2c27d9405b558a340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 7 Mar 2022 16:15:07 +0800 Subject: [PATCH 04/41] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E8=AE=A1=E5=88=92=E5=AF=BC=E5=85=A5?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index dd5edaf33..0d0a4635a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -531,6 +531,7 @@ export default { this.$http.postData('importWkExcel/importData', _formData,{ _this: this }, res => { + console.log(res); if(res.ok){ if(res.data.length){ this.qblx_pageData.qblxData = res.data @@ -539,7 +540,7 @@ export default { this.$message.warning('请勿上传为空的文件') } }else{ - this.$confirm(res.message, "提示", { + this.$confirm(res.data, "提示", { confirmButtonText: "确认", confirmButtonClass: "common-button-primary", cancelButtonText: "取消", From 5d949f5907183bc2297f3559f9f075d63029a8b8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 7 Mar 2022 16:24:50 +0800 Subject: [PATCH 05/41] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index fd0fcb3c2..fd0c50c8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -559,12 +559,14 @@ @@ -611,6 +616,7 @@ @@ -619,6 +625,7 @@ @@ -626,6 +633,7 @@ From eec0977b10021eacd12eb437b383cc88ac31fd5e Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 7 Mar 2022 16:27:44 +0800 Subject: [PATCH 06/41] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step3.vue | 8 ++++++++ src/pages/processCenter/pages/creatProcess/bzrk/step5.vue | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index 9e2199b2c..2204dc818 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -510,6 +510,7 @@ @@ -517,6 +518,7 @@ @@ -547,6 +549,7 @@ @@ -570,6 +575,7 @@ @@ -578,12 +584,14 @@ @@ -529,6 +534,7 @@ @@ -537,6 +543,7 @@ @@ -544,6 +551,7 @@ From cde1e47f485e79f94c53248b043131205f39d71f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Mon, 7 Mar 2022 16:54:03 +0800 Subject: [PATCH 07/41] =?UTF-8?q?=E6=A0=87=E5=87=86=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E6=8F=90=E4=BA=A4bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzrk/step2.vue | 197 ++++++++---------- 1 file changed, 87 insertions(+), 110 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index fd0c50c8b..42f0bbfde 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -559,14 +559,12 @@ @@ -616,7 +611,6 @@ @@ -625,7 +619,6 @@ @@ -633,7 +626,6 @@ @@ -644,33 +636,16 @@
- - + +
- - - - - - - - - - - - - - + +
@@ -813,11 +788,11 @@ From 2d26ed101fdc6b2876978de2c2afc14a001109f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 11 Mar 2022 14:02:50 +0800 Subject: [PATCH 23/41] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98?= =?UTF-8?q?=E4=BC=9A=E5=8A=9F=E8=83=BD=E5=AE=8C=E5=96=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../config/pages/mechanismManage/pages/committee.vue | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/src/pages/config/pages/mechanismManage/pages/committee.vue b/src/pages/config/pages/mechanismManage/pages/committee.vue index 338213066..d2f7278cd 100644 --- a/src/pages/config/pages/mechanismManage/pages/committee.vue +++ b/src/pages/config/pages/mechanismManage/pages/committee.vue @@ -238,6 +238,7 @@ export default { this.dialogTitle = "编辑"; this.addModel = true; this.addForm.id = this.committeeChangeList[0].id; + this.addForm.committeer = this.committeeChangeList[0].committeer; this.addForm.committeeName = this.committeeChangeList[0].committeeName; this.addForm.committor = this.committeeChangeList[0].committor; this.addForm.committeeIds = this.committeeChangeList[0].committorId; @@ -307,15 +308,20 @@ export default { }, { _this: this }, res => { - this.getCommittee(); - this.addModel = false; + if(res.ok){ + this.getCommittee(); + this.addModel = false; + } }); } else { this.$http.put("wgCommittee/wg-committee/update", { ...this.addForm }, { _this: this }, res => { - console.log(res); + if(res.ok){ + this.getCommittee(); + this.addModel = false; + } }); } From a2c0aea60c8a95b175531c2674159af2c8c6ab8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 11 Mar 2022 15:06:33 +0800 Subject: [PATCH 24/41] =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97?= =?UTF-8?q?=E5=B1=95=E7=A4=BA=E8=B4=A6=E5=8F=B7=E5=8F=8A=E5=90=8D=E7=A7=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/config/pages/operationLog/index.vue | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/pages/config/pages/operationLog/index.vue b/src/pages/config/pages/operationLog/index.vue index 88a0a3959..f8a6f1c2f 100644 --- a/src/pages/config/pages/operationLog/index.vue +++ b/src/pages/config/pages/operationLog/index.vue @@ -167,8 +167,11 @@ loading: 'dataLoading' }, res => { if (res.ok) { - this.total = res.data.total - this.data = res.data.records + this.total = res.data.total; + res.data.records.forEach(item => { + item.account = "(" + item.account + ")" + item.accountName; + }); + this.data = res.data.records; } }) }, From 7f22b0dbe03c487e148046f635dba7a26ffa243b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 11 Mar 2022 15:21:52 +0800 Subject: [PATCH 25/41] commit --- src/pages/details/otherStandardDetails/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/details/otherStandardDetails/index.vue b/src/pages/details/otherStandardDetails/index.vue index 6965de85b..3617bdca5 100644 --- a/src/pages/details/otherStandardDetails/index.vue +++ b/src/pages/details/otherStandardDetails/index.vue @@ -71,7 +71,7 @@ v-for="(file, fileIndex) in child1Func(child.value)"> - {{ file.oldFileName }} Date: Fri, 11 Mar 2022 15:28:56 +0800 Subject: [PATCH 26/41] commit --- src/components/roleTree/index.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index dc6514e3e..167290211 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -173,6 +173,7 @@ }).then(() => { this.delList = [] this.nodeList2 = [] + this.roleList = [] this.$refs.tree.setCheckedKeys([]); }).catch(() => { this.$message({ @@ -370,6 +371,7 @@ flex-wrap: wrap; overflow: auto; margin: 10px; + align-content: flex-start; span { margin: 0px 5px 5px 0; } From 9dd9f6d8995ce178756c0b9f4aaaf67d702223e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 11 Mar 2022 16:10:00 +0800 Subject: [PATCH 27/41] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E8=AF=84=E4=BC=B0=20?= =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0=E6=B5=81=E7=A8=8B=E6=89=8B?= =?UTF-8?q?=E6=9C=BA=E7=AB=AF=E9=A1=B5=E9=9D=A2=E5=BC=80=E5=8F=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/phone/bzpg/step2.vue | 393 +++++++++++++ .../pages/phone/{xmpg => bzpg}/step6.vue | 134 +++-- .../pages/phone/{xmpg => bzpg}/step7.vue | 135 +++-- .../phone/{xmpg/step2.vue => bzpg/step8.vue} | 188 ++++-- .../{xmpg2/step12.vue => xmpg/step4.vue} | 45 +- .../processCenter/pages/phone/xmpg/step5.vue | 467 +++++++-------- .../pages/phone/xmpg2/step10.vue | 550 ------------------ .../pages/phone/xmpg2/step11.vue | 525 ----------------- .../processCenter/pages/phone/xmpg2/step2.vue | 452 -------------- .../processCenter/pages/phone/xmpg2/step3.vue | 464 --------------- .../processCenter/pages/phone/xmpg2/step7.vue | 549 ----------------- .../processCenter/pages/phone/xmpg2/step8.vue | 550 ------------------ .../processCenter/pages/phone/xmpg2/step9.vue | 549 ----------------- src/router/index.js | 148 ++--- 14 files changed, 959 insertions(+), 4190 deletions(-) create mode 100644 src/pages/processCenter/pages/phone/bzpg/step2.vue rename src/pages/processCenter/pages/phone/{xmpg => bzpg}/step6.vue (90%) rename src/pages/processCenter/pages/phone/{xmpg => bzpg}/step7.vue (89%) rename src/pages/processCenter/pages/phone/{xmpg/step2.vue => bzpg/step8.vue} (78%) rename src/pages/processCenter/pages/phone/{xmpg2/step12.vue => xmpg/step4.vue} (94%) delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step10.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step11.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step2.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step3.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step7.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step8.vue delete mode 100644 src/pages/processCenter/pages/phone/xmpg2/step9.vue diff --git a/src/pages/processCenter/pages/phone/bzpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step2.vue new file mode 100644 index 000000000..ca9f5d9d0 --- /dev/null +++ b/src/pages/processCenter/pages/phone/bzpg/step2.vue @@ -0,0 +1,393 @@ + + + + + diff --git a/src/pages/processCenter/pages/phone/xmpg/step6.vue b/src/pages/processCenter/pages/phone/bzpg/step6.vue similarity index 90% rename from src/pages/processCenter/pages/phone/xmpg/step6.vue rename to src/pages/processCenter/pages/phone/bzpg/step6.vue index b58f8d2e4..88d2b3f31 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step6.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step6.vue @@ -136,29 +136,35 @@ style="width: 100%" border @selection-change="selectStandChange" - height="55%" + height="100%" :header-cell-style="{background: '#e8e8e8', color: '#333333', fontSize: '16px', fontWeight: 'bold', fontFamily: 'MicrosoftYaHei-Bold'}"> + type="selection" + width="55" + align="center"> + + @@ -170,34 +176,41 @@ label="条款名称"> + + + - - - - - + width="180" + label="评估人" + /> @@ -294,7 +300,7 @@ import axios from "axios"; import ProcessHeader from "process/components/ProcessHeader"; export default { - name: "phoneXmpgStep6", + name: "phoneBzpgStep6", components: { ProcessHeader, ProcessFooter, @@ -498,40 +504,56 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { + console.log(item); this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.dataList = item.dataList - this.listForm.id = item.step3DTOS[0].id - this.listForm.standName = item.step3DTOS[0].standName - this.listForm.standNumber = item.step3DTOS[0].standNumber - this.listForm.qualityEngineerName = item.step3DTOS[0].qualityEngineerName - this.listForm.certifiedEngineerName = item.step3DTOS[0].certifiedEngineerName - }) + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList + } else { + this.listForm = item.form; + this.dataList = item.form.dataList; + } + + }); }, //驳回事件 beforeBack () { if(!this.commentText){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.fenFlag = '2' - this.handleSubmit() - } + this.$message.warning('请填写审批意见') + }else{ + this.listForm.dataList = this.dataList + this.listForm.passFlag = '1' + this.listForm.commentText = this.commentText; + const json = JSON.stringify(this.listForm); + this.isSubmit = true + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId: this.userId, + json: json, + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message) + this.$router.push('/processCenter') + } + this.isSubmit = false + }, e => { + }); + } }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList + this.listForm.passFlag = '0' + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -545,9 +567,7 @@ export default { } this.isSubmit = false }, e => { - }); - }, //标准表格选择框改变 selectStandChange(data) { diff --git a/src/pages/processCenter/pages/phone/xmpg/step7.vue b/src/pages/processCenter/pages/phone/bzpg/step7.vue similarity index 89% rename from src/pages/processCenter/pages/phone/xmpg/step7.vue rename to src/pages/processCenter/pages/phone/bzpg/step7.vue index 582c84325..a4a689296 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step7.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step7.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -129,36 +129,51 @@ + + + + + type="selection" + width="55" + align="center"> + + @@ -170,34 +185,41 @@ label="条款名称"> + + + - - - - - + width="180" + label="评估人" + /> @@ -264,14 +279,12 @@
@@ -294,7 +307,7 @@ import axios from "axios"; import ProcessHeader from "process/components/ProcessHeader"; export default { - name: "phoneXmpgStep7", + name: "phoneBzpgStep7", components: { ProcessHeader, ProcessFooter, @@ -304,7 +317,9 @@ export default { data() { return { phoneshowflag: false, + activeName: '', phoneRoleList: [], + projectTabName: [], phoneDrawerTitle: '', //折叠的标志，true为折叠，false为不折叠 foldFormFlag: false, @@ -388,6 +403,9 @@ export default { }; }, methods: { + handleClick(tab) { + this.projectName = tab.name + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag @@ -498,36 +516,34 @@ export default { /** * @description: 动态表单读取 */ - getFormFieldList (item) { + getFormFieldList(item) { this.$nextTick(() => { - this.listForm = JSON.parse(JSON.stringify(item)) - this.listForm.prcNum = this.prcNum - this.listForm.prcName = this.prcName - this.listForm.id = item.id - this.dataList = item.dataList - }) - }, - //驳回事件 - beforeBack () { - if(!this.commentText){ - this.$message.warning('请填写审批意见') - } else { - this.listForm.fenFlag = '2' - this.handleSubmit() - } + this.listForm = JSON.parse(JSON.stringify(item)); + if (item.form === undefined) { + this.fileType = item.fileType + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.dataList = item.dataList + item.dataList.forEach(item => { + if(!this.projectTabName.includes(item.projectName)){ + this.projectTabName.push(item.projectName) + } + }) + this.projectName = this.activeName = this.projectTabName[Object.keys(this.projectTabName)[0]] + } else { + this.listForm = item.form; + this.dataList = item.form.dataList; + } + + }); }, //提交事件 handleSubmit() { - this.isSubmit = true - this.listForm.prcCreateUser = this.$store.getters.userInfo.userId; - this.listForm.applyUpdUserId = this.$store.getters.userInfo.userId; - this.listForm.prcCreateUserName = this.$store.getters.userInfo.account; - this.listForm.zrUserId = this.$store.getters.userInfo.userId ; - this.listForm.commentText = this.commentText; - this.listForm.standId = this.listForm.standId; - this.listForm.fenFlag = "1"; this.listForm.dataList = this.dataList + this.listForm.commentText = this.commentText; const json = JSON.stringify(this.listForm); + this.isSubmit = true this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId: this.userId, @@ -541,7 +557,6 @@ export default { } this.isSubmit = false }, e => { - }); }, diff --git a/src/pages/processCenter/pages/phone/xmpg/step2.vue b/src/pages/processCenter/pages/phone/bzpg/step8.vue similarity index 78% rename from src/pages/processCenter/pages/phone/xmpg/step2.vue rename to src/pages/processCenter/pages/phone/bzpg/step8.vue index 2ee9bbc26..241b7d293 100644 --- a/src/pages/processCenter/pages/phone/xmpg/step2.vue +++ b/src/pages/processCenter/pages/phone/bzpg/step8.vue @@ -1,8 +1,8 @@