From 1c56033a3e77308c18363a8aaaeb18444611264e Mon Sep 17 00:00:00 2001
From: liuyiliang <azc78910>
Date: Wed, 10 Jul 2024 14:05:16 +0800
Subject: [PATCH] =?UTF-8?q?=E9=9D=99=E6=80=81=E5=8F=B0=E8=B4=A6=E5=AF=BC?=
 =?UTF-8?q?=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/util/exportUtil.js              | 20 ++++++++++++++++++++
 src/views/leger/equipmentledger.vue |  6 +++---
 2 files changed, 23 insertions(+), 3 deletions(-)
 create mode 100644 src/util/exportUtil.js

diff --git a/src/util/exportUtil.js b/src/util/exportUtil.js
new file mode 100644
index 0000000..c99e746
--- /dev/null
+++ b/src/util/exportUtil.js
@@ -0,0 +1,20 @@
+export default {
+  excelExport : function (url, search, colArr) {
+    var filteredSearch = Object.keys(search)
+      .filter(key => !key.startsWith('$'))
+      .reduce((obj, key) => {
+        obj[key] = search[key];
+        return obj;
+      }, {});
+
+    var formStr = Object.keys(filteredSearch).map(key => {
+      let value = filteredSearch[key];
+      if (colArr.includes(key)) {
+        return `${encodeURIComponent(key)}_equal=${encodeURIComponent(value)}`;
+      } else {
+        return `${encodeURIComponent(key)}=${encodeURIComponent(value)}`;
+      }
+    }).join('&');
+    window.open(`${url}&${formStr}`);
+  }
+}
diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue
index 020e9f0..8e9dbb6 100644
--- a/src/views/leger/equipmentledger.vue
+++ b/src/views/leger/equipmentledger.vue
@@ -47,7 +47,7 @@
         <el-button type="primary"
                    size="small"
                    plain
-                   @click="handleExport">导出
+                   @click="handleExport()">导出
         </el-button>
       </template>
       <template #menu="{row,index,size}">
@@ -63,6 +63,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
   import {mapGetters} from "vuex";
   import website from "@/config/website";
   import {getToken} from "@/util/auth";
+  import expUtil from "@/util/exportUtil";
 
   export default {
     data() {
@@ -633,8 +634,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
-          window.open(`/api/equipmentledger/export?daf-auth=${getToken()}&${formStr}`);
+          expUtil.excelExport(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search, ['station', 'userStatus']);
         });
       },
       beforeOpen(done, type) {