From 51b9e548b0e533e8a415ce141808f2bb747b381e Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期一, 18 三月 2024 16:08:49 +0800 Subject: [PATCH] 1、mdc菜单下除特殊要求外,页面表格最少条数由10条调整为30条,每页最多条数区间由[10,20,30]调整为[30,50,100] 2、OEE基础管理和数据报表模块增加打印按钮,实现打印表格数据功能 3、设备管理、数据报表模块增加按照设备级别和设备类型查询表格数据 4、设备车间管理页面增加车间编码字段 5、修改组件名称以试图解决刷新后进入请求json页面问题 --- 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