From f8668b057747f2982afafcc1ce9a2842a4abd50c Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期三, 29 十一月 2023 16:36:39 +0800
Subject: [PATCH] 1、设备车间管理页面车间名称新增、修改以及批量删除成功后提示为warning图标 2、设备车间管理页面调整修改车间信息中的排序字段由departOrder为productionOrder 3、删除树节点时需判断节点下是否有子节点，若有子节点则不能删除并提示 4、大屏车间管理页面左右两侧卡片区域布局保持一致 5、设备综合效率分析页面由于ant-design-vie的table组件固定列功能导致导出报表布局混乱
---
src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue b/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
index 4099d53..7e6f237 100644
--- a/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
+++ b/src/components/jeecg/JVxeTable/components/cells/JVxeUserSelectCell.vue
@@ -21,7 +21,7 @@
@initComp="initComp"/>
<span style="display: inline-block;height:100%;padding-left:14px" v-if="userIds" >
<span @click="openSelect" style="display: inline-block;vertical-align: middle">{{ userNames }}</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>
@@ -119,6 +119,10 @@
},
methods: {
openSelect() {
+ // disabled 涓嶅脊绐�
+ if (this.componentDisabled) {
+ return
+ }
this.$refs.selectModal.showModal()
},
selectOK(rows, idstr) {
--
Gitblit v1.9.3