From 9e3ed3dd122b0bc65cd232914706012be1e5c2fe Mon Sep 17 00:00:00 2001
From: gaoluyang <2820782392@qq.com>
Date: 星期三, 05 三月 2025 13:37:59 +0800
Subject: [PATCH] 报告编制批量下载修改

---
 src/views/business/materialOrder/copperOrder.vue       |    7 ++++---
 src/views/business/materialOrder/customsInspection.vue |   10 +++++++---
 src/views/business/reportPreparation/index.vue         |    5 ++++-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/src/views/business/materialOrder/copperOrder.vue b/src/views/business/materialOrder/copperOrder.vue
index 8bc060d..15b20e2 100644
--- a/src/views/business/materialOrder/copperOrder.vue
+++ b/src/views/business/materialOrder/copperOrder.vue
@@ -617,11 +617,12 @@
   mounted() {
     this.active = this.$route.query.active
     this.currentId = this.$route.query.currentId
+    this.getInfoRow();
   },
   activated() {
-    if (this.active==1) {
-      this.getInfoRow();
-    }
+    this.active = this.$route.query.active
+    this.currentId = this.$route.query.currentId
+    this.getInfoRow();
   },
   methods: {
     getInfoRow() {
diff --git a/src/views/business/materialOrder/customsInspection.vue b/src/views/business/materialOrder/customsInspection.vue
index cbdee51..797161c 100644
--- a/src/views/business/materialOrder/customsInspection.vue
+++ b/src/views/business/materialOrder/customsInspection.vue
@@ -639,11 +639,15 @@
     this.currentId = this.$route.query.currentId
     this.isReport = this.$route.query.isReport
     this.customsInspection = this.$route.query.customsInspection
+    this.getInfo();
   },
   activated() {
-    if (this.active==1) {
-      this.getInfo();
-    }
+    this.active = this.$route.query.active
+    this.orderType = this.$route.query.orderType
+    this.currentId = this.$route.query.currentId
+    this.isReport = this.$route.query.isReport
+    this.customsInspection = this.$route.query.customsInspection
+    this.getInfo();
   },
   getInfo() {
     this.getUserNowList() // 鑾峰彇褰撳墠鐢ㄦ埛淇℃伅
diff --git a/src/views/business/reportPreparation/index.vue b/src/views/business/reportPreparation/index.vue
index 29da53d..d47b9cf 100644
--- a/src/views/business/reportPreparation/index.vue
+++ b/src/views/business/reportPreparation/index.vue
@@ -600,8 +600,11 @@
       this.outLoading = true
       downAll({ ids: str }).then(res => {
         this.outLoading = false
-        this.$download.saveAs(this.javaApi + res.message, row.fileName);
+        this.$download.zip(res.data, '鎶ュ憡.zip');
+      }).catch(() => {
+        this.outLoading = false
       })
+
     },
     beforeUpload(file) {
       const isZip = file.type === 'application/zip' || file.name.endsWith('.zip');

--
Gitblit v1.9.3