From 585fb0bbd4a7bc7f8f333ecba7c5fecd2ee5cbc2 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期四, 28 三月 2024 09:46:44 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop

---
 src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
index 2cf2f80..a89ad24 100644
--- a/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
+++ b/src/views/eam/modules/equipmentScrap/EquipmentSelectModal.vue
@@ -178,7 +178,7 @@
       visible: false,
       loading: false,
       url: {
-        list: '/eam/equipment/list'
+        list: '/eam/equipment/getEquipmentList'
       }
     }
   },
@@ -208,6 +208,7 @@
       }
       let that = this
       this.loading = true
+      this.queryParam.isLine = 'no'
       let params = this.getQueryParams()//鏌ヨ鏉′欢
       // params.equipmentStatus = '1'
       await getAction(this.url.list, params).then((res) => {

--
Gitblit v1.9.3