From 00bf51f220673f2b44ee95049ded28c63f9a890f 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, 22 Apr 2022 09:40:57 +0800 Subject: [PATCH 01/10] =?UTF-8?q?52652=20=E5=9B=BD=E5=86=85=E6=A0=87?= =?UTF-8?q?=E5=87=86=E5=BA=93=E3=80=81=E6=B5=B7=E5=A4=96=E6=A0=87=E5=87=86?= =?UTF-8?q?=E5=BA=93=E9=AB=98=E7=BA=A7=E6=A3=80=E7=B4=A2=E4=B8=AD=20?= =?UTF-8?q?=E6=98=AF=E5=90=A6=E7=BA=B3=E5=85=A5=E8=AE=A4=E8=AF=81=E6=B8=85?= =?UTF-8?q?=E5=8D=95=E4=BC=A0=E5=8F=82=E6=9B=B4=E6=94=B9=EF=BC=8C=E6=98=AF?= =?UTF-8?q?=EF=BC=9A1=20=E5=90=A6=EF=BC=9A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../domesticStandardsAndRegulations/index.vue | 2 +- .../foreignStandardsAndRegulations/index.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue index b75db10a3..494db77ca 100644 --- a/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/domesticStandardsAndRegulations/index.vue @@ -1710,7 +1710,7 @@ - + diff --git a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue index 74f62b23a..852e70c08 100644 --- a/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue +++ b/src/pages/regulatoryRepository/foreignStandardsAndRegulations/index.vue @@ -546,7 +546,7 @@ - + From dff986495ab7b8a9d492f9ae7d2a5792f00da0f1 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, 22 Apr 2022 10:00:54 +0800 Subject: [PATCH 02/10] =?UTF-8?q?52651=20=E6=B8=85=E5=8D=95=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=20=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=8A=82=E7=82=B9=E9=83=BD=E6=B2=A1=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=20=E5=BE=97?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../processCenter/pages/creatProcess/bzqdfb/step1-4.vue | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue index 661e3af97..d4522ff59 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-4.vue @@ -40,7 +40,7 @@

{{ item.name }} + :key="item.id" @click.stop="clickButtonToUpload2(item.id)"> {{ item.name }} { }); }, + //点击预览 + clickButtonToUpload2(file) { + const attId = file + this.$preview(attId) + }, /** * @Description: 点击下载 */ From 522320a3e3613258127505354c3202e4942a38a1 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, 22 Apr 2022 11:14:48 +0800 Subject: [PATCH 03/10] =?UTF-8?q?52651=20=E6=B8=85=E5=8D=95=E6=9B=B4?= =?UTF-8?q?=E6=96=B0=E5=8F=91=E5=B8=83=E6=B5=81=E7=A8=8B=20=E6=89=80?= =?UTF-8?q?=E6=9C=89=E8=8A=82=E7=82=B9=E9=83=BD=E6=B2=A1=E6=9C=89=E5=9C=A8?= =?UTF-8?q?=E7=BA=BF=E9=A2=84=E8=A7=88=E5=8A=9F=E8=83=BD=20=E5=BE=97?= =?UTF-8?q?=E5=8A=A0=E4=B8=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzqdfb/step1-1.vue | 88 +++++++++++---- .../pages/creatProcess/bzqdfb/step1.vue | 88 +++++++++++---- .../pages/creatProcess/bzqdfb/step3.vue | 101 ++++++++++++++---- 3 files changed, 216 insertions(+), 61 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue index 35b1d5dac..59ff0c487 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1-1.vue @@ -49,22 +49,32 @@ > -

- - - 点击上传 - - + +
+
+
+ {{ item.name }} + +
+
+ + 点击上传 + @@ -699,17 +709,20 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - +
@@ -793,6 +806,7 @@ export default { sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: "api/att/attFile/upload", // 上传的地址 fileInfoList: [], // 上传的附件 + fileInfo: '', // 展示的附件 fileIds: [], // 上传的附件 fileList: [], fileListName: [], //上传的附件名称 @@ -1191,6 +1205,16 @@ export default { this.fileInfoList.splice(index, 1); } }); + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, fileUpload() { this.fileMadel = true; @@ -1204,6 +1228,16 @@ export default { this.$message.error(res.message); fileList.pop(); } + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, // 相关附件 上传之前钩子 beforeUpload(file) { @@ -1243,6 +1277,18 @@ export default { }); window.open(routeUrl.href, "_blank"); }, + clickButtonToUpload2(file) { + const attId = file.attId + this.$preview(attId) + }, + clickButtonToUpload (file) { + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, // 导入标准数据成功后执行 importFileSuccess(response, file) { if (response.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index d45ece1f4..34da50302 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -49,22 +49,32 @@ > -
- - - 点击上传 - - + +
+
+
+ {{ item.name }} + +
+
+ + 点击上传 + @@ -669,17 +679,20 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - +
@@ -762,6 +775,7 @@ export default { sarAccessListDatas: [], //国家地区清单表格 uploadFileListPath: "api/att/attFile/upload", // 上传的地址 fileInfoList: [], // 上传的附件 + fileInfo: '', // 展示的附件 fileIds: [], // 上传的附件 fileListName: [], //上传的附件名称 standardData: [], //添加标准数据 @@ -1122,6 +1136,16 @@ export default { this.fileInfoList.splice(index,1) } }) + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, fileUpload() { this.fileMadel = true; @@ -1135,6 +1159,16 @@ export default { this.$message.error(res.message); fileList.pop(); } + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, // 相关附件 上传之前钩子 beforeUpload(file) { @@ -1174,6 +1208,18 @@ export default { }); window.open(routeUrl.href, "_blank"); }, + clickButtonToUpload2(file) { + const attId = file.attId + this.$preview(attId) + }, + clickButtonToUpload (file) { + const attId = file.attId + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') + } + }, // 导入标准数据成功后执行 importFileSuccess(response, file) { if (response.ok) { diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue index 484587e3b..732b47a57 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step3.vue @@ -52,21 +52,32 @@ > - - - 点击上传 - - + +
+
+
+ {{ item.name }} + +
+
+
+ + 点击上传 + @@ -381,6 +392,27 @@ @checkedRole="checkedRole" :nodeList="nodeList" > + + +
+ +

点击或拖拽上传文件

+
+ +
@@ -404,6 +436,7 @@ export default { // 当前流程类型(1待办/2已办) processType: 1, searching: false, + fileMadel: false, commentText:'', nodeList:[], isTransfer: false, @@ -436,6 +469,7 @@ export default { uploadFileListPath: 'api/att/attFile/upload', // 上传的地址 fileList:[], fileInfoList: [], // 上传的附件 + fileInfo: '', //展示的附件 dataList: [],//清单里的标准数据 standardData: [], //添加标准数据 standModel: false, // 选择标准抽屉状态 @@ -709,6 +743,19 @@ export default { this.fileInfoList.splice(index,1) } }) + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list + }, + fileUpload() { + this.fileMadel = true; }, // 上传文件成功回调 uploadBackSuccess (res, file, fileList) { @@ -720,6 +767,16 @@ export default { this.$message.error(res.message) fileList.pop() } + let list = '' + this.fileInfoList.forEach(item => { + if (list.length > 0) { + list += ',' + list += item.name + } else { + list+= item.name + } + }) + this.fileInfo = list }, //上传之前的钩子 beforeUpload (file) { @@ -748,10 +805,16 @@ export default { } return true; }, - handleOnPreview(file) { - let attId = file.id - if (attId != null && attId !== "") { - window.location.href = "/api/att/attFile/downloadFileForSarNew?fileId=" + attId; + clickButtonToUpload2(file) { + const attId = file.id + this.$preview(attId) + }, + clickButtonToUpload (file) { + const attId = file.id + if (attId) { + window.location.href = '/api/att/attFile/downloadFileForSarNew?fileId=' + attId + } else { + this.$message.warning('文件不存在,下载失败') } }, getData() { From d63b655b555e70999bf7091dc481c319b5e27895 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, 22 Apr 2022 14:01:53 +0800 Subject: [PATCH 04/10] =?UTF-8?q?52649=20=E3=80=90=E7=BA=BF=E4=B8=8A?= =?UTF-8?q?=E3=80=91=E6=A0=87=E5=87=86=E5=BE=81=E6=B1=82=E6=84=8F=E8=A7=81?= =?UTF-8?q?=20=E6=96=B0=E5=A2=9E=20=E6=97=A0=E6=B3=95=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bzzqyj/ZQYJAddFileDetails.vue | 37 ++++++++++++++++++- 1 file changed, 36 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue index 2b26ddfec..670a3ebc9 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/ZQYJAddFileDetails.vue @@ -1,7 +1,8 @@