From b3cf9c2ba733bcdff22df63fcf18e1b31f278a3c Mon Sep 17 00:00:00 2001 From: wxyclub Date: Fri, 18 Aug 2023 16:48:53 +0800 Subject: [PATCH 1/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 --- .../pages/creatProcess/qbrk-product/step13.vue | 6 +++--- src/pages/processCenter/pages/creatProcess/qbrk/step13.vue | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 18e19f20c..2594dc8dc 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2544,9 +2544,9 @@ }) } }, - ifStandCodebyStandName(standCode,standName){ + ifStandCodebyStandName(standCode,standName,taskIds,standNum){ return new Promise((resolve, reject)=>{ - this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName}) + this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum}) .then(res => resolve(res)) .catch(e => { throw new Error(e) @@ -2615,7 +2615,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { if(this.form.standStatus === '1' || this.form.standStatus === '2'){ - this.ifStandCodebyStandName(this.form.standCode,this.form.standName) + this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum) .then((res)=>{ if(res.ok){ this.completeTask() diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 6153a7eca..5803687d5 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -2646,9 +2646,9 @@ this.rules.commentText[0].required = true; } }, - ifStandCodebyStandName(standCode,standName){ + ifStandCodebyStandName(standCode,standName,taskIds,standNum){ return new Promise((resolve, reject)=>{ - this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName}) + this.$http._postData('lawss/sarBussionessStand/ifStandCodebyStandName',{standCode,standName,taskIds,standNum}) .then(res => resolve(res)) .catch(e => { throw new Error(e) @@ -2710,7 +2710,7 @@ this.$refs['formTongGuo'].validate((valid) => { if (valid) { if(this.form.reviseStatus === '1' || this.form.reviseStatus === '2'){ - this.ifStandCodebyStandName(this.form.standCode,this.form.standName) + this.ifStandCodebyStandName(this.form.standCode,this.form.standName,this.taskIds,this.form.standNum) .then((res)=>{ if(res.ok){ this.completeTask() From de45a1753dfb3326b5f28aa2ecade667d151b4ce Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 22 Aug 2023 14:45:41 +0800 Subject: [PATCH 2/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=85=A5=E5=BA=93=E6=B5=81=E7=A8=8B=E4=B8=AD=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=A4=9A=E5=87=BA=E9=80=97=E5=8F=B7=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 1bb00ac0c..8699daa7d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -2834,6 +2834,12 @@ this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") // this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + this.LSBBBUSSFileList = this.LSBBBUSSFileList.reduce((init,item)=>{ + if(item.id || (item.response && item.response.data &&item.response.data.id)){ + init.push(item) + } + return init + },[]) this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id ? item.id : item.response.data.id).join(",") this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") From 72048f1df6d5f86c927bdf2e1e0514792797b9ee Mon Sep 17 00:00:00 2001 From: wxyclub Date: Tue, 22 Aug 2023 16:51:39 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=E4=BF=AE=E6=94=B9=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=88=B6=E4=BF=AE=E8=AE=A2=E6=97=B6=E5=A4=9A=E4=B8=AA=E8=A2=AB?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E6=A0=87=E5=87=86=E6=97=B6=E5=87=BA=E7=8E=B0?= =?UTF-8?q?=E7=9A=84=E9=A1=BA=E5=BA=8F=E5=8F=B7bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step13.vue | 32 ++++++++++++++----- 1 file changed, 24 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue index 5803687d5..53e0fb4de 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step13.vue @@ -3010,16 +3010,32 @@ // }else { // this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) // } - this.form.standNum = this.form.standNum.replace(/^0+/,"") - this.form.standNum = this.form.standNum.padStart(3,'0') + console.log(this.form.standNum) + if (this.form.standNum.includes(',')) { + // 多个代替企标编号 调接口获取企标顺序号 + this.$http.get('lawss/sarBussionessStand/getStandInfoByReviseStatus',{reviseStatus:'buss1_'+this.form.reviseStatus,standSort:this.form.standSort,taskId: this.taskIds}, { + _this: this + }, res => { + this.form.standNum = res.data + '' + this.form.standNum = this.form.standNum.replace(/^0+/,"") + this.form.standNum = this.form.standNum.padStart(3,'0') + this.standNum = this.form.standNum // 保存初始顺序号 + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.standCode = this.form.standCode + this.formKey++ + }, e => { + }) + } else { + this.form.standNum = this.form.standNum.replace(/^0+/,"") + this.form.standNum = this.form.standNum.padStart(3,'0') - this.standNum = this.form.standNum // 保存初始顺序号 - this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) - - this.standCode = this.form.standCode - // this.standSort = this.form.standSort - this.formKey++ + this.standNum = this.form.standNum // 保存初始顺序号 + this.form.standCode = this.form.standSort + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.standCode = this.form.standCode + // this.standSort = this.form.standSort + this.formKey++ + } } else if (this.form.reviseStatus === '3'){ this.form.standCode = this.form.standCode