From 07e3e588a730569b8f1cd3227c8649208337e4b0 Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 19 十二月 2023 13:35:36 +0800 Subject: [PATCH] 1、调整网站标题为MDC智慧车间 2、设备管理页面新增弹窗中统一编码选择弹窗中的查询区域样式调整 3、设备参数阈值管理页面添加参数阈值弹窗中原默认驱动类型为空,现调整为首位数据,且无参数时显示请选择参数 4、加工数量管理页面新增弹窗中选择标准加工时间弹窗中的查询区域样式调整 5、加班管理页面新增弹窗中班次选择弹窗中的查询区域样式调整 --- src/views/eam/EquipmentListOfFilesCarousel.vue | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/src/views/eam/EquipmentListOfFilesCarousel.vue b/src/views/eam/EquipmentListOfFilesCarousel.vue index 3a99fc0..b6cac7d 100644 --- a/src/views/eam/EquipmentListOfFilesCarousel.vue +++ b/src/views/eam/EquipmentListOfFilesCarousel.vue @@ -121,6 +121,21 @@ /> </a-form-item> </a-col> + <a-col :span="6"> + <a-form-item + label="鏄惁鐢熶骇绾胯澶�" + :labelCol="labelCol" + :wrapperCol="wrapperCol" + > + <j-dict-select-tag + allow-clear + placeholder="璇烽�夋嫨" + :triggerChange="true" + dictCode="is_product" + v-model="queryParam.isLineEquip" + /> + </a-form-item> + </a-col> </a-row> <a-row :gutter="24"> <a-col :span="6"> @@ -430,7 +445,7 @@ <a-tab-pane tab="ABC鏍囪瘑鍙樻洿璁板綍" key="5" forceRender> <equipment-update-ABC-list :mainId="selectedMainId" /> </a-tab-pane> - <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇磋褰�" key="6" forceRender> + <a-tab-pane tab="璐ㄤ繚鏈熷彉鏇�" key="6" forceRender> <equipment-update-warranty-list :mainId="selectedMainId" /> </a-tab-pane> <a-tab-pane tab="鏃ヤ繚鏍囧噯" key="7" forceRender> @@ -523,6 +538,11 @@ dataIndex: 'equipmentCategoryId_dictText', }, { + title: '鏄惁鐢熶骇绾胯澶�', + align: "center", + dataIndex: 'isLineEquip_dictText', + }, + { title: '缁熶竴缂栫爜', align: "center", dataIndex: 'num', -- Gitblit v1.9.3