diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue index c7be10875..0a50af582 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditList.vue @@ -139,37 +139,26 @@
- - {{ item.name }} - - - {{ item.name }} - - - - - - - + + {{ item.name }} + + {{ item.name }} + + + + + +
-
- - {{ item.name }} - - - - +
+ {{ item.name }} + + +
@@ -963,23 +952,25 @@ } else { attId = file.response.data.id } - if (file.name == this.form.standName) { + if(type === 'preview' && 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 + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName } else { - fileName = '企业标准.docx' - fileNam2 = '企业标准' + 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 (file.id.startsWith('ATT')) { + this.$preview(file.id) + } else { + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + } + }else if (type === 'down') { if (attId) { window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue index e5f83de97..847d8967b 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formEditListFb.vue @@ -173,7 +173,7 @@ :title="item.name"> {{ item.name }} - +
@@ -957,7 +957,7 @@ export default { }else { attId = file.response.data.id } - if (file.name == this.form.standName) { + if (type === 'preview' && file.name == this.form.standName) { let fileName = "" let fileNam2 = "" if (this.form.standName && this.form.standName !== '') { @@ -970,18 +970,20 @@ export default { 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 (file.id.startsWith('ATT')) { + this.$preview(file.id) + } else { + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + } + }else if (type === 'down') { if (attId) { window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) } else { this.$message.warning('文件不存在,下载失败') } - } else { - this.$preview(attId) - } + } else { + this.$preview(attId) + } }, handleFilePreviewOne(file, type) { let id = "" diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue index 3e76e3e8e..c72bf647a 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList.vue @@ -115,9 +115,7 @@ @click="handleFilePreviewOne(item,'preview')"> {{ item.name }} {{ item.name }} - + @@ -130,7 +128,7 @@ :key="index" style="color: #409eff;cursor:pointer;margin-left: 12px;" class="fileClass"> {{ item.name }} - +
@@ -650,23 +648,25 @@ } else { attId = file.response.data.id } - if (file.name == this.form.standName) { + if(type === 'preview' && 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 + fileName = this.form.standName + '-企业标准.docx' + fileNam2 = this.form.standName } else { - fileName = '企业标准.docx' - fileNam2 = '企业标准' + 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(file.id.startsWith('ATT')){ + this.$preview(file.id) + }else { + this.$onlineEditPreview(file.id, fileNam2, this.$store.getters.userInfo.userId, this.$store.getters.userInfo.userName, form) + } + }else if (type === 'down') { if (attId) { window.open('/api/att/attFile/downloadFileForSarNew?fileId=' + attId) } else { diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue index 1606f2bdf..50add3521 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1-2.vue @@ -173,19 +173,14 @@
- + {{ item.name }} - + {{ item.name }} - - + +