From d628190d7533626005e92c15a70e6533830a422f Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 19 Apr 2023 20:51:36 +0800 Subject: [PATCH 01/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index e75191bcd..9e3ac7a33 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2729,6 +2729,9 @@ textArr2 = [...new Set(textArr2)] this.replaceLawsNumModel = false }) + + this.form.rqbJson = this.selectedListRep[0].id + // this.SarLawsInfoEO.replaceLawsNum = textArr.join(',') // 解决 标准入库流程--圈住的字段，先手动输入，然后再手动查找，点提交就会把手动输入的标准号覆盖 if (this.replaceLawType === 'DTQBBHBUSS') { @@ -3523,7 +3526,7 @@ // this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); // } if (res && res.data && res.data[0].fbgbuss !== '') { - this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{ + const names = res.data.reduce((init,item,index,arr)=>{ if(index === 0){ init = item.fbgbussNmae }else{ @@ -3531,7 +3534,7 @@ } return init },'') - this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{ + const ids = res.data.reduce((init,item,index,arr)=>{ if(index === 0){ init = item.fbgbuss }else{ @@ -3539,6 +3542,15 @@ } return init },'') + if(this.form.LSBBBUSSName === undefined || this.form.LSBBBUSSName.indexOf(names) === -1){ + if(this.form.LSBBBUSSName === undefined){ + this.form.LSBBBUSSName = names + this.form.LSBBBUSS = ids + }else{ + this.form.LSBBBUSSName = names + ',' + this.form.LSBBBUSSName + this.form.LSBBBUSS = ids + ',' + this.form.LSBBBUSS + } + } this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); } }) From db2135d1019a8186455cb67756e3aaa2e11ff82e Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 20 Apr 2023 15:31:43 +0800 Subject: [PATCH 02/12] =?UTF-8?q?axios=E5=B0=81=E8=A3=85=E5=AF=BC=E5=87=BA?= =?UTF-8?q?=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 33 +++++++++++++++++++++++++++++++++ 1 file changed, 33 insertions(+) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 6d9d0f0fb..980339cdc 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -585,4 +585,37 @@ export default { }) }, + _downloadFile (url, params, method = 'get', fileName = '导出文件') { + _axios({ + method, + url, + data: method !== 'get' ? params : {}, + params: method === 'get' ? params : {}, + responseType: 'blob' + }).then( + res => { + const data = res.data + // 兼容ie + if (window.navigator.msSaveOrOpenBlob) { + try { + const blobObject = new Blob([data]) + window.navigator.msSaveOrOpenBlob(blobObject, fileName) + } catch (e) { + console.log(e) + } + return + } + // a标签实现下载 + // type为导出文件格式 例application/vnd.openxmlformats-officedocument.spreadsheetml.sheet 导出为xlsx格式 + let url = window.URL.createObjectURL(new Blob([data], { type: "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" })) + let a = document.createElement('a') + a.style.display = 'none' + a.href = url + a.setAttribute('download', fileName) + document.body.appendChild(a) + a.click() + document.body.removeChild(a); + URL.revokeObjectURL(url); // 释放对象URL + }) + }, } From ebd700d91bfb848d0daed56fd7b8290fc83b8f01 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 20 Apr 2023 16:25:50 +0800 Subject: [PATCH 03/12] =?UTF-8?q?=E4=BC=98=E5=8C=96axios?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/common/axios/index.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 980339cdc..94f956cf6 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -538,7 +538,7 @@ export default { }) }, - _getData (url, params, config = {}) { + _getData (url, params = {}, config = {}) { return new Promise((resolve,reject)=>{ // 参数包含this let _this = config._this || false @@ -558,7 +558,7 @@ export default { }) }, - _postData (url, param, config = {}) { + _postData (url, param = {}, config = {}) { return new Promise((resolve,reject) => { var _formData = formData(param) // 参数包含this @@ -585,7 +585,7 @@ export default { }) }, - _downloadFile (url, params, method = 'get', fileName = '导出文件') { + _downloadFile (url, params = {}, method = 'get', fileName = '导出文件') { _axios({ method, url, From a7b2d129901398dc07bb90a97261af33d1fb9724 Mon Sep 17 00:00:00 2001 From: zyn Date: Thu, 20 Apr 2023 16:26:54 +0800 Subject: [PATCH 04/12] =?UTF-8?q?=E4=BA=A7=E5=93=81=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E4=BF=AE=E8=AE=A2=E6=97=B6=E9=80=89=E6=8B=A9=E4=BB=A3=E6=9B=BF?= =?UTF-8?q?=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7-=E5=8F=91=E5=B8=83?= =?UTF-8?q?=E7=A8=BF=E5=B8=A6=E5=88=B0=E5=8E=86=E5=8F=B2=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/flow/index.js | 7 +++ .../pages/creatProcess/qbrk-product/step1.vue | 43 +++++++++++++++++++ .../pages/creatProcess/qbrk/step1-2.vue | 7 ++- 3 files changed, 55 insertions(+), 2 deletions(-) create mode 100644 src/api/flow/index.js diff --git a/src/api/flow/index.js b/src/api/flow/index.js new file mode 100644 index 000000000..33ad55b3a --- /dev/null +++ b/src/api/flow/index.js @@ -0,0 +1,7 @@ +import axios from '@/common/axios' + +// 根据企标编号查找文件 +export function selectByIdAtt(id){ + return axios._getData('/lawss/sarBussionessStand/selectByIdAtt', { id }) +} + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 7411d23b4..86d1a1840 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1084,6 +1084,7 @@ import TreeSelect from '@/components/treeSelect/treeSelect.vue'; import TreeSelectNew from '@/components/treeSelect/treeSelectNew.vue'; import treeSelectModule from "@/components/treeSelect/treeSelectModule.vue"; + import { selectByIdAtt } from "@/api/flow/index.js" let Base64 = require('js-base64').Base64; @@ -2568,6 +2569,48 @@ this.form.byybj = this.form.byybj ? this.form.byybj + ',' +textArr.join(',') : textArr.join(',') } // 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{ + selectByIdAtt(ids).then(res =>{ + if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') { + this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{ + if(index === 0){ + init = item.fbgbussNmae + }else{ + init = init + ',' + item.fbgbussNmae + } + return init + },'') + this.form.LSBBBUSS = res.data.reduce((init,item,index,arr)=>{ + if(index === 0){ + init = item.fbgbuss + }else{ + init = init + ',' + item.fbgbuss + } + return init + },'') + }else if(res && res.data && res.data.length === 0){ + 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() }, filterSetData(data){ diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 9e3ac7a33..9416e4277 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -2765,7 +2765,7 @@ },'') // const id = this.selectedListRep[0].id this.selectByIdAtt(ids).then(res =>{ - if (res && res.data && res.data[0].fbgbuss !== '') { + if (res && res.data && res.data.length && res.data[0].fbgbuss !== '') { this.form.LSBBBUSSName = res.data.reduce((init,item,index,arr)=>{ if(index === 0){ init = item.fbgbussNmae @@ -2784,8 +2784,11 @@ },'') // this.form.LSBBBUSSName = res.data[0].fbgbussNmae // this.form.LSBBBUSS = res.data[0].fbgbuss - this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); + }else if(res && res.data && res.data.length === 0){ + this.form.LSBBBUSS = '' + this.form.LSBBBUSSName = '' } + this.LSBBBUSSFileList = this.assemble(this.form.LSBBBUSS, this.form.LSBBBUSSName); }) } From f75df14d55e3b5768082dda54520c88722249868 Mon Sep 17 00:00:00 2001 From: zyn Date: Fri, 21 Apr 2023 16:50:03 +0800 Subject: [PATCH 05/12] =?UTF-8?q?=E4=BF=AE=E6=94=B9<=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E6=9B=B4=E5=90=8D=E6=A0=87=E5=87=86>=E5=88=97=E8=A1=A8total?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbzxdjhgk/component/rename.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue index c1f1aa7ea..59788acbd 100644 --- a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/component/rename.vue @@ -254,6 +254,7 @@ { this.standinfoList = res.data.list //展示的数据只能是未开始的 @@ -467,7 +470,7 @@ export default { // this.standinfoList.push(item) // } // }) - this.total = this.standinfoList.length + this.total = res.data.count this.$nextTick(()=>{ this.$refs.selection.doLayout() }) From b701c3b3ae8478ee70b33700af7413ce319703c8 Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 09:10:53 +0800 Subject: [PATCH 06/12] =?UTF-8?q?=E5=88=9D=E5=AE=A1=E8=8A=82=E7=82=B9?= =?UTF-8?q?=E5=8E=BB=E6=8E=89=E5=9C=A8=E7=BA=BF=E7=BC=96=E8=BE=91=E6=8C=89?= =?UTF-8?q?=E9=92=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step4.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue index 110682d03..0b1a1101c 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step4.vue @@ -20,7 +20,7 @@
Date: Sun, 23 Apr 2023 09:59:55 +0800 Subject: [PATCH 07/12] =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=99=84=E4=BB=B6?= =?UTF-8?q?=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk/step1-2.vue | 41 ++++++++++++++++++- .../pages/creatProcess/qbrk/step1.vue | 41 ++++++++++++++++++- 2 files changed, 78 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 9416e4277..58926e95b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -213,8 +213,12 @@
{{ 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 f7993f0d7..8c6a67db9 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 }} + + +
@@ -2889,6 +2893,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) + } + }, // 导入标准数据成功后执行 importFileSuccess(response, file, fileList) { // 上传成功后判断是否是两条数据是的话替换掉旧数据 From 00939fe7295b302871f445505375d26ce1a15b28 Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 11:15:30 +0800 Subject: [PATCH 08/12] =?UTF-8?q?=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-?= =?UTF-8?q?=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 1e95821ba..48452eda6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1726,6 +1726,9 @@ zrDeptIdName:this.$store.getters.userInfo.institutionName, children:[], }; + if(!this.form.modelData){ + this.form.modelData = [] + } this.form.modelData.push(list); this.$message.success("新增成功") this.showForm.modelNum = "" @@ -2915,7 +2918,7 @@ if (valid) { this.$refs['formTongGuo'].validate((valid) => { if (valid) { - if(this.form.modelData.length === 0){ + if(this.form.modelData === undefined || this.form.modelData.length === 0){ this.opinionDialogVisible = true }else{ this.commentTextHandle(); From 99c56936a15cf70009e3bb01e47f6b997e8ab3f0 Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 11:16:23 +0800 Subject: [PATCH 09/12] =?UTF-8?q?=E8=B5=B7=E8=8D=89-=E5=8E=86=E5=8F=B2?= =?UTF-8?q?=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 40 ++++++++++++++++++- 1 file changed, 39 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index 86d1a1840..a96f24657 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 }} + + + +
Date: Sun, 23 Apr 2023 11:50:51 +0800 Subject: [PATCH 10/12] =?UTF-8?q?=E5=9B=9E=E6=BB=9A=E6=8F=90=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step5.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue index 1e95821ba..48452eda6 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step5.vue @@ -1726,6 +1726,9 @@ zrDeptIdName:this.$store.getters.userInfo.institutionName, children:[], }; + if(!this.form.modelData){ + this.form.modelData = [] + } this.form.modelData.push(list); this.$message.success("新增成功") this.showForm.modelNum = "" @@ -2915,7 +2918,7 @@ if (valid) { this.$refs['formTongGuo'].validate((valid) => { if (valid) { - if(this.form.modelData.length === 0){ + if(this.form.modelData === undefined || this.form.modelData.length === 0){ this.opinionDialogVisible = true }else{ this.commentTextHandle(); From b20a3683ab1bfcced7fc216b5d7c50a9a4ecdcf1 Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 13:37:37 +0800 Subject: [PATCH 11/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4?= 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, 5 insertions(+), 117 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index a96f24657..b76bf9111 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -218,12 +218,7 @@ >
-
- {{ item.name }} - - - -
+
{{ item.name }}
- {{ item.name }} - - - + @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" + class="fileClass">{{ item.name }}
@@ -2923,39 +2919,6 @@ 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 8c6a67db9..f7993f0d7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -209,12 +209,8 @@
- {{ item.name }} - - - + @click="handleFilePreview(item)" style="color: #409eff;cursor:pointer" + class="fileClass">{{ item.name }}
@@ -2893,39 +2889,6 @@ 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) - } - }, // 导入标准数据成功后执行 importFileSuccess(response, file, fileList) { // 上传成功后判断是否是两条数据是的话替换掉旧数据 From 3dfafb194eccf8aac8857d6304e23d54950ba5db Mon Sep 17 00:00:00 2001 From: zyn Date: Sun, 23 Apr 2023 15:35:37 +0800 Subject: [PATCH 12/12] =?UTF-8?q?=E5=A4=8D=E5=AE=A1=E6=97=A5=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/qbrk-product/step1.vue | 58 ++++++++++++------ .../creatProcess/qbrk-product/step13.vue | 59 +++++++++++++------ .../pages/creatProcess/qbrk-product/step3.vue | 58 ++++++++++++------ .../pages/creatProcess/qbrk-product/step6.vue | 58 ++++++++++++------ 4 files changed, 160 insertions(+), 73 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue index b76bf9111..62bd94e92 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step1.vue @@ -1524,30 +1524,30 @@ 'form.standStatus': { handler (val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { - + this.FSRQchange() } } }, 'form.issueTime': { handler: function() { - if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ - let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) - // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() - // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS - - let year = date.getFullYear()+5; - let month =(date.getMonth() + 1).toString(); - let day = (date.getDate()).toString(); - if (month.length == 1) { - month = "0" + month; - } - if (day.length == 1) { - day = "0" + day; - } - const FSRQBUSS = year + "-" + month + "-" + day; - this.form["FSRQBUSS"] = FSRQBUSS - - } + this.FSRQchange() + // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() + // // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + // let year = date.getFullYear()+5; + // let month =(date.getMonth() + 1).toString(); + // let day = (date.getDate()).toString(); + // if (month.length == 1) { + // month = "0" + month; + // } + // if (day.length == 1) { + // day = "0" + day; + // } + // const FSRQBUSS = year + "-" + month + "-" + day; + // this.form["FSRQBUSS"] = FSRQBUSS + // + // } }, }, 'form.country': { @@ -1568,6 +1568,26 @@ }, }, methods: { + FSRQchange(){ + if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + + let year = date.getFullYear()+5; + if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){ + year = date.getFullYear()+3; + } + let month =(date.getMonth() + 1).toString(); + let day = (date.getDate()).toString(); + if (month.length == 1) { + month = "0" + month; + } + if (day.length === 1) { + day = "0" + day; + } + const FSRQBUSS = year + "-" + month + "-" + day; + this.form["FSRQBUSS"] = FSRQBUSS + } + }, regDate(data){ if(this.form.standCode !== undefined && this.form.standCode !== null && this.form.standCode.indexOf(data) !== -1){ data = data + ' X' diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue index c6982c76b..e0ad27df7 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step13.vue @@ -1101,29 +1101,32 @@ handler (val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { this.getStandInfoByReviseStatus() + this.FSRQchange() } } }, 'form.issueTime': { handler: function() { - if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ - let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) - // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() - // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS - - let year = date.getFullYear()+5; - let month =(date.getMonth() + 1).toString(); - let day = (date.getDate()).toString(); - if (month.length == 1) { - month = "0" + month; - } - if (day.length === 1) { - day = "0" + day; - } - const FSRQBUSS = year + "-" + month + "-" + day; - this.form["FSRQBUSS"] = FSRQBUSS - - } + this.FSRQchange(); + // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() + // // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + // + // let year = date.getFullYear()+5; + // let month =(date.getMonth() + 1).toString(); + // let day = (date.getDate()).toString(); + // if (month.length == 1) { + // month = "0" + month; + // } + // if (day.length === 1) { + // day = "0" + day; + // } + // const FSRQBUSS = year + "-" + month + "-" + day; + // this.form["FSRQBUSS"] = FSRQBUSS + // console.log(FSRQBUSS) + // + // } }, }, 'form.country': { @@ -1149,6 +1152,26 @@ }, }, methods: { + FSRQchange(){ + if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + + let year = date.getFullYear()+5; + if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){ + year = date.getFullYear()+3; + } + let month =(date.getMonth() + 1).toString(); + let day = (date.getDate()).toString(); + if (month.length == 1) { + month = "0" + month; + } + if (day.length === 1) { + day = "0" + day; + } + const FSRQBUSS = year + "-" + month + "-" + day; + this.form["FSRQBUSS"] = FSRQBUSS + } + }, checkedRoleTransfer (data) { this.isSubmit = true this.saveLoading = true diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue index 41e302f3e..45082b082 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step3.vue @@ -1078,29 +1078,31 @@ handler (val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { this.getStandInfoByReviseStatus("") + this.FSRQchange() } } }, 'form.issueTime': { handler: function() { - if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ - let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) - // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() - // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS - - let year = date.getFullYear()+5; - let month =(date.getMonth() + 1).toString(); - let day = (date.getDate()).toString(); - if (month.length == 1) { - month = "0" + month; - } - if (day.length == 1) { - day = "0" + day; - } - const FSRQBUSS = year + "-" + month + "-" + day; - this.form["FSRQBUSS"] = FSRQBUSS - - } + this.FSRQchange() + // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() + // // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + // + // let year = date.getFullYear()+5; + // let month =(date.getMonth() + 1).toString(); + // let day = (date.getDate()).toString(); + // if (month.length == 1) { + // month = "0" + month; + // } + // if (day.length == 1) { + // day = "0" + day; + // } + // const FSRQBUSS = year + "-" + month + "-" + day; + // this.form["FSRQBUSS"] = FSRQBUSS + // + // } }, }, 'form.country': { @@ -1126,6 +1128,26 @@ }, }, methods: { + FSRQchange(){ + if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + + let year = date.getFullYear()+5; + if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){ + year = date.getFullYear()+3; + } + let month =(date.getMonth() + 1).toString(); + let day = (date.getDate()).toString(); + if (month.length == 1) { + month = "0" + month; + } + if (day.length === 1) { + day = "0" + day; + } + const FSRQBUSS = year + "-" + month + "-" + day; + this.form["FSRQBUSS"] = FSRQBUSS + } + }, regDate(data){ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){ data = data + ' X' diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue index 2e9cad37b..3c8710d36 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6.vue @@ -1156,29 +1156,31 @@ handler (val) { if (val !== '' && val !== null && typeof (val) !== 'undefined') { this.getStandInfoByReviseStatus() + this.FSRQchange() } } }, 'form.issueTime': { handler: function() { - if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ - let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) - // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() - // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS - - let year = date.getFullYear()+5; - let month =(date.getMonth() + 1).toString(); - let day = (date.getDate()).toString(); - if (month.length === 1) { - month = "0" + month; - } - if (day.length == 1) { - day = "0" + day; - } - const FSRQBUSS = year + "-" + month + "-" + day; - this.form["FSRQBUSS"] = FSRQBUSS - - } + this.FSRQchange() + // if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + // let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + // // const FSRQBUSS = date.getFullYear()+ 5 + '-' + date.getMonth() + '-' + date.getDate() + // // this.sarBussionessStandEO["FSRQBUSS"] = FSRQBUSS + // + // let year = date.getFullYear()+5; + // let month =(date.getMonth() + 1).toString(); + // let day = (date.getDate()).toString(); + // if (month.length === 1) { + // month = "0" + month; + // } + // if (day.length == 1) { + // day = "0" + day; + // } + // const FSRQBUSS = year + "-" + month + "-" + day; + // this.form["FSRQBUSS"] = FSRQBUSS + // + // } }, }, 'form.country': { @@ -1204,6 +1206,26 @@ }, }, methods: { + FSRQchange(){ + if(this.form.issueTime !== undefined && this.form.issueTime !== null && this.form.issueTime !== ''){ + let date = new Date(this.$moment(this.form.issueTime).format('YYYY-MM-DD')) + + let year = date.getFullYear()+5; + if(this.form.standSort === 'Q/QCBFC' || this.form.standSort === 'Q/FT X'){ + year = date.getFullYear()+3; + } + let month =(date.getMonth() + 1).toString(); + let day = (date.getDate()).toString(); + if (month.length == 1) { + month = "0" + month; + } + if (day.length === 1) { + day = "0" + day; + } + const FSRQBUSS = year + "-" + month + "-" + day; + this.form["FSRQBUSS"] = FSRQBUSS + } + }, regDate(data){ if(this.form.DTQBBHBUSS !== undefined && this.form.DTQBBHBUSS !== null && this.form.DTQBBHBUSS.indexOf(data) !== -1){ data = data + ' X'