From c46213fa824995bb2155c11ea332824d23232d9c Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期二, 10 六月 2025 16:25:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
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