diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 5888b4aa7..b2e08633d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2124,10 +2124,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() } 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, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index e273e0c79..9ebe40882 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' },