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 1/4] =?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 2/4] =?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 3/4] =?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 4/4] =?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: "取消",