From 49a74a67140e814bb70efcde61b37d4750448e6a Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期二, 14 五月 2024 16:39:01 +0800
Subject: [PATCH] 1、设备加工工件报表页面调整表格唯一标识字段由equipmentId调整为id以试图解决项目服务器上表格数据混乱问题 2、设备利用率、设备开动率、班次利用率以及设备综合效率分析页面调整设备类型、驱动类型、设备级别以及设备种类页面组件为多选下拉菜单

---
 src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue b/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
index d583808..d73367e 100644
--- a/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
+++ b/src/components/jeecg/JVxeTable/components/cells/JVxeDepartSelectCell.vue
@@ -22,7 +22,7 @@
         @initComp="initComp"/>
     <span style="display: inline-block;height:100%;padding-left:14px" v-if="departIds" >
       <span @click="openSelect" style="display: inline-block;vertical-align: middle">{{ departNames }}</span>
-      <a-icon style="margin-left:5px;vertical-align: middle" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
+      <a-icon v-if="!componentDisabled" style="margin-left:5px;vertical-align: middle" type="close-circle" @click="handleEmpty" title="娓呯┖"/>
     </span>
   </div>
 </template>
@@ -98,6 +98,10 @@
     },
     methods: {
       openSelect(){
+        // disabled 涓嶅脊绐�
+        if (this.componentDisabled) {
+          return
+        }
         this.$refs.innerDepartSelectModal.show()
       },
       handleEmpty(){

--
Gitblit v1.9.3