From 383e798e930e02af506a2cef07e012427b1273dd Mon Sep 17 00:00:00 2001 From: super_liu <396572590@qq.com> Date: Fri, 28 Jan 2022 16:25:54 +0800 Subject: [PATCH] feat: There is no way the, --- .../qbrk-product/common/formEditList.vue | 30 +- .../qbrk-product/common/formList.vue | 12 +- .../qbrk-product/common/formListIn.vue | 12 +- .../pages/creatProcess/qbrk-product/step1.vue | 305 ++++++++++-------- .../creatProcess/qbrk-product/step13.vue | 35 +- .../pages/creatProcess/qbrk-product/step3.vue | 59 ++-- .../pages/creatProcess/qbrk-product/step6.vue | 59 ++-- .../creatProcess/qbrk-product/stepC3.vue | 59 ++-- .../creatProcess/qbrk-product/stepC6.vue | 59 ++-- 9 files changed, 361 insertions(+), 269 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue index 0a78312ec..d63e8d7d1 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList.vue @@ -101,7 +101,7 @@ > - + --> - - - - - - - - - - - - - - + + + {{'手动查找'}} + --> - - - - - - + + + --> - - - - - - + + + --> + + + 根据企标名称、起草责任单位查询 + + @@ -394,20 +402,20 @@ - - - - - - - - - - - - - - + + + {{'手动查找'}} +
- - + + - + - - - - - + + @@ -972,12 +973,12 @@
- 新增 + + + + + + { - let texts = '' - if (item.standYear != null && item.standYear !== '') { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber + '-' + item.standYear : item.standNumber + '-' + item.standYear - } else { - texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber - } - // 标准状态 修改 更新当前标准 - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - }) - } }else if(this.form.standStatus === '1' ){ this.form.id = "" + this.form.standCode = "" if(type === '1'){ this.isSubmit = true this.saveLoading = true @@ -1606,6 +1614,14 @@ this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); if(type === '1'){ this.isSubmit = false this.saveLoading = false @@ -1918,14 +1934,15 @@ } }, assemble(ids,names){ - let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i { if(res && res.data){ @@ -2005,20 +2022,42 @@ const json = Object.assign(bringData, bringData.attrInfoMap); this.form = JSON.parse(JSON.stringify(json)) - this.form.TGRLAWS = JSON.parse(JSON.stringify(json)).TGRLAWS && JSON.parse(JSON.stringify(json)).TGRLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGRLAWS.split(',') : [] - this.form.TGDWLAWS = JSON.parse(JSON.stringify(json)).TGDWLAWS && JSON.parse(JSON.stringify(json)).TGDWLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).TGDWLAWS.split(',') : [] - this.form.NYLXLAWS = JSON.parse(JSON.stringify(json)).NYLXLAWS && JSON.parse(JSON.stringify(json)).NYLXLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).NYLXLAWS.split(',') : [] - this.form.YYRZLAWS = JSON.parse(JSON.stringify(json)).YYRZLAWS && JSON.parse(JSON.stringify(json)).YYRZLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).YYRZLAWS.split(',') : [] - this.form.ZRBMLAWS = JSON.parse(JSON.stringify(json)).ZRBMLAWS && JSON.parse(JSON.stringify(json)).ZRBMLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRBMLAWS.split(',') : [] - this.form.ZRGCSLAWS = JSON.parse(JSON.stringify(json)).ZRGCSLAWS && JSON.parse(JSON.stringify(json)).ZRGCSLAWS !== '[]' ? JSON.parse(JSON.stringify(json)).ZRGCSLAWS.split(',') : [] this.form.prcNum = this.prcNum this.form.prcName = this.prcName + this.form.standStatus = "3" + this.form.QCRBUSSID = '' + this.form.standNum ='' + this.form.planId='' + this.form.planStatus='' + this.form.reviseStatus='' + this.form.standSn='' + this.form.modelData=[] + this.form.modelDataNameVerify=[] + this.form.modelDataZrUserVerify=[] + this.form.QCDWID= '' + this.form.WJSCRYBUSS= this.$store.getters.userInfo.userId + this.form.WJSCRYBUSSName= this.$store.getters.userInfo.userName this.form['id'] = bringData.id this.standardDrawer = false this.verifySarStandard = true this.busVsFunc() this.modelFunc() this.$forceUpdate() + this.BZSMBUSSFileList=this.assemble(this.form.BZSMBUSS,this.form.BZSMBUSSName); + this.QTWJBUSSFileList=this.assemble(this.form.QTWJBUSS,this.form.QTWJBUSSName); + this.GLWJBUSSFileList=this.assemble(this.form.GLWJBUSS,this.form.GLWJBUSSName); + this.LSBBBUSSFileList = [] + if(this.LSBBBUSSFileList && this.LSBBBUSSFileList.length > 0){ + this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) + }else { + this.LSBBBUSSFileList=this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName); + } + this.form.LSBBBUSS = this.form.FBGBUSS + this.form.LSBBBUSSName = this.form.FBGBUSSName + this.FBGBUSSFileList= [] + this.FBGBUSS = "" + this.FBGBUSSName = "" + console.log(this.form) } // 遍历对象初始化文件信息 for(const p in this.form) { @@ -2030,9 +2069,9 @@ }) } else if (this.standardCheckedList.length > 1) { - this.$message.warning('最多可以带入一条政策信息') + this.$message.warning('最多可以带入一条企标信息') } else { - this.$message.warning('请选择要带入的政策信息') + this.$message.warning('请选择要带入的企标信息') } break // 取消 @@ -2136,7 +2175,7 @@ }, getDomesticStandardTable () { this.loadSarStandard = true - this.$http.get('lawss/sarLawsInfo/page', this.standardSearchForm, {}, res => { + this.$http.get('lawss/sarBussionessStand/getSarBussionStandPage', this.standardSearchForm, {}, res => { this.loadSarStandard = false if (res.ok) { this.tableData.standardData = res.data.list @@ -2415,7 +2454,6 @@ }) } let textArr2 = [] - this.form.selListRep2 = [] this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { @@ -2423,16 +2461,6 @@ } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - // 标准状态 修改 更新当前标准 - if(this.form.standStatus === '3'){ - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - } - this.form.selListRep2.push(item) textArr2.push(item.standNumber) textArr.push(texts) textArr = [...new Set(textArr)] @@ -2443,13 +2471,13 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.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 === 'bfbdtbzh'){ - this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'BDTQBBHBUSS'){ + this.form.BDTQBBHBUSS = textArr.join(',') + this.form.standNum = textArr2.join(',') }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -2556,7 +2584,12 @@ }, // 文件预览及下载 handleFilePreview(file) { - const attId = file.response.data.id + let attId = "" + if(file && file.id){ + attId = file.id + }else { + attId = file.response.data.id + } if (this.preview) { if (attId) { window.location.href = '/api/att/attFile/downloadFileForSar?fileId=' + attId @@ -2569,32 +2602,40 @@ }, // 导入标准数据成功后执行 importFileSuccess (response, file,fileList) { - // 上传成功后判断是否是两条数据是的话替换掉旧数据 - // if (fileList.length > 1) { - // this.fileList = fileList.splice(0, 1) - // } + // 上传成功后判断是否是两条数据是的话替换掉旧数据 + // if (fileList.length > 1) { + // this.fileList = fileList.splice(0, 1) + // } if (response.ok) { - - switch (this.fileType){ - case 'FBGBUSS': - this.FBGBUSSFileList = fileList - break; - case 'BZSMBUSS' : - this.BZSMBUSSFileList = fileList - break; - case 'LSBBBUSS': - this.LSBBBUSSFileList = fileList - break; - case 'QTWJBUSS': - this.QTWJBUSSFileList = fileList - break; - case 'GLWJBUSS': - this.GLWJBUSSFileList = fileList - break; - case 'XGD' : - this.XGDFileList = fileList - break; - default : ; + const fileObj = {} + fileObj.id = file.response.data.id + fileObj.name = file.response.data.name + switch (this.fileType){ + case 'FBGBUSS': + this.FBGBUSSFileList = this.FBGBUSSFileList.filter ( item => item.response === undefined); + this.FBGBUSSFileList.push(fileObj) + break; + case 'BZSMBUSS' : + this.BZSMBUSSFileList = this.BZSMBUSSFileList.filter ( item => item.response === undefined); + this.BZSMBUSSFileList.push(fileObj) + break; + case 'LSBBBUSS': + this.LSBBBUSSFileList = this.LSBBBUSSFileList.filter ( item => item.response === undefined); + this.LSBBBUSSFileList.push(fileObj) + break; + case 'GLWJLAWS': + this.GLWJLAWSFileList = this.GLWJLAWSFileList.filter ( item => item.response === undefined); + this.GLWJLAWSFileList.push(fileObj) + break; + case 'GLWJBUSS': + this.GLWJBUSSFileList = this.GLWJBUSSFileList.filter ( item => item.response === undefined); + this.GLWJBUSSFileList.push(fileObj) + break; + case 'XGD': + this.XGDFileList = this.XGDFileList.filter ( item => item.response === undefined); + this.XGDFileList.push(fileObj) + break; + default : ; } this.$message({ showClose: true, @@ -2736,24 +2777,24 @@ }, fileInfoHandle(){ - //拼接文件名和id 提交到流程Activity - this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.response.data.id).join(",") - this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") + //拼接文件名和id 提交到流程Activity + this.form.FBGBUSS=this.FBGBUSSFileList.map(item => item.id).join(",") + this.form.FBGBUSSName=this.FBGBUSSFileList.map(item => item.name).join(",") - this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.response.data.id).join(",") - this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") + this.form.BZSMBUSS=this.BZSMBUSSFileList.map(item => item.id).join(",") + this.form.BZSMBUSSName=this.BZSMBUSSFileList.map(item => item.name).join(",") - this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.response.data.id).join(",") - this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") + this.form.LSBBBUSS=this.LSBBBUSSFileList.map(item => item.id).join(",") + this.form.LSBBBUSSName=this.LSBBBUSSFileList.map(item => item.name).join(",") - this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.response.data.id).join(",") - this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") + this.form.QTWJBUSS=this.QTWJBUSSFileList.map(item => item.id).join(",") + this.form.QTWJBUSSName=this.QTWJBUSSFileList.map(item => item.name).join(",") - this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.response.data.id).join(",") - this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") + this.form.GLWJBUSS=this.GLWJBUSSFileList.map(item => item.id).join(",") + this.form.GLWJBUSSName=this.GLWJBUSSFileList.map(item => item.name).join(",") - this.form.XGD=this.XGDFileList.map(item => item.response.data.id).join(",") - this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") + this.form.XGD=this.XGDFileList.map(item => item.id).join(",") + this.form.XGDName=this.XGDFileList.map(item => item.name).join(",") }, // 删除方法 @@ -2847,7 +2888,7 @@ this.isSubmit = true this.saveLoading = true this.form.country=this.countryArr; - var json = Object.assign(this.form, this.roleForm) + const json = Object.assign(this.form, this.roleForm); json.zrUserId = this.form.zrUserId json.jlUserId = this.form.jlUserId json.commentText = this.commentText diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index 954d113d8..12b3d9bd0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1087,13 +1087,6 @@ } } }, - 'form.standStatus': { - handler (val) { - if (val !== '' && val !== null && typeof (val) !== 'undefined') { - this.getStandInfoByReviseStatus("1") - } - } - }, filterText(val) { this.$refs.tree.filter(val); }, @@ -1865,7 +1858,6 @@ }) } let textArr2 = [] - this.form.selListRep2 = [] this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { @@ -1873,16 +1865,6 @@ } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - // 标准状态 修改 更新当前标准 - if(this.form.standStatus === '3'){ - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - } - this.form.selListRep2.push(item) textArr2.push(item.standNumber) textArr.push(texts) textArr = [...new Set(textArr)] @@ -1893,13 +1875,13 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.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 === 'bfbdtbzh'){ - this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'BDTQBBHBUSS'){ + this.form.BDTQBBHBUSS = textArr.join(',') + this.form.standNum = textArr2.join(',') }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } @@ -2498,12 +2480,13 @@ }, assemble(ids,names){ let list= new Array(); - let idArray=ids.split(','); - let nameArray=names.split(','); - for(let i=0; i { }) } + }, drawerCheckZRBM(data) { let idList = '' @@ -1939,7 +1967,6 @@ }) } let textArr2 = [] - this.form.selListRep2 = [] this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { @@ -1947,16 +1974,6 @@ } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - // 标准状态 修改 更新当前标准 - if(this.form.standStatus === '3'){ - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - } - this.form.selListRep2.push(item) textArr2.push(item.standNumber) textArr.push(texts) textArr = [...new Set(textArr)] @@ -1967,13 +1984,13 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.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 === 'bfbdtbzh'){ - this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'BDTQBBHBUSS'){ + this.form.BDTQBBHBUSS = textArr.join(',') + this.form.standNum = textArr2.join(',') }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 7f156f43d..98b7500bf 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1154,13 +1154,6 @@ } } }, - 'form.standStatus': { - handler (val) { - if (val !== '' && val !== null && typeof (val) !== 'undefined') { - this.getStandInfoByReviseStatus() - } - } - }, 'form.issueTime': { handler: function() { if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ @@ -1217,6 +1210,15 @@ let year = date.getFullYear(); if(this.form.standStatus === '2'){ this.form.id = "" + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); + this.formKey++ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { this.$message.warning("请选择一条代替企标编号") return @@ -1227,7 +1229,22 @@ this.form.standYear = this.regDate(year) this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } + this.formKey++ }else if(this.form.standStatus === '3' ){ + sessionStorage.removeItem("FBGBUSSBF") + sessionStorage.removeItem("FBGBUSSNameBF") + sessionStorage.removeItem("LSBBBUSSBF") + sessionStorage.removeItem("LSBBBUSSNameBF") + sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS) + sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName) + sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS) + sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName) + this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) + this.form.LSBBBUSS = this.form.FBGBUSS + this.form.LSBBBUSSName = this.form.FBGBUSSName + this.FBGBUSSFileList= [] + this.FBGBUSS = "" + this.FBGBUSSName = "" if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { this.$message.warning("请选择一条代替企标编号") return @@ -1249,6 +1266,7 @@ this.form.id = item.id }) } + this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -1264,13 +1282,23 @@ this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); if(type === '1'){ this.isSubmit = false this.saveLoading = false } + this.formKey++ }, e => { }) } + }, drawerCheckZRBM(data) { let idList = '' @@ -2030,7 +2058,6 @@ }) } let textArr2 = [] - this.form.selListRep2 = [] this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { @@ -2038,16 +2065,6 @@ } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - // 标准状态 修改 更新当前标准 - if(this.form.standStatus === '3'){ - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - } - this.form.selListRep2.push(item) textArr2.push(item.standNumber) textArr.push(texts) textArr = [...new Set(textArr)] @@ -2058,13 +2075,13 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.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 === 'bfbdtbzh'){ - this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'BDTQBBHBUSS'){ + this.form.BDTQBBHBUSS = textArr.join(',') + this.form.standNum = textArr2.join(',') }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue index 05d84ccc3..d315a4030 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC3.vue @@ -1075,13 +1075,6 @@ } } }, - 'form.standStatus': { - handler (val) { - if (val !== '' && val !== null && typeof (val) !== 'undefined') { - this.getStandInfoByReviseStatus("1") - } - } - }, 'form.issueTime': { handler: function() { if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ @@ -1138,6 +1131,15 @@ let year = date.getFullYear(); if(this.form.standStatus === '2'){ this.form.id = "" + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); + this.formKey++ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { this.$message.warning("请选择一条代替企标编号") return @@ -1148,7 +1150,22 @@ this.form.standYear = this.regDate(year) this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } + this.formKey++ }else if(this.form.standStatus === '3' ){ + sessionStorage.removeItem("FBGBUSSBF") + sessionStorage.removeItem("FBGBUSSNameBF") + sessionStorage.removeItem("LSBBBUSSBF") + sessionStorage.removeItem("LSBBBUSSNameBF") + sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS) + sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName) + sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS) + sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName) + this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) + this.form.LSBBBUSS = this.form.FBGBUSS + this.form.LSBBBUSSName = this.form.FBGBUSSName + this.FBGBUSSFileList= [] + this.FBGBUSS = "" + this.FBGBUSSName = "" if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { this.$message.warning("请选择一条代替企标编号") return @@ -1170,6 +1187,7 @@ this.form.id = item.id }) } + this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -1185,13 +1203,23 @@ this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); if(type === '1'){ this.isSubmit = false this.saveLoading = false } + this.formKey++ }, e => { }) } + }, drawerCheckZRBM(data) { let idList = '' @@ -1939,7 +1967,6 @@ }) } let textArr2 = [] - this.form.selListRep2 = [] this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { @@ -1947,16 +1974,6 @@ } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - // 标准状态 修改 更新当前标准 - if(this.form.standStatus === '3'){ - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - } - this.form.selListRep2.push(item) textArr2.push(item.standNumber) textArr.push(texts) textArr = [...new Set(textArr)] @@ -1967,13 +1984,13 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.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 === 'bfbdtbzh'){ - this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'BDTQBBHBUSS'){ + this.form.BDTQBBHBUSS = textArr.join(',') + this.form.standNum = textArr2.join(',') }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue index 5c13c93c9..4ccc782c0 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/stepC6.vue @@ -1154,13 +1154,6 @@ } } }, - 'form.standStatus': { - handler (val) { - if (val !== '' && val !== null && typeof (val) !== 'undefined') { - this.getStandInfoByReviseStatus() - } - } - }, 'form.issueTime': { handler: function() { if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ @@ -1217,6 +1210,15 @@ let year = date.getFullYear(); if(this.form.standStatus === '2'){ this.form.id = "" + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); + this.formKey++ if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { this.$message.warning("请选择一条代替企标编号") return @@ -1227,7 +1229,22 @@ this.form.standYear = this.regDate(year) this.form.standCode = this.form.standSort + ' ' + this.form.standNum + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) } + this.formKey++ }else if(this.form.standStatus === '3' ){ + sessionStorage.removeItem("FBGBUSSBF") + sessionStorage.removeItem("FBGBUSSNameBF") + sessionStorage.removeItem("LSBBBUSSBF") + sessionStorage.removeItem("LSBBBUSSNameBF") + sessionStorage.setItem("FBGBUSSBF",this.form.FBGBUSS) + sessionStorage.setItem("FBGBUSSNameBF",this.form.FBGBUSSName) + sessionStorage.setItem("LSBBBUSSBF",this.form.LSBBBUSS) + sessionStorage.setItem("LSBBBUSSNameBF",this.form.LSBBBUSSName) + this.LSBBBUSSFileList=this.LSBBBUSSFileList.concat(this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName)) + this.form.LSBBBUSS = this.form.FBGBUSS + this.form.LSBBBUSSName = this.form.FBGBUSSName + this.FBGBUSSFileList= [] + this.FBGBUSS = "" + this.FBGBUSSName = "" if((this.form.standStatus === '3' || this.form.standStatus === '2') && (this.form.DTQBBHBUSS === undefined || this.form.DTQBBHBUSS === '')) { this.$message.warning("请选择一条代替企标编号") return @@ -1249,6 +1266,7 @@ this.form.id = item.id }) } + this.formKey++ }else if(this.form.standStatus === '1' ){ this.form.id = "" if(type === '1'){ @@ -1264,13 +1282,23 @@ this.form.standNumber = standSn this.form.standYear = year // 待带入立项标准 this.form.standCode = this.form.standSort + ' ' + standSn + ( this.form.standYear === '' ? '' : '-' + this.form.standYear ) + this.FBGBUSSFileList = [] + this.LSBBBUSSFileList = [] + this.form.FBGBUSS = sessionStorage.getItem("FBGBUSSBF") + this.form.FBGBUSSName = sessionStorage.getItem("FBGBUSSNameBF") + this.form.LSBBBUSS = sessionStorage.getItem("LSBBBUSSBF") + this.form.LSBBBUSSName = sessionStorage.getItem("LSBBBUSSNameBF") + this.FBGBUSSFileList=this.assemble(sessionStorage.getItem("FBGBUSSBF"),sessionStorage.getItem("FBGBUSSNameBF")); + this.LSBBBUSSFileList=this.assemble(sessionStorage.getItem("LSBBBUSSBF"),sessionStorage.getItem("LSBBBUSSNameBF")); if(type === '1'){ this.isSubmit = false this.saveLoading = false } + this.formKey++ }, e => { }) } + }, drawerCheckZRBM(data) { let idList = '' @@ -2030,7 +2058,6 @@ }) } let textArr2 = [] - this.form.selListRep2 = [] this.selectedListRep.map((item) => { let texts = '' if (item.standYear != null && item.standYear !== '') { @@ -2038,16 +2065,6 @@ } else { texts = item.standSort !== null ? item.standSort + ' ' + item.standNumber : item.standNumber } - // 标准状态 修改 更新当前标准 - if(this.form.standStatus === '3'){ - this.form.standSort = item.standSort - this.form.standName = item.standName - this.form.standNumber = item.standNumber - this.form.standYear = item.standYear - this.form.standCode = texts - this.form.id = item.id - } - this.form.selListRep2.push(item) textArr2.push(item.standNumber) textArr.push(texts) textArr = [...new Set(textArr)] @@ -2058,13 +2075,13 @@ // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if(this.replaceLawType === 'DTQBBHBUSS'){ this.form.DTQBBHBUSS = textArr.join(',') - this.form.standNum = textArr2.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 === 'bfbdtbzh'){ - this.form.bfbdtbzh = this.form.bfbdtbzh ? this.form.bfbdtbzh + ',' +textArr.join(',') : textArr.join(',') + }else if(this.replaceLawType === 'BDTQBBHBUSS'){ + this.form.BDTQBBHBUSS = textArr.join(',') + this.form.standNum = textArr2.join(',') }else { this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') }