From 8c96c240e654e2970c68a21c86da691b948e3148 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 5 May 2023 09:32:38 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD=E6=8C=89=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 40 +++++++++++++++++- .../pages/creatProcess/qbrk/step1-2.vue | 41 ++++++++++++++++++- .../pages/creatProcess/qbrk/step1.vue | 41 ++++++++++++++++++- 3 files changed, 117 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 04e4e8183..2d46cda40 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -218,7 +218,12 @@ >
-
{{ item.name }}
+
+ {{ item.name }} + + + +
{{ item.name }} + style="color: #409eff;cursor:pointer" + class="fileClass"> + {{ item.name }} + + +
@@ -2919,6 +2923,39 @@ this.$preview(attId) } }, + handleFilePreview2(file, type) { + let attId = "" + if (file && file.id) { + attId = file.id + } else { + attId = file.response.data.id + } + if (file.name == this.form.standName) { + let fileName = "" + let fileNam2 = "" + if (this.form.standName && this.form.standName !== '') { + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName + } else { + fileName = '企业标准.docx' + fileNam2 = '企业标准' + } + let form = JSON.parse(JSON.stringify(this.form)) + form.standCode = '' + form.issueDate = '' + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + return + } + if (type === 'down') { + if (attId) { + window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else { + this.$preview(attId) + } + }, handleFilePreviewOne(file, type) { let id = "" let fileName = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 219c26865..5912c226d 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -209,8 +209,12 @@
{{ item.name }} + @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer;margin-left: 12px;" + class="fileClass"> + {{ item.name }} + + +
@@ -3318,6 +3322,39 @@ this.$onlineEdit(id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, JSON.parse(JSON.stringify(this.form))) } }, + handleFilePreview2(file, type) { + let attId = "" + if (file && file.id) { + attId = file.id + } else { + attId = file.response.data.id + } + if (file.name == this.form.standName) { + let fileName = "" + let fileNam2 = "" + if (this.form.standName && this.form.standName !== '') { + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName + } else { + fileName = '企业标准.docx' + fileNam2 = '企业标准' + } + let form = JSON.parse(JSON.stringify(this.form)) + form.standCode = '' + form.issueDate = '' + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + return + } + if (type === 'down') { + if (attId) { + window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) + } else { + this.$message.warning('文件不存在,下载失败') + } + } else { + this.$preview(attId) + } + }, changeRestTree(val) { let arr = []; if (val.length !== 0) { From 317fef3a297a62f5002ba4658236756896b7503e Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 5 May 2023 11:08:58 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 61 +++++++++++++------ .../pages/creatProcess/qbrk/step1.vue | 2 +- 2 files changed, 42 insertions(+), 21 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 2d46cda40..7610e172f 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -2162,6 +2162,29 @@ this.XGDFileList=this.assemble(this.form.XGD,this.form.XGDName); this.LSBBBUSSFileList = this.assemble(this.form.FBGBUSS,this.form.FBGBUSSName).concat(this.assemble(this.form.LSBBBUSS,this.form.LSBBBUSSName)) } + // 发布稿不为空 + if(this.form.FBGBUSS && this.form.FBGBUSS!==''){ + // 历史版本不为空 + if(this.form.LSBBBUSS && this.form.LSBBBUSS !== ''){ + this.LSBBBUSS = this.form.FBGBUSS + ',' + this.form.LSBBBUSS + this.LSBBBUSSName = this.form.FBGBUSSName + ',' + this.form.LSBBBUSSName + }else{ + // 历史版本为空 + this.LSBBBUSS = this.form.FBGBUSS + this.LSBBBUSSName = this.form.FBGBUSSName + } + }else{ + // 发布稿为空 + // 历史版本不为空 + if(this.form.LSBBBUSS && this.form.LSBBBUSS !== ''){ + this.LSBBBUSS = this.form.LSBBBUSS + this.LSBBBUSSName = this.form.LSBBBUSSName + }else{ + // 都为空 + this.LSBBBUSS = '' + this.LSBBBUSSName = '' + } + } this.$forceUpdate() } // 遍历对象初始化文件信息 @@ -2595,20 +2618,19 @@ } // this.$emit('input', textArr.join(',')) - // 修订 时 手动查找代替企标编号 发布稿放到历史版本 - if(this.replaceLawType === 'DTQBBHBUSS' && this.form.standStatus === '2' && this.selectedListRep.length){ - let ids = this.selectedListRep.reduce((init,item,index,arr)=>{ - let result - if(index === arr.length - 1){ - result = init + item.id - }else{ - result = init + item.id + ',' - } - return result - },'') - try{ + // 修订、修改 时 手动查找代替企标编号 发布稿放到历史版本 + if(this.replaceLawType === 'DTQBBHBUSS' && (this.form.standStatus === '2' || this.form.standStatus === '3') && this.selectedListRep.length > 0){ + let ids = this.selectedListRep.reduce((init,item,index,arr)=>{ + let result + if(index === arr.length - 1){ + result = init + item.id + }else{ + result = init + item.id + ',' + } + return result + },'') selectByIdAtt(ids).then(res =>{ - if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') { + if (res && res.data && res.data.fbgbuss !== '') { this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{ if(index === 0){ init = item.fbgbussNmae @@ -2625,16 +2647,15 @@ } return init },'') - }else if(res && res.data && res.data.length === 0){ - this.form.LSBBBUSS = '' - this.form.LSBBBUSSName = '' + // 带入的历史版本 与 选择的代替企标编号中的历史版本合并 + if(this.LSBBBUSS && this.LSBBBUSS !== ''){ + this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS + this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName + } + this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); } - this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); }) - }catch(e){ - console.log(e) } - } this.$refs.selections.clearSelection() }, diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 5912c226d..29f11a2a8 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -2851,7 +2851,7 @@ return init },'') // 带入的历史版本即选择的代替企标编号中的历史版本合并 - if(this.LSBBBUSS !== ''){ + if(this.LSBBBUSS && this.LSBBBUSS !== ''){ this.form.LSBBBUSS = this.LSBBBUSS + ',' + this.form.LSBBBUSS this.form.LSBBBUSSName = this.LSBBBUSSName + ',' + this.form.LSBBBUSSName } From 8238d49985ed80d04f2e34183ebf28235c98b522 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 5 May 2023 14:23:13 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E6=8A=80=E6=9C=AF=EF=BC=88=E4=BA=A7?= =?UTF-8?q?=E5=93=81=EF=BC=89=E6=A0=87=E5=87=86-=E8=B5=B7=E8=8D=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/components/ProcessMixin.vue | 14 ++++++++++++++ .../pages/creatProcess/qbfs/step6.vue | 4 ++-- .../pages/creatProcess/qbfs/step7.vue | 4 ++-- 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/components/ProcessMixin.vue b/src/pages/processCenter/pages/components/ProcessMixin.vue index 090e0772c..d55652987 100644 --- a/src/pages/processCenter/pages/components/ProcessMixin.vue +++ b/src/pages/processCenter/pages/components/ProcessMixin.vue @@ -132,6 +132,12 @@ export default { if(row && row.prcType === '25' && row.taskInfo === '技术标准起草'){ let _index = row.prcName.lastIndexOf('-') return row.prcName.slice(0 , _index + 1) + '企标制修订' + }else if(row && row.prcType === 'buss3' && row.taskInfo === '产品标准起草'){ + let _index = row.prcName.lastIndexOf('-') + return row.prcName.slice(0 , _index + 1) + '企标制修订' + }else if(row && row.prcType === 'buss3' && row.taskInfo === '技术标准起草'){ + let _index = row.prcName.lastIndexOf('-') + return row.prcName.slice(0 , _index + 1) + '企标制修订' }else { return row.prcName } @@ -148,6 +154,14 @@ export default { prcName = '企标制修订-技术标准' return prcName } + if(prcType === 'buss3' && taskInfo === '产品标准起草'){ + prcName = '企标制修订-产品标准' + return prcName + } + if(prcType === 'buss3' && taskInfo === '技术标准起草'){ + prcName = '企标制修订-技术标准' + return prcName + } this.processTypeList.map(item => { if (item.value === prcType) { prcName = item.label; diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue index ef1c4eb7e..fe031c137 100644 --- a/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step6.vue @@ -1,8 +1,8 @@