diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 72b532e13..2f0f60af2 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -358,7 +358,7 @@ + v-model="form.SYCXCLASS" placeholder="请选择适用车型" multiple @change="selectChange"> { + if (res) { + if(this.form.FBGBUSS.indexOf(res.id) === -1 ){ + this.form.FBGBUSS = res.id + ',' + this.form.FBGBUSS + } + + if (val && val !== '') { + if(this.form.FBGBUSSName.indexOf(val) === -1 ){ + this.form.FBGBUSSName = val + ',' + this.form.FBGBUSSName + this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, this.form.FBGBUSSName) + } + } else { + this.form.FBGBUSSName = '企业标准' + ',' + this.form.FBGBUSSName + // this.FBGBUSSFileList = [] + // this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, '企业标准'); + this.FBGBUSSFileList = this.assemble(this.form.FBGBUSS, this.form.FBGBUSSName) + } } + }) } }, }, @@ -3442,6 +3456,9 @@ }) }) }, + selectChange(){ + this.$forceUpdate() + }, getData() { if (this.$route.query.taskIds && this.$route.query.prcId) { return new Promise((resolve, reject) => { @@ -3450,8 +3467,11 @@ pId: this.$route.query.prcId }).then(res => { if (res) { - const processForm = JSON.parse(res.mesg) - console.log(processForm); + let processForm = JSON.parse(res.mesg) + this.commentText = processForm.commentText + if(processForm.form){ + processForm = processForm.form + } this.todoId = res.id if (processForm.reviseStatus == '制定') { processForm.reviseStatus = '1' @@ -3465,18 +3485,12 @@ this.form.reviseStatus = processForm.reviseStatus this.form.standName = processForm.renameEs ? processForm.renameEs : processForm.esName - this.$http.get('/lawss/activiti/saveEditFile', { - model: 'model_qb' - }, { - _this: this - }, res => { - if (res) { - this.form.FBGBUSS = res.id - this.form.FBGBUSSName = this.form.standName - this.FBGBUSSFileList = this.assemble(res.id, this.form.FBGBUSSName); - } - }) + this.FBGBUSSFileList=[...this.FBGBJBDFileList,...this.assemble(processForm.FBGBUSS,processForm.FBGBUSSName)] + this.BZSMBUSSFileList=this.assemble(processForm.BZSMBUSS,processForm.BZSMBUSSName); + this.LSBBBUSSFileList=this.assemble(processForm.LSBBBUSS,processForm.LSBBBUSSName); + this.QTWJBUSSFileList=this.assemble(processForm.QTWJBUSS,processForm.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(processForm.GLWJBUSS,processForm.GLWJBUSSName); // 企标制修订计划管控 进入 技术标准起草 修订类型: 发布稿放到历史版本 if(processForm.reviseStatus === '2'){ this.selectByIdAtt(processForm.rqbJson).then(res =>{ @@ -3489,19 +3503,19 @@ } - this.form.QCDW = processForm.unitName - this.form.QCDWID = processForm.unit - this.form.QCRBUSSID = processForm.drafter - this.form.QCRBUSS = processForm.drafterName - this.form.SYCXCLASS = processForm.area + this.form.QCDW = processForm.QCDW || processForm.unitName + this.form.QCDWID = processForm.QCDWID || processForm.unit + this.form.QCRBUSSID = processForm.QCRBUSSID || processForm.drafter + this.form.QCRBUSS = processForm.QCRBUSS || processForm.drafterName + this.form.SYCXCLASS = processForm.area.length === 0 ? processForm.SYCXCLASS : processForm.area if (processForm.type == '1') { this.esId1 = processForm.esId1 this.esId2 = processForm.esId2 } this.taskType = processForm.type - this.form.DTQBBHBUSS = processForm.rqbName - this.form.CYBZ = processForm.esStandRelations - this.form.YYBZ = processForm.esMatingRelations + this.form.DTQBBHBUSS = processForm.DTQBBHBUSS || processForm.rqbName + this.form.CYBZ = processForm.CYBZ || processForm.esStandRelations + this.form.YYBZ = processForm.YYBZ || processForm.esMatingRelations // this.form.CYCD = processForm.useLevel === '29l0zgltnq' ? 'IDT等同采用' : processForm.useLevel === '9te26649ne' ? 'NEQ非等效采用' : 'MOD修改采用' this.$http.get('lawss/activiti/judgeAcceptTack', { nowEsId: this.nowEsId,