From 5ed6d5611f9cd02d5359595f3643e37e46d69989 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Fri, 24 Jun 2022 18:27:09 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20bug=20#5?= =?UTF-8?q?6065=20=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=B5=B0=E5=AE=8C=E5=90=8E,=E6=95=B0=E6=8D=AE=E4=B8=A2?= =?UTF-8?q?=E5=A4=B1=20=E6=B2=A1=E6=9C=89=E5=BD=92=E6=A1=A3=20=E6=98=AF?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 3 +++ .../pages/creatProcess/qbrk-product/step13.vue | 11 +++++++---- .../pages/creatProcess/qbrk-product/step3.vue | 7 ++++++- .../pages/creatProcess/qbrk-product/step6.vue | 1 + .../pages/creatProcess/qbrk-product/stepC3.vue | 5 +++++ .../pages/creatProcess/qbrk-product/stepC6.vue | 1 + 6 files changed, 23 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index ba033a478..2f265bf1c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2076,6 +2076,9 @@ this.form.modelDataNameVerify=[] this.form.modelDataZrUserVerify=[] this.form.QCDWID= '' + this.form.menuId = this.form['TXLBBUSSMenuId'] + console.log(this.form) + console.log(this.form.menuId) this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.form['id'] = bringData.id diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index cd5cdad18..6b488757d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2209,6 +2209,7 @@ this.form.treeType = 'sarMs' } } + this.formKey++ this.modalShowFlag1 = false this.$forceUpdate() }, @@ -2411,7 +2412,7 @@ this.rules.commentText[0].required = true; } }, - async saveConfStand(standId) { + saveConfStand(standId) { if(this.form.menuId && this.form.menuId !== ''){ let search = {} let list = [] @@ -2425,6 +2426,9 @@ _this: this }, res => { const history = res; + this.$message.success("入库成功") + this.submitLoading = false + this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) resolve(history) }) }) @@ -2455,6 +2459,8 @@ this.form.reviseStatus = 'buss2_'+this.form.standStatus this.form.textStatusBuss = '6jnqba2mby' const json = JSON.stringify(this.form); + this.processCreateBuss(json) +return this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds, userId : this.userId, @@ -2493,11 +2499,8 @@ _formData.append('infoJson', json) processCreateBuss(_formData).then(res => { if (res.result === '操作成功' || res.ok) { - this.$message.success("入库成功") // 自动匹配配置标准 this.saveConfStand(res.data) - this.submitLoading = false - this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) } else { this.$message.warning(res.message) this.isSubmit = false diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index d978da12a..7a3eb350e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -36,7 +36,8 @@ @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" - /> + @formChoiceZRR1 = "formChoiceZRR1" + /> @@ -1210,6 +1211,9 @@ this.drawerTitle = title this.modalShowFlagZRBM = true }, + formChoiceZRR1(type, title, id){ + this.choiceZRR1(type, title, id) + }, formChoiceQCDW(type, title, id){ this.choiceQCDW(type, title, id) }, @@ -2246,6 +2250,7 @@ this.form.treeType = 'sarMs' } } + this.formKey++ this.modalShowFlag1 = false this.$forceUpdate() }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 8a5f6397d..70834da99 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -2348,6 +2348,7 @@ this.form.treeType = 'sarMs' } } + this.formKey++ this.modalShowFlag1 = false this.$forceUpdate() }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index cff34d637..5ec58d3af 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -36,6 +36,7 @@ @formSelectLawsCancel = "formSelectLawsCancel" @formChoiceZRRListCancel = "formChoiceZRRListCancel" @formChoiceQCDW = "formChoiceQCDW" + @formChoiceZRR1 = "formChoiceZRR1" /> @@ -1211,6 +1212,9 @@ this.drawerTitle = title this.modalShowFlagZRBM = true }, + formChoiceZRR1(type, title, id){ + this.choiceZRR1(type, title, id) + }, formChoiceQCDW(type, title, id){ this.choiceQCDW(type, title, id) }, @@ -2247,6 +2251,7 @@ this.form.treeType = 'sarMs' } } + this.formKey++ this.modalShowFlag1 = false this.$forceUpdate() }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 8fd1fb3e3..882b4b85a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -2359,6 +2359,7 @@ this.form.treeType = 'sarMs' } } + this.formKey++ this.modalShowFlag1 = false this.$forceUpdate() },