From 1eb700cba9ef29c40ae6143d086e59babf965f78 Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 4 Mar 2022 10:54:42 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E5=BD=93=E5=B9=B4=E5=88=B6=E5=AE=9A=E3=80=81=E5=BD=93=E5=B9=B4?= =?UTF-8?q?=E4=BF=AE=E5=AE=9A=E6=89=8D=E5=8A=A0X=20(=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=20=E5=BF=85=E5=A1=AB)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/qbrk/common/formEditList.vue | 3 + .../pages/creatProcess/qbrk/step1.vue | 3 + .../pages/creatProcess/qbrk/step13.vue | 84 ++++++++++--------- .../pages/creatProcess/qbrk/step3.vue | 8 +- .../pages/creatProcess/qbrk/step6.vue | 11 ++- .../pages/creatProcess/qbrk/stepC1.vue | 15 ++-- .../pages/creatProcess/qbrk/stepC3.vue | 11 ++- .../pages/creatProcess/qbrk/stepC6.vue | 11 ++- 8 files changed, 86 insertions(+), 60 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index a5383a5fe..0f7f6e507 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -339,6 +339,7 @@ { + this.$refs['form'].validate((valid) => { if (valid) { - this.isSubmit = true - this.form.commentText = this.formTongGuo.commentText - this.form.approvalOpinion = this.formTongGuo.approvalOpinion - this.form.topId = this.pId - const json = JSON.stringify(this.form); - this.$http.post('lawss/activiti/completeTask', { - taskIds: this.taskIds, - userId : this.userId, - json: json - }, { - _this: this - }, res => { - if (res.success) { - // this.$message.success(res.message) - // 流程提交之后，应该流转至待办任务页面 - this.isSubmit = false - this.processCreateBuss(json) - // if(this.formTongGuo.approvalOpinion === '1'){ - // this.$message.warning("驳回成功") - // this.isSubmit = false - // // 流程提交之后，应该流转至待办任务页面 - // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) - // }else{ - // this.processCreateLaws(json) - // } - }else { - this.$message.success(res.message) - } - }) - }}) + this.$refs['formTongGuo'].validate((valid) => { + if (valid) { + this.isSubmit = true + this.form.commentText = this.formTongGuo.commentText + this.form.approvalOpinion = this.formTongGuo.approvalOpinion + this.form.topId = this.pId + const json = JSON.stringify(this.form); + this.$http.post('lawss/activiti/completeTask', { + taskIds: this.taskIds, + userId : this.userId, + json: json + }, { + _this: this + }, res => { + if (res.success) { + // this.$message.success(res.message) + // 流程提交之后，应该流转至待办任务页面 + this.isSubmit = false + this.processCreateBuss(json) + // if(this.formTongGuo.approvalOpinion === '1'){ + // this.$message.warning("驳回成功") + // this.isSubmit = false + // // 流程提交之后，应该流转至待办任务页面 + // this.$router.push({path:'/processCenter?tabsName=ProcessCenter'}) + // }else{ + // this.processCreateLaws(json) + // } + }else { + this.$message.success(res.message) + } + }) + }}) + } + }) }, async saveConfStand(standId) { if(this.form.menuId && this.form.menuId !== ''){ @@ -2541,7 +2549,7 @@ let standSn = (obj === null || obj.newStandSn === null) ? '001' : obj.newStandSn this.form.standSn = standSn this.form.standNumber = standSn - this.form.standYear = year // 待带入立项标准 + this.form.standYear = this.regDate(year) // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) }, e => { }) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue index 67dc458c5..c347d43fd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step3.vue @@ -1901,10 +1901,10 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'cbbh'){ - this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'CYBZ'){ + this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'YYBZ'){ + this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') }else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue index 8a4be4f8b..1a5eb05ce 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step6.vue @@ -1283,6 +1283,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], + DTQBBHBUSS: [ + { required: true, message: '请选择代替企标编号', trigger: 'change' } + ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -2245,10 +2248,10 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'cbbh'){ - this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'CYBZ'){ + this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'YYBZ'){ + this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') }else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue index 91681b563..625f19aac 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC1.vue @@ -1117,6 +1117,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], + DTQBBHBUSS: [ + { required: true, message: '请选择代替企标编号', trigger: 'change' } + ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -2103,12 +2106,12 @@ }) // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 - if(this.replaceLawType === 'dtbjh'){ - this.form.dtbjh = this.form.dtbjh ? this.form.dtbjh + ',' + textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'cbbh'){ - this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + if(this.replaceLawType === 'DTQBBHBUSS'){ + this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'CYBZ'){ + this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'YYBZ'){ + this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') }else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue index 0ffc566b1..0df49118a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC3.vue @@ -1034,6 +1034,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], + DTQBBHBUSS: [ + { required: true, message: '请选择代替企标编号', trigger: 'change' } + ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -1901,10 +1904,10 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'cbbh'){ - this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'CYBZ'){ + this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'YYBZ'){ + this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') }else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue index 1c6c53b4b..122c6e717 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/stepC6.vue @@ -1283,6 +1283,9 @@ QCRBUSS: [ { required: true, message: '请选择起草人', trigger: 'change' } ], + DTQBBHBUSS: [ + { required: true, message: '请选择代替企标编号', trigger: 'change' } + ], }, zrUserIds: [], // 选择多个会签责任人 userType:'', // 选择用户ID判断 @@ -2245,10 +2248,10 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = this.form.DTQBBHBUSS ? this.form.DTQBBHBUSS + ',' + textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'yybj'){ - this.form.yybj = this.form.yybj ? this.form.yybj + ',' +textArr.join(',') : textArr.join(',') - }else if(this.replaceLawType === 'cbbh'){ - this.form.cbbh = this.form.cbbh ? this.form.cbbh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'CYBZ'){ + this.form.CYBZ = this.form.CYBZ ? this.form.CYBZ + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'YYBZ'){ + this.form.YYBZ = this.form.YYBZ ? this.form.YYBZ + ',' +textArr.join(',') : textArr.join(',') }else if(this.replaceLawType === 'bfbdtbzh'){ this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') }else {