From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 src/components/jeecgbiz/JSelectEquipmentProduction.vue |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/components/jeecgbiz/JSelectEquipmentProduction.vue b/src/components/jeecgbiz/JSelectEquipmentProduction.vue
index 2f3ac51..e0bacfa 100644
--- a/src/components/jeecgbiz/JSelectEquipmentProduction.vue
+++ b/src/components/jeecgbiz/JSelectEquipmentProduction.vue
@@ -3,7 +3,7 @@
     <!---->
     <a-input @click="openModal" placeholder="璇风偣鍑婚�夋嫨杞﹂棿" v-model="textVals" readOnly :disabled="disabled">
       <a-icon slot="prefix" type="cluster" title="杞﹂棿閫夋嫨鎺т欢"/>
-      <a-icon v-if="storeVals" slot="suffix" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
+      <a-icon v-if="storeVals&&!disabled" slot="suffix" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
     </a-input>
     <j-select-equipment-production-modal
       ref="innerDepartSelectModal"

--
Gitblit v1.9.3