From e70e6cedec156ae4463bc111e6baeb315a5f83c8 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 7 Mar 2022 10:47:38 +0800 Subject: [PATCH 01/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E5=BA=9F=E6=AD=A2=20=E8=8A=82=E7=82=B9=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/home2/components/todoList/index.vue | 6 ++-- .../pages/creatProcess/qbfz/step1-7.vue | 2 +- .../pages/creatProcess/qbfz/step1.vue | 30 +++++++++---------- .../pages/creatProcess/qbfz/step2.vue | 2 +- .../pages/creatProcess/qbfz/step3.vue | 2 +- .../pages/creatProcess/qbfz/step5.vue | 2 +- .../pages/creatProcess/qbfz/step6.vue | 2 +- .../pages/creatProcess/qbfz/step7.vue | 2 +- .../tabComponents/newProcess/index.vue | 4 +-- .../tabComponents/processCenter/index.vue | 6 ++-- .../tabComponents/taskDraft/index.vue | 2 +- 11 files changed, 30 insertions(+), 30 deletions(-) diff --git a/src/pages/home2/components/todoList/index.vue b/src/pages/home2/components/todoList/index.vue index 3133c870f..48daaee9f 100644 --- a/src/pages/home2/components/todoList/index.vue +++ b/src/pages/home2/components/todoList/index.vue @@ -1571,7 +1571,7 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '会签并填写意见') { + } else if(row.taskInfo === '会签') { this.$router.push({ name: 'qbfzStep3', query:{ @@ -1605,7 +1605,7 @@ export default { } }) } - else if(row.taskInfo === '审定责任人审定') { + else if(row.taskInfo === '审定') { this.$router.push({ name: 'qbfzStep6', query:{ @@ -1616,7 +1616,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '批准负责人批准') { + }else if(row.taskInfo === '批准') { this.$router.push({ name: 'qbfzStep7', query:{ diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue index e3f943558..a0eef35a7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1-7.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue index be20c9c24..64e8f9364 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -126,19 +126,19 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

-
- @@ -152,43 +152,43 @@ - -

会签人员

+

相关责任人

-
- -

审定责任人

+

标准体系工作组组长

- +
- -

批准负责人

+

标准法规部高级经理

- +
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue index 6dea54c04..08b1e52a3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue index 735f75c30..539b6778e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue index 0fcf7f0b6..df8739020 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue index 83cda9209..fd8a46009 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step6.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue index 94a04acb1..3753323b5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step7.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index f8ceee7e6..2f00bbe89 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -220,7 +220,7 @@
- +
@@ -250,7 +250,7 @@
- +
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 88f47ebbb..25581178b 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2081,7 +2081,7 @@ export default { prcType: row.prcType } }) - } else if(row.taskInfo === '会签并填写意见') { + } else if(row.taskInfo === '会签') { this.$router.push({ name: 'qbfzStep3', query:{ @@ -2115,7 +2115,7 @@ export default { } }) } - else if(row.taskInfo === '审定责任人审定') { + else if(row.taskInfo === '审定') { this.$router.push({ name: 'qbfzStep6', query:{ @@ -2126,7 +2126,7 @@ export default { prcType: row.prcType } }) - }else if(row.taskInfo === '批准负责人批准') { + }else if(row.taskInfo === '批准') { this.$router.push({ name: 'qbfzStep7', query:{ diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index 9c077fb25..e52bb846e 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -878,7 +878,7 @@ export default { name: 'qbfzStep1', query: { type: '24', - processName: '企标废止流程', + processName: mes.taskInfo, bpnId: id } }) From 875397a13b301387419fbe2ed6ae195a538ed0ba 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 10:49:38 +0800 Subject: [PATCH 02/13] =?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=AB=8B=E9=A1=B9=E5=AF=BC=E5=85=A5?= =?UTF-8?q?bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdlx/step1.vue | 30 ++++++++++++++----- 1 file changed, 23 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index c7e7fd021..dd5edaf33 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -532,12 +532,23 @@ export default { _this: this }, res => { if(res.ok){ - this.qblx_pageData.qblxData = res.data + if(res.data.length){ + this.qblx_pageData.qblxData = res.data + this.$message.success('文件上传成功') + }else{ + this.$message.warning('请勿上传为空的文件') + } }else{ - alert(res.message) + this.$confirm(res.message, "提示", { + confirmButtonText: "确认", + confirmButtonClass: "common-button-primary", + cancelButtonText: "取消", + type: "warning" + }).then(() => { + }).catch(() => { + }); } }) - this.$message.success('文件上传成功') this.importModalshowflag = false this.$nextTick(() => { this.$refs.importFileAboutStand.clearFiles() @@ -946,9 +957,10 @@ export default { }, //流程提交事件 handleSubmit() { - let jsonData = this.qblx_pageData.qblxData - this.qblx_pageData.qblxFile = this.fileInfoList - this.qblx_pageData.commentText = this.commentText; + if(this.qblx_pageData.qblxData.length){ + let jsonData = this.qblx_pageData.qblxData + this.qblx_pageData.qblxFile = this.fileInfoList + this.qblx_pageData.commentText = this.commentText; this.$refs["qblx_pageData"].validate((valid) => { if (valid) { this.$refs["roleForm"].validate(async (valid) => { @@ -960,7 +972,7 @@ export default { .then(() => { finishCount++ }).catch(e => { - }) + }) } if (finishCount === jsonData.length) { this.isSubmit = false @@ -975,6 +987,10 @@ export default { return this.$message.warning("请完善基础信息"); } }); + }else{ + this.$message.warning('立项列表不能为空') + } + }, } From 9d306b013e77cd7b2f1839fadbde0cb4dfde0f22 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Mon, 7 Mar 2022 11:25:27 +0800 Subject: [PATCH 03/13] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E8=B5=B7=E8=8D=89=E4=BA=BA=E9=80=89=E6=8B=A9=E7=8A=B6=E6=80=81?= =?UTF-8?q?=EF=BC=8C=E5=8F=AA=E5=8F=AF=E4=BB=A5=E7=8E=B0=E8=A1=8C=E6=9C=89?= =?UTF-8?q?=E6=95=88=E5=92=8C=E5=BA=9F=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbfz/step4.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue index db380c5f2..18d3b1ce6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4.vue @@ -292,15 +292,17 @@ export default { { required: true, message: "请选择下一步状态", trigger: "change" } ] }, - associationOptions: [{ - value: "修订", - label: "修订" - }, { + associationOptions: [ + // { + // value: "修订", + // label: "修订" + // }, + { value: "废止", label: "废止" }, { - value: "有效", - label: "有效" + value: "现行有效", + label: "现行有效" }] }; }, From 858b667477790450976034ea3b6dc9d5946bea9b Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Mon, 7 Mar 2022 13:33:01 +0800 Subject: [PATCH 04/13] commit --- src/pages/processCenter/pages/creatProcess/bzrk/step2.vue | 1 + .../components/EnterpriseStandardDatabase.vue | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index d286a7c9b..fd0fcb3c2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -67,6 +67,7 @@ diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 691780e93..d8089bb40 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -3558,6 +3558,10 @@ export default { idList += item.id nameList += item.name }) + this.sarBussionessSearch.QCDW = data[0].institutionName + this.sarBussionessSearch.QCDWId = data[0].institutionId + this.$set(this.sarBussionessStandEO, 'QCDWId', data[0].institutionId) + this.$set(this.sarBussionessStandEO, 'QCDW', data[0].institutionName) if (this.drawerTitle === '查询起草人') { this.sarBussionessSearch['QCRBUSS'] = nameList } @@ -3566,12 +3570,8 @@ export default { this.$refs.sarBussionessStandForm.validateField('QCRBUSS') } // this.sarBussionessStandEO['QCRBUSS'] = nameList - - }, choiceQCDW(type, title, id) { - - this.nodeListZRBM = [] this.nodeListZRBM.push(id) this.drawerTitle = title 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 05/13] =?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 06/13] =?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 07/13] =?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 08/13] =?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 09/13] 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 10/13] 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 11/13] =?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 @@