From 99f074fd12c020d919a76320acadfb94295bc7c4 Mon Sep 17 00:00:00 2001 From: CD <1103614279@qq.com> Date: Wed, 11 Jan 2023 17:34:15 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E4=BC=81=E6=A0=87=E5=88=B6=E4=BF=AE?= =?UTF-8?q?=E8=AE=A2=E8=AE=A1=E5=88=92=E7=AE=A1=E6=8E=A7-=E7=AB=8B?= =?UTF-8?q?=E9=A1=B9-=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86=E8=B5=B7?= =?UTF-8?q?=E8=8D=89=E8=8A=82=E7=82=B9=20=E5=8E=BB=E6=8E=89(=E4=BC=81?= =?UTF-8?q?=E6=A0=87=E7=B1=BB=E5=88=AB=20=E4=B8=AD=E6=96=87=E5=90=8D?= =?UTF-8?q?=E7=A7=B0)=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 676c82575..9f565bdc8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -1605,9 +1605,9 @@ export default { modelName: [ { required: true, message: '选择维护模块名称', validator: validateModelName,trigger: 'blur' }, ], - standSort: [ - { required: true, validator:validateStandSort,trigger: 'change' } - ], + // standSort: [ + // { required: true, validator:validateStandSort,trigger: 'change' } + // ], standNumber: [ { required: true, message: '请输入企标编号', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, @@ -1616,11 +1616,11 @@ export default { { required: true, message: '请输入标准年份'}, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, ], - standName: [ - { required: true, validator:validateStandName, trigger: 'blur' }, - { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, - {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} - ], + // standName: [ + // { required: true, validator:validateStandName, trigger: 'blur' }, + // { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, + // {validator: this.verify.checkSpecialCharacterOftags, trigger: 'change'} + // ], standEnName: [ { required: false, message: '请输入企标英文名称', trigger: 'blur' }, { min: 1, max: 100, message: '长度在 1 到 100 个字符', trigger: 'blur' }, From 4a20d3fcc15471df5f72ed1770c0205114b4720b Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 12 Jan 2023 10:27:05 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86(?= =?UTF-8?q?=E8=B5=B7=E8=8D=89)-=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B(=E4=BF=AE=E8=AE=A2/=E4=BF=AE=E6=94=B9)=E5=B0=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=A8=BF=E7=9A=84=E6=96=87=E4=BB=B6=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 5888b4aa7..849118fd7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2081,6 +2081,7 @@ let standStatus = this.form.standStatus const json = Object.assign(bringData, bringData.attrInfoMap); this.form = JSON.parse(JSON.stringify(json)) + console.log(this.form) this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form.QCRBUSSID = '' @@ -2124,10 +2125,17 @@ }else { this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } - this.getStandInfoByReviseStatus() + // this.getStandInfoByReviseStatus() + // 制修订类型-修订时将 获取的发布稿 放到历史版本处 + this.LSBBBUSSFileList = this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName).concat(this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName)) }else { this.form.standStatus = "3" - this.getStandInfoByReviseStatus('dr') + // this.getStandInfoByReviseStatus('dr') + // 制修订类型-修改时将 获取的发布稿 放到历史版本处 + 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.LSBBBUSSFileList = this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName).concat(this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName)) } this.$forceUpdate() } From df46cd63f2853f1a2d3320725e9e8647b2fd758b Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 12 Jan 2023 10:27:46 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86(?= =?UTF-8?q?=E8=B5=B7=E8=8D=89)-=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B(=E4=BF=AE=E8=AE=A2/=E4=BF=AE=E6=94=B9)=E5=B0=86?= =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=A8=BF=E7=9A=84=E6=96=87=E4=BB=B6=E6=94=BE?= =?UTF-8?q?=E5=88=B0=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step1.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 849118fd7..b2e08633d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2081,7 +2081,6 @@ let standStatus = this.form.standStatus const json = Object.assign(bringData, bringData.attrInfoMap); this.form = JSON.parse(JSON.stringify(json)) - console.log(this.form) this.form.prcNum = this.prcNum this.form.prcName = this.prcName this.form.QCRBUSSID = '' From caabe4613ac72c37101cc5cb112a7e362dffb332 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 12 Jan 2023 11:40:23 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86(?= =?UTF-8?q?=E5=8F=91=E5=B8=83)-=E5=88=B6=E4=BF=AE=E8=AE=A2=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B(=E4=BF=AE=E8=AE=A2)=20=E6=B8=85=E7=A9=BA=E5=8E=86?= =?UTF-8?q?=E5=8F=B2=E7=89=88=E6=9C=AC=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/qbrk-product/step13.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 788af07cd..323d3fb99 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -2518,6 +2518,11 @@ this.form.topId = this.pId this.form.reviseStatus = 'buss2_'+this.form.standStatus this.form.textStatusBuss = '6jnqba2mby' + // 修订时 清空历史版本文件 + if(this.form.standStatus==='2') { + this.form.LSBBBUSSName = '' + this.form.LSBBBUSS = '' + } const json = JSON.stringify(this.form); this.$http.post('lawss/activiti/completeTask', { taskIds: this.taskIds,