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/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue b/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue
index 9f4b943..90e48ff 100644
--- a/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue
+++ b/src/views/eam/modules/specialtyMaintenanceStandard/EquipmentList.vue
@@ -21,9 +21,9 @@
:md="6"
:sm="8"
>
- <a-form-item label="璁惧缂栧彿">
+ <a-form-item label="缁熶竴缂栫爜">
<j-input
- placeholder="璇疯緭鍏ユ爣鍑嗙紪鍙锋绱�"
+ placeholder="璇疯緭鍏ョ粺涓�缂栫爜"
v-model="queryParam.num"
></j-input>
</a-form-item>
@@ -45,14 +45,14 @@
:sm="8"
v-if="selectedDeparts"
>
- <a-form-item label="瀵硅薄閮ㄩ棬">
+ <a-form-item label="浣跨敤閮ㄩ棬">
<a-select
- allow-clear
- :placeholder="'璇烽�夋嫨瀵硅薄閮ㄩ棬'"
- :options="departs"
- v-model="queryParam.useId"
- style="width: 100%"
- />
+ allow-clear
+ :placeholder="'璇烽�夋嫨浣跨敤閮ㄩ棬'"
+ :options="departs"
+ v-model="queryParam.useId"
+ style="width: 100%"
+ />
</a-form-item>
</a-col>
<a-col
@@ -124,7 +124,7 @@
visible: false,
model: {},
departs: [],
- selectedDeparts:false,
+ selectedDeparts: false,
dataSource: [],
disableSubmit: false,
type: "radio",
@@ -161,7 +161,7 @@
}
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: 'center',
dataIndex: 'num',
},
@@ -192,7 +192,7 @@
},
}
},
- created(){
+ created() {
this.getSysDeparts()
},
--
Gitblit v1.9.3