From c5074e681475214710b4047f62c357a1b141ac5f Mon Sep 17 00:00:00 2001
From: weitingdong <2480899115@qq.com>
Date: Thu, 18 Jul 2024 14:12:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E5=8A=9F=E8=83=BD=E4=BF=AE?=
 =?UTF-8?q?=E6=AD=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/inspection/inspectionobject.vue       | 2 +-
 src/views/inspection/inspectionobjectDetail.vue | 7 +------
 src/views/leger/equipmentledger.vue             | 2 +-
 src/views/leger/toolinventoryrecord.vue         | 5 +++--
 4 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/src/views/inspection/inspectionobject.vue b/src/views/inspection/inspectionobject.vue
index c641c45..994d6a1 100644
--- a/src/views/inspection/inspectionobject.vue
+++ b/src/views/inspection/inspectionobject.vue
@@ -413,7 +413,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          expUtil.excelExport(`/api/inspection/inspectionobject/export?daf-auth=${getToken()}`, this.search, ['stations', "istatus", "objectName"]);
+          expUtil.excelExportEasy(`/api/inspection/inspectionobject/export?daf-auth=${getToken()}`, this.search);
         });
       },
       beforeOpen(done, type) {
diff --git a/src/views/inspection/inspectionobjectDetail.vue b/src/views/inspection/inspectionobjectDetail.vue
index 24dd401..ff481a4 100644
--- a/src/views/inspection/inspectionobjectDetail.vue
+++ b/src/views/inspection/inspectionobjectDetail.vue
@@ -48,7 +48,7 @@ export default {
             label: "对象编号",
             prop: "objectNo",
             span:8,
-            disabled: true,
+            disabled:true,
             rules: [{
               required: true,
               message: "请输入对象编号",
@@ -102,8 +102,6 @@ export default {
                     kksNo.disabled = true;
                     if(["view"].includes(this.$route.query.frameMode)) {
                       kksNo.disabled = false;
-                      const objectNo = this.findObject(this.option.column, "objectNo");
-                      objectNo.disabled = false;
                     }
                   }else{
                     const toolsCodeId = this.findObject(this.option.column, "toolsCodeId");
@@ -112,8 +110,6 @@ export default {
                     kksNo.disabled = false;
                     if(["view"].includes(this.$route.query.frameMode)) {
                       kksNo.disabled = false;
-                      const objectNo = this.findObject(this.option.column, "objectNo");
-                      objectNo.disabled = false;
                     }
                   }
                 }
@@ -258,7 +254,6 @@ export default {
     }else{
       const objectNo = this.findObject(this.option.column, "objectNo");
       objectNo.value = ' ';
-      objectNo.disabled = true;
       const iStatus = this.findObject(this.option.column, "istatus");
       iStatus.display = false;
       const cancelReason = this.findObject(this.option.column, "cancelReason");
diff --git a/src/views/leger/equipmentledger.vue b/src/views/leger/equipmentledger.vue
index 7c67166..5aef489 100644
--- a/src/views/leger/equipmentledger.vue
+++ b/src/views/leger/equipmentledger.vue
@@ -635,7 +635,7 @@ import {getList, getDetail, add, update, remove, reject, auditing} from "@/api/l
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          expUtil.excelExportEasy(`/api/workorder/export?daf-auth=${getToken()}`, this.search);
+          expUtil.excelExportEasy(`/api/equipmentledger/export?daf-auth=${getToken()}`, this.search);
         });
       },
       beforeOpen(done, type) {
diff --git a/src/views/leger/toolinventoryrecord.vue b/src/views/leger/toolinventoryrecord.vue
index 5277491..78d9cd6 100644
--- a/src/views/leger/toolinventoryrecord.vue
+++ b/src/views/leger/toolinventoryrecord.vue
@@ -62,11 +62,13 @@
   import {mapGetters} from "vuex";
   import {getToken} from "@/util/auth";
   import {Alert} from "element-ui";
+  import expUtil from "@/util/exportUtil";
   export default {
     data() {
       return {
         form: {},
         query: {},
+        search:{},
         loading: true,
         page: {
           pageSize: 10,
@@ -327,8 +329,7 @@
           cancelButtonText: "取消",
           type: "warning"
         }).then(() => {
-          var formStr = Object.keys(this.search).map(key => `${encodeURIComponent(key)}=${encodeURIComponent(this.search[key])}`).join('&');
-          window.open(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}&${formStr}`);
+          expUtil.excelExportEasy(`/api/leger/toolinventoryrecord/export?daf-auth=${getToken()}`, this.search);
         });
       },
       beforeOpen(done, type) {