From 7b037ccebd80c6905f86512b5014c66e338894ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 16:14:40 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=B8=85=E5=8D=95?= =?UTF-8?q?=E7=A1=AE=E8=AE=A4=E4=BF=9D=E5=AD=98=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue | 1 + src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue | 1 + src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue | 1 + 3 files changed, 3 insertions(+) diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue index 8d7b18508..834de3ce9 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step2.vue @@ -880,6 +880,7 @@ export default { }else{ this.qdform = item.form this.dataList =item.form.dataList + this.commentText = item.commentText this.detailedId = item.form.detailedListId; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue index 009c75b08..4453cb081 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step3.vue @@ -889,6 +889,7 @@ export default { }else{ this.qdform = item.form this.dataList =item.form.dataList + this.commentText = item.commentText this.detailedId = item.form.detailedListId; } }); diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue index f8322e683..bcf44e540 100644 --- a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4.vue @@ -883,6 +883,7 @@ export default { }else{ this.qdform = item.form this.dataList =item.form.dataList + this.commentText = item.commentText this.detailedId = item.form.detailedListId; } }); From 2c96ffe5dc51919d983f94e6bff3d98ffb1c2763 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E4=BC=9F=E4=BD=B3?= <2797716443@qq.com> Date: Tue, 28 Dec 2021 16:23:58 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E6=B0=B4=E5=8D=B0=E4=B8=8B=E8=BD=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzqdfb/step2.vue | 11 +++++------ .../processCenter/pages/creatProcess/bzqdfb/step4.vue | 11 +++++------ 2 files changed, 10 insertions(+), 12 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue index 0f5cf113e..39463de6e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step2.vue @@ -382,14 +382,13 @@ export default { } }, downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); + if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { + this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + if (attId != null && attId !== '') { + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { - this.$message.error("请选择要下载的文件"); + this.$message.error('请选择要下载的文件') } } }, diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue index 260c2adec..0bb277f1a 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step4.vue @@ -452,14 +452,13 @@ export default { } }, downloadFileByWater(attId, fileSuffix) { - let fileExtension = fileSuffix.substring(fileSuffix.lastIndexOf(".") + 1); - if (fileExtension !== "pdf" && fileExtension !== "PDF") { - this.$message.error("水印下载仅支持PDF,pdf格式文件"); + if (fileSuffix !== 'pdf' && fileSuffix !== 'PDF') { + this.$message.error('水印下载仅支持PDF,pdf格式文件') } else { - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarWaterMark?fileId=" + attId; + if (attId != null && attId !== '') { + window.location.href = '/api/att/attFile/downloadFileForSarWaterMark?fileId=' + attId + '&userId=' + this.$store.getters.userInfo.userId } else { - this.$message.error("请选择要下载的文件"); + this.$message.error('请选择要下载的文件') } } },