From 133c3ad5450976bb161a9c713f2a6cf075165c55 Mon Sep 17 00:00:00 2001
From: zhaowei <zhaowei>
Date: 星期一, 03 三月 2025 16:50:03 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/eam/modules/equipmentNew/EquipmentModal.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/views/eam/modules/equipmentNew/EquipmentModal.vue b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
index 3976c6a..c932f92 100644
--- a/src/views/eam/modules/equipmentNew/EquipmentModal.vue
+++ b/src/views/eam/modules/equipmentNew/EquipmentModal.vue
@@ -33,7 +33,7 @@
                 placeholder='璇烽�夋嫨璁惧鎵�灞炲垎绫�'
                 :disabled='formDisabled'
                 :triggerChange='true'
-                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
+                :dictCode="caytegoryParam==='all'?'mom_eam_equipment_category,name,id,del_flag!=\'1\'':'mom_eam_equipment_category,name,id,equipment_category_uda1 = '+'\''+caytegoryParam+'\''"
                 v-model='model.equipmentCategoryId'
                 @change='categoryChange'
               />

--
Gitblit v1.9.3