From a10cb6565054121c2d4fbbaf266d477af1442bfa Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 8 Aug 2023 16:18:50 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E5=B1=95=E7=A4=BA=E8=B5=B7=E8=8D=89=E4=BA=BA?= =?UTF-8?q?=E9=80=89=E6=8B=A9=E6=A1=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step13.vue | 14 +++++++++----- .../pages/creatProcess/qbzxdlx/step2.vue | 11 +++++++---- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 5543c2662..de5fd5366 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2527,10 +2527,14 @@ commentText: this.formTongGuo.commentText })) saveTaskForPub(_formData).then(res => { - this.isSubmit = false - this.saveLoading = false - this.$message.success('保存成功') - this.bpnId = res.result + if (res.success) { + this.isSubmit = false + this.saveLoading = false + this.$message.success(res.message) + this.bpnId = res.result + }else{ + this.$message.warning(res.message) + } }).catch(e => { this.isSubmit = false this.saveLoading = false @@ -2711,7 +2715,7 @@ if(res.ok){ this.completeTask() }else{ - this.$message.error(res.data) + this.$message.error(res.message) } }) }else{ diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 2ff3f09ae..d94be870e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -1384,10 +1384,13 @@ export default { nameList += item.name; }); console.log(nameList) - this.roleForm.countersigner = idList; - this.roleForm.countersignerName = nameList; - this.qbfsForm.resPerson = idList; - this.qbfsForm.resPersonName = nameList; + if(this.roleType == '1'){ + this.roleForm.countersigner = idList; + this.roleForm.countersignerName = nameList; + }else{ + this.qbfsForm.resPerson = idList; + this.qbfsForm.resPersonName = nameList; + } }, workGroupUnfold(type, title, ids){ if(ids){ From b5f190f49188939c40a8513fb28ac54a1e28283c Mon Sep 17 00:00:00 2001 From: wxyclub Date: Wed, 9 Aug 2023 16:36:11 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E8=AE=A1=E5=88=92?= =?UTF-8?q?=E7=AB=8B=E9=A1=B9=E5=B1=95=E7=A4=BA=E4=BC=9A=E7=AD=BE=E4=BA=BA?= =?UTF-8?q?=E5=91=98=E9=80=89=E6=8B=A9=E6=A1=86bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbzxdlx/step2.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index d94be870e..1300e90df 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -282,7 +282,7 @@
+ @click.native="choicePeoples('1')">
@@ -849,7 +849,7 @@ export default { if (valid) { this.isSubmit = true this.qbfsForm.commentText = this.commentText - this.qbfsForm.LXD = this.lxdList[0].id + this.qbfsForm.LXD = this.lxdList && this.lxdList.length > 0 ? this.lxdList[0].id : '' this.qbfsForm.LXDName = '立项单' let jsons = JSON.stringify(this.qbfsForm); this.$http.post('lawss/activiti/completeTask', { @@ -1365,7 +1365,8 @@ export default { } this.modalshowflag = false; }, - choicePeoples() { + choicePeoples(type) { + this.roleType = type this.nodeList2 = []; if (this.roleForm.countersigner.length > 0) { this.nodeList2 = this.roleForm.countersigner.split(","); From b40218f81191b23d232e4f0c9a0da778230b2727 Mon Sep 17 00:00:00 2001 From: wxyclub Date: Mon, 14 Aug 2023 17:31:16 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E9=A1=BA=E5=BA=8F=E5=8F=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk/step13.vue | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index de5fd5366..6153a7eca 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -1198,8 +1198,8 @@ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { - const obj = res.data - let standSn = (obj.newStandSn / 1) + 1 + const standSn = res.data + // let standSn = (obj.newStandSn / 1) + 1 this.form.standSn = standSn this.form.standNumber = standSn this.form.standNum = standSn + '' @@ -2776,7 +2776,7 @@ planForm.id = this.form.planId planForm.planStatus = '4' planForm.reviseStatus = this.form.reviseStatus - planForm.standCode = this.form.DTQBBHBUSS + planForm.standCode = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS : this.form.standCode planForm.standId = res.data planForm.processType = "buss1"; this.$http.post("esRevisePlan/es-revise-plan/modPlanByState", planForm, { @@ -3079,8 +3079,8 @@ this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { _this: this }, res => { - const obj = res.data - let standSn = (obj.newStandSn / 1) + 1 + const standSn = res.data + // let standSn = (obj.newStandSn / 1) + 1 this.form.standSn = standSn this.form.standNumber = standSn this.form.standNum = standSn + '' @@ -3169,7 +3169,7 @@ } this.busVsFunc() this.modelFunc() - this.getMaxStandnSn(); + // this.getMaxStandnSn(); } }