From 0414352cb936a3c023dd310be88ccb2921c84600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 28 Jan 2022 14:32:04 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E8=8A=82=E7=82=B9=E6=8F=8F=E8=BF=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 10 +++++----- .../pages/creatProcess/bzqdfb/step1-3.vue | 2 +- .../pages/creatProcess/bzqdfb/step1-4.vue | 2 +- .../pages/creatProcess/bzqdfb/step1.vue | 10 +++++----- .../pages/creatProcess/bzqdfb/step2.vue | 2 +- .../pages/creatProcess/bzqdfb/step3.vue | 2 +- .../pages/creatProcess/bzqdfb/step4.vue | 4 ++-- .../pages/creatProcess/qbzxdjhgk/step1.vue | 14 +++++++------- 8 files changed, 23 insertions(+), 23 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index cccf55f51..47c932a89 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -177,7 +177,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准/政策法规工程师

@@ -189,7 +189,7 @@ - @@ -203,7 +203,7 @@ - @@ -216,7 +216,7 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue index 0f2559fc7..d665cc132 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-3.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 419f7cd89..cb04ffdb8 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 28cf2602b..315f76072 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -177,7 +177,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准/政策法规工程师

@@ -189,7 +189,7 @@ - @@ -203,7 +203,7 @@ - @@ -216,7 +216,7 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 19e5fbd11..efa751b11 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index a10230dd2..a3da3a5b3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index a03c6e1a1..661221c74 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -3,13 +3,13 @@
- +
基础信息
审批历史
-
+
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue index 73b3e97c7..db28bc71c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -65,7 +65,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准立项申请人

@@ -77,7 +77,7 @@ - @@ -91,7 +91,7 @@ - @@ -110,7 +110,7 @@ - @@ -124,7 +124,7 @@ - @@ -138,7 +138,7 @@ - From 20e0ff1340485f6644e1f0f4750723c46f64d933 Mon Sep 17 00:00:00 2001 From: shenyanpei Date: Fri, 28 Jan 2022 15:54:31 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=AD=97=E6=AE=B5?= =?UTF-8?q?=E5=90=8D=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzrk/step1.vue | 10 +++++----- .../processCenter/pages/creatProcess/bzrk/step2.vue | 4 ++-- .../processCenter/pages/creatProcess/bzrk/step3.vue | 2 +- .../processCenter/pages/creatProcess/bzrk/step4.vue | 2 +- .../processCenter/pages/creatProcess/qbzxdlx/step1.vue | 4 ++-- .../processCenter/pages/creatProcess/qbzxdlx/step2.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step1.vue | 10 +++++----- .../processCenter/pages/creatProcess/wfhxzg/step2.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step3.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step4.vue | 2 +- .../processCenter/pages/creatProcess/wfhxzg/step5.vue | 2 +- 11 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue index 0c86eb228..654101b8b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -950,7 +950,7 @@ :model="roleForm" :rules="roleRules" class="label-input-form"> - +

流程发起人

@@ -960,7 +960,7 @@ - +

会签责任人

@@ -971,7 +971,7 @@ - +

修订申请人

@@ -981,7 +981,7 @@ - +

标准法规业务经理

diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue index ea1ca6d4a..001546aa4 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step2.vue @@ -3,7 +3,7 @@ - +
基础信息
@@ -1146,7 +1146,7 @@ export default { this.defaultCheckedKeys2 = [this.form.kccvppsbm] this.defaultCheckedKeys3 = [this.form.dybxh] this.form.standType = this.form.standInData === '0' ? 'INLAND' : 'FOREIGN' - this.form.standYear = this.form.standYear ? parseInt(this.form.standYear) : '' + this.form.standYear = this.form.standYear ? this.form.standYear : '' if (this.form.country !== undefined && this.form.country !== null && this.form.country !== '') { this.form.country = this.form.country.split(","); } diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue index e1da8dbe3..4571b8626 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step3.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue index e5f5eaa95..f5042d653 100644 --- a/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step4.vue @@ -3,7 +3,7 @@ - +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue index f18eee83f..b919a4c6c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -115,7 +115,7 @@ - +

责任人

diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue index 9383de57d..08840effb 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue index 3d3945aff..14cfd3585 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step1.vue @@ -2,7 +2,7 @@
- +
基础信息
@@ -73,7 +73,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

流程发起人

@@ -84,7 +84,7 @@ - +

标准法规工程师

@@ -96,7 +96,7 @@ - +

确认+选择责任人

@@ -108,7 +108,7 @@ - +

负责人

diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue index 8d7fc8f38..17b5d11e6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step2.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 43c21da4d..3b6e54bf1 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue index ae3f71baf..ed0a33904 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step4.vue @@ -2,7 +2,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue index 2c4757534..8a8de51ad 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step5.vue @@ -2,7 +2,7 @@
- +
基础信息
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 3/5] 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(',') } From 4230be34aa5c33dbc8d6fb841c0d201a9de05b04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Fri, 28 Jan 2022 16:43:50 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E6=A0=87=E5=87=86=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzpg/step1.vue | 225 ++++++++++++------ .../pages/creatProcess/bzpg/step2.vue | 2 +- .../pages/creatProcess/bzpg/step3.vue | 2 +- .../pages/creatProcess/bzpg/step4.vue | 2 +- .../pages/creatProcess/bzpg/step5.vue | 2 +- .../pages/creatProcess/bzpg/step6.vue | 2 +- .../pages/creatProcess/bzpg/step7.vue | 2 +- .../pages/creatProcess/bzpg/step8-1.vue | 2 +- .../pages/creatProcess/bzpg/step8.vue | 2 +- .../tabComponents/processCenter/index.vue | 11 + 10 files changed, 172 insertions(+), 80 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue index e6ec3219a..60e702bfb 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step1.vue @@ -3,7 +3,7 @@
- +
基础信息
@@ -194,7 +194,7 @@ :model="roleForm" :rules="roleFormRules" class="label-input-form"> - +

标准法规工程师

@@ -218,7 +218,7 @@ - +

标准法规部领导

@@ -495,7 +495,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { queryTaskFirst, saveTaskFirst, taskDel } from "api/process"; +import { inboundLiaisonDetail, queryTaskFirst, saveTaskFirst, taskDel } from "api/process"; export default { name: "bzpgStep1", @@ -506,6 +506,7 @@ export default { }, data() { return { + submitFlag: '', managementHostName: [], //管理主体名称下拉框 developmentHostName: [], //开发主体名称下拉框 categoryName: [], //项目细分类下拉框 @@ -642,6 +643,40 @@ export default { }; }, methods: { + getHistoryData() { + return new Promise((resolve, reject) => { + inboundLiaisonDetail({ + taskIds: this.$route.query.taskIds, + pId: this.$route.query.prcId, + }).then(res => { + if (res) { + const processForm = JSON.parse(res.mesg) + this.getFormFieldList(processForm) + } + }).catch(e => { + }) + }) + }, + /** + * @description: 动态表单读取 + */ + getFormFieldList (item) { + console.log(item); + this.$nextTick(() => { + this.listForm = JSON.parse(JSON.stringify(item)) + this.listForm.prcNum = this.prcNum + this.listForm.prcName = this.prcName + this.listForm['id'] = item.id + this.listForm.dataList = item.dataList + this.dataList = item.dataList + this.roleForm.dockUser = item.dockUser + this.roleForm.dockUserName = item.dockUserName + this.roleForm.ministerUser = item.ministerUser + this.roleForm.ministerUserName = item.ministerUserName + this.submitFlag = '修改节点' + this.dataList.distributePerson = item.dataList[0].distributePerson + }) + }, //折叠/展开基础信息方法 foldForm() { this.foldFormFlag = !this.foldFormFlag; @@ -808,75 +843,118 @@ export default { this.saveLoading = false; }); }, - //提交事件 - handleSubmit() { - if(!this.dataList.length){ - this.$message.warning('请添加项目群信息') - }else{ - this.dataList.forEach(item => { - if(!item.distributePerson || !item.projectGroupPeople){ - this.$message.warning('请填写完整的人员信息') - }else { - this.isSubmit = true; - this.listForm.dataList = this.dataList; - this.listForm.commentText = this.commentText; - let json = Object.assign(this.listForm, this.roleForm); - console.log(json); - this.$refs["listForm"].validate((valid) => { - if (valid) { - this.$refs["roleForm"].validate((valid) => { - if (valid) { - this.$http.post("lawss/activiti/startProcessRollBack", { - createUser: this.$store.getters.userInfo.userId, - createUserName: this.$store.getters.userInfo.userName, - type: "5", - json: JSON.stringify({ - taskInfo: "选择已拆分标准", - form: this.listForm, - roleForm: this.roleForm, - commentText: this.commentText - }) - }, { - _this: this - }, res => { - if (res.ok) { - this.$http.post("lawss/activiti/completeTask", { - taskIds: res.data, - userId: this.$store.getters.userInfo.userId, - json: JSON.stringify(json) - }, { - _this: this - }, res => { - if (res.success) { - this.$message.success(res.message); - if (this.bpnId !== '') { - let taskId = { - id: this.bpnId - } - taskDel(taskId).then(res=>{ - return res - }) - } - this.$router.push("/processCenter"); - } - this.isSubmit = false; - }); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善人员信息"); - } - }); - } else { - this.isSubmit = false; - return this.$message.warning("请完善基础信息"); - } - }); - } - }) - } + //提交事件 + handleSubmit(){ + let peopleFlag = true + if(!this.dataList.length){ + this.$message.warning('请添加项目群信息') + }else{ + this.dataList.forEach(item => { + if(!item.distributePerson || !item.projectGroupPeople){ + peopleFlag = false + return + } + }) + if(peopleFlag){ + this.isSubmit = true; + this.listForm.dataList = this.dataList; + this.listForm.commentText = this.commentText; + let json = Object.assign(this.listForm, this.roleForm); + if(!this.submitFlag){ + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.$http.post("lawss/activiti/startProcessRollBack", { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, + type: "5", + json: JSON.stringify({ + taskInfo: "选择已拆分标准", + form: this.listForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { + _this: this + }, res => { + if (res.ok) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: res.data, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json) + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善基础信息"); + } + }); + }else{ + this.$refs["listForm"].validate((valid) => { + if (valid) { + this.$refs["roleForm"].validate((valid) => { + if (valid) { + this.$http.post("lawss/activiti/completeTask", { + taskIds: this.$route.query.taskIds, + userId: this.$store.getters.userInfo.userId, + json: JSON.stringify(json), + }, { + _this: this + }, res => { + if (res.success) { + this.$message.success(res.message); + if (this.bpnId !== '') { + let taskId = { + id: this.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } + this.$router.push("/processCenter"); + } + this.isSubmit = false; + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善人员信息"); + } + }); + } else { + this.isSubmit = false; + return this.$message.warning("请完善基础信息"); + } + }); + } + }else{ + this.$message.warning('请完善人员信息') + } + + } }, //选择拆分标准取消事件 closeDrawer() { @@ -1056,6 +1134,9 @@ export default { if (this.bpnId !== undefined) { this.getData() } + if(this.$route.query.taskIds){ + this.getHistoryData() + } this.getStandData(); /** * 获取项目群筛选项的值 diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue index eb3a7428d..5846c6439 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step2.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue index 96b83d483..d30dab66f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step3.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue index cadc01dd0..71426e24e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step4.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue index 188779b39..e5f70d4c0 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step5.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue index 86e5cb9a8..779e3aed7 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step6.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue index 5badbc1cf..0b8a34174 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step7.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue index 3b4239e97..496336577 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-1.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue index aac3a90b9..e2f0f3c9b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8.vue @@ -3,7 +3,7 @@
- +
基础信息
diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index e9569dfe9..44e1b82c8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -977,6 +977,17 @@ export default { prcType: row.prcType } }) + }else if(row.taskInfo === '整改节点'){ + this.$router.push({ + name: 'bzpgStep1', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //项目评估流程-项目 From 4ad3e0086587f974bc68f056d301988ab2458fc8 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 28 Jan 2022 17:22:56 +0800 Subject: [PATCH 5/5] commit --- .../bzzqyj/ZQYJAddFileDetails.vue | 168 ++++++++++++++++++ .../pages/creatProcess/bzzqyj/step3.vue | 39 ++-- .../pages/creatProcess/bzzqyj/step4.vue | 53 ++++-- .../pags/consultationDetails.vue | 8 - src/router/index.js | 11 ++ 5 files changed, 238 insertions(+), 41 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue new file mode 100644 index 000000000..c24d9ab2b --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -0,0 +1,168 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index b96977649..ed23826e3 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -336,6 +336,7 @@ name: "bzzqyjStep3", data() { return { + standId: '', modaltitle2: '', addType: '', onlyKey: '', @@ -464,22 +465,16 @@ } }, addModal() { - var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); - this.itemId = id - this.editForm = { - chapterNumber: '', - chapterName: '', - oldText: '', - newText: '', - reason: '', - id: id, - department: this.$store.getters.userInfo.institutionName, - responUserName: this.$store.getters.userInfo.userName, - responUser: this.$store.getters.userInfo.userId - } - this.addType = 'add' - this.modaltitle2 = '新增' - this.modalshowflag2 = true + localStorage.setItem('freshClueNum', new Date().getTime()) + let routeData = this.$router.resolve({ + name: "ZQYJAddFileDetails", + query: { + standId: this.standId, + attId: this.form.fjList[0].attId, + fileType: this.form.fjList[0].standFileClassify, + } + }); + window.open(routeData.href, '_blank') }, itemEdit (row) { this.addType = 'edit' @@ -712,6 +707,7 @@ this.todoId = res.id this.json = data this.onlyKey = data.form ? data.form.onlyKey : data.onlyKey + this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.form ? data.form.data : (data.data ? data.data : (data.info ? data.info : [])) }).catch(e => { @@ -720,9 +716,18 @@ }, }, mounted() { + window.addEventListener("storage", ev => { + if(ev.key === 'freshClueNum'){ + let form = JSON.parse(window.localStorage.getItem('bzzqyjForm')) + form.department = this.$store.getters.userInfo.institutionName + form.responUserName = this.$store.getters.userInfo.userName + form.responUser = this.$store.getters.userInfo.userId + this.data.push(form) + } + }) this.getHistoryData() this.getData() - } + }, } diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index aa0bb8ae0..fed06959d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -346,6 +346,7 @@ export default { name: "bzzqyjStep4", data() { return { + standId: '', modaltitle2: '', addType: '', commentText4: '', @@ -505,22 +506,32 @@ export default { } }, addModal() { - var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); - this.itemId = id - this.editForm = { - chapterNumber: '', - chapterName: '', - oldText: '', - newText: '', - reason: '', - id: id, - department: this.$store.getters.userInfo.institutionName, - responUserName: this.$store.getters.userInfo.userName, - responUser: this.$store.getters.userInfo.userId - } - this.addType = 'add' - this.modaltitle2 = '新增' - this.modalshowflag2 = true + localStorage.setItem('freshClueNum', new Date().getTime()) + let routeData = this.$router.resolve({ + name: "ZQYJAddFileDetails", + query: { + standId: this.standId, + attId: this.form.fjList[0].attId, + fileType: this.form.fjList[0].standFileClassify, + } + }); + window.open(routeData.href, '_blank') + // var id = Number(Math.random().toString().substr(3, 3) + Date.now()).toString(36); + // this.itemId = id + // this.editForm = { + // chapterNumber: '', + // chapterName: '', + // oldText: '', + // newText: '', + // reason: '', + // id: id, + // department: this.$store.getters.userInfo.institutionName, + // responUserName: this.$store.getters.userInfo.userName, + // responUser: this.$store.getters.userInfo.userId + // } + // this.addType = 'add' + // this.modaltitle2 = '新增' + // this.modalshowflag2 = true }, itemEdit (row) { this.addType = 'edit' @@ -673,6 +684,7 @@ export default { this.form.spId = data.spId || '' this.form.spName = data.spName || '' this.json = data + this.standId = data.standId this.getItemList(data.standId,data.textType) this.data = data.info || data.data }).catch(e => { @@ -683,6 +695,15 @@ export default { mounted() { this.getHistoryData() this.getData() + window.addEventListener("storage", ev => { + if(ev.key === 'freshClueNum'){ + let form = JSON.parse(window.localStorage.getItem('bzzqyjForm')) + form.department = this.$store.getters.userInfo.institutionName + form.responUserName = this.$store.getters.userInfo.userName + form.responUser = this.$store.getters.userInfo.userId + this.data.push(form) + } + }) } } diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index b32569443..0fc96470c 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -452,14 +452,6 @@ } }); window.open(routeData.href, '_blank') - // return - // this.id = '' - // this.opiniontitle = '新增意见' - // this.opinionContent.partCode = '' - // this.opinionContent.reason = '' - // this.opinionContent.oldText = '' - // this.opinionContent.newText = '' - // this.opinionContent.cause = '' } }, //删除 diff --git a/src/router/index.js b/src/router/index.js index 3780eb167..281dfbf52 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -1363,6 +1363,17 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/ZQYJAddFileDetails', + name: 'ZQYJAddFileDetails', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue'), + meta: { + requireAuth: true, + title: '新增', + isBoolean: true, + // menuId: '' + } + }, { path: '/bzzqyjStep1', name: 'bzzqyjStep1',