From d01d2f3f27d0bfc24401189f686204fa1cd613ce Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 19 Jan 2022 07:26:27 +0800 Subject: [PATCH 1/2] feat: There is no way the, --- .../pages/creatProcess/qbrk-product/step1.vue | 14 ++++++++++++-- .../pages/creatProcess/qbrk/step1.vue | 14 ++++++++++++-- 2 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 6f1dce16f..06640b174 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1776,19 +1776,29 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.roleForm = mes.roleForm + this.commentText = mes.commentText this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); - this.roleForm = mes.roleForm - this.commentText = mes.commentText }) }else { this.form.XCSJBUSS = this.dateFormatter() } }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index ece39455a..167f426f5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1825,18 +1825,28 @@ let mes = JSON.parse(res.mes) mes.form.date = new Date(this.$moment(mes.form.date).format('YYYY-MM-DD')) this.form = mes.form + this.roleForm = mes.roleForm + this.commentText = mes.commentText this.FBGBUSSFileList=this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName); this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); - this.roleForm = mes.roleForm - this.commentText = mes.commentText }) }else { this.form.XCSJBUSS = this.dateFormatter() } }, + assemble(ids,names){ + let list= new Array(); + let idArray=ids.split(','); + let nameArray=names.split(','); + for(let i=0; i { From 900389a5789a050dd0b1a96c114f7321142ad526 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Wed, 19 Jan 2022 09:28:10 +0800 Subject: [PATCH 2/2] feat:new --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 5 +++-- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step14.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step3.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step5.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/step6.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/stepC3.vue | 4 ++-- .../processCenter/pages/creatProcess/qbrk-product/stepC6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 5 +++-- src/pages/processCenter/pages/creatProcess/qbrk/step10.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step12.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step6.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/step7.vue | 5 ++--- src/pages/processCenter/pages/creatProcess/qbrk/step9.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue | 4 ++-- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 4 ++-- 19 files changed, 40 insertions(+), 39 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 06640b174..6c3aab134 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1101,6 +1101,7 @@ } }] }, + bpnId: this.$route.query.bpnId, fileList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], @@ -2564,7 +2565,7 @@ this.saveLoading = true let _formData = new FormData() this.fileInfoHandle() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2578,7 +2579,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 1874cadf2..333dee45d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2254,7 +2254,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2268,7 +2268,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue index a8096d977..943a4594b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step14.vue @@ -2196,7 +2196,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2210,7 +2210,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index ab79d69de..1575d1ed8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -2259,7 +2259,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2273,7 +2273,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue index b9fbf6d73..830c01728 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step5.vue @@ -2334,7 +2334,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2351,7 +2351,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 4a63ed18b..1b2fd9b50 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -2350,7 +2350,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2364,7 +2364,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index bdf86e304..9d5efda2f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -2259,7 +2259,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2273,7 +2273,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index b6bb55b9d..3fa557c3e 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -2350,7 +2350,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss2') @@ -2364,7 +2364,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 167f426f5..5633ba02d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -1190,6 +1190,7 @@ } }] }, + bpnId: this.$route.query.bpnId, fileList: [], FBGBUSSFileList: [], BZSMBUSSFileList: [], @@ -2700,7 +2701,7 @@ this.saveLoading = true let _formData = new FormData() this.fileInfoHandle() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2714,7 +2715,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue index 6492bb7ab..b1ffb2f06 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step10.vue @@ -2083,7 +2083,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'laws1') @@ -2103,7 +2103,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue index dadd5234e..096b3fc17 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step12.vue @@ -2215,7 +2215,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2230,7 +2230,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 2258efb5a..da8b978b3 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2198,7 +2198,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2213,7 +2213,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 853eabc38..1baea5462 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -2286,7 +2286,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2301,7 +2301,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 2347bf2b2..cae29c68c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -2504,7 +2504,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2521,7 +2521,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index eec104eda..ed1784a5b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -2637,7 +2637,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2652,7 +2652,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue index 0714d87fb..810050c3a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step7.vue @@ -325,7 +325,6 @@ @over2="handle1" > - { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue index f8e5ce9e7..1458f4e7c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step9.vue @@ -2296,7 +2296,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2311,7 +2311,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 498e81f26..f513fbaca 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -2286,7 +2286,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2301,7 +2301,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 211836e6e..521848b05 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2637,7 +2637,7 @@ this.saveLoading = true let _formData = new FormData() - // _formData.append('id', this.bpnId) + _formData.append('id', this.bpnId || '') _formData.append('createUser', this.$store.getters.userInfo.userId) _formData.append('createUserName', this.$store.getters.userInfo.uName) _formData.append('prcType', 'buss1') @@ -2652,7 +2652,7 @@ saveTaskFirst(_formData).then(res => { this.saveLoading = false this.$message.success('保存成功') - // this.bpnId = res.result + this.bpnId = res.result }).catch(e => { this.saveLoading = false })