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/maintenanceProject/MaintenanceProjectModel.vue | 69 ++++++++++++++--------------------
1 files changed, 28 insertions(+), 41 deletions(-)
diff --git a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
index 6490ffe..0096e25 100644
--- a/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
+++ b/src/views/eam/modules/maintenanceProject/MaintenanceProjectModel.vue
@@ -47,22 +47,22 @@
</a-col> -->
<a-col :span="12">
<a-form-item
- label="瀹夊叏瑕佹眰"
+ label="淇濆吇閮ㄤ綅"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
>
<a-input
allow-clear
:disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ュ畨鍏ㄨ姹�'"
- v-decorator="['maintenanceRequire', validatorRules.maintenanceRequire ]"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
+ v-decorator="['location', validatorRules.location ]"
/>
</a-form-item>
</a-col>
</a-row>
<a-row :gutter="24">
- <a-col :span="12">
+ <!-- <a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰缂栧彿"
:labelCol="labelCol"
@@ -70,12 +70,12 @@
>
<a-input
allow-clear
- :disabled="codeDisable"
+ :disabled="disableSubmit"
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚」鐩紪鍙�'"
v-decorator="['num', validatorRules.num ]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
<a-col :span="12">
<a-form-item
label="淇濆吇椤圭洰鍚嶇О"
@@ -90,8 +90,22 @@
/>
</a-form-item>
</a-col>
+ <a-col :span="12">
+ <a-form-item
+ label="淇濆吇鏍囧噯"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ >
+ <a-input
+ allow-clear
+ :disabled="disableSubmit"
+ :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
+ v-decorator="['standard', validatorRules.standard ]"
+ />
+ </a-form-item>
+ </a-col>
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="淇濆吇鏂规硶"
@@ -120,26 +134,12 @@
:placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏诲伐鍏�'"
v-decorator="['maintenanceTool', validatorRules.maintenanceTool ]"
/>
- <!-- dictCode="mom_eam_inspection_type,name,id,status!='0' and del_flag!='1'" -->
</a-form-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row :gutter="24">
- <a-col :span="12">
- <a-form-item
- label="淇濆吇鏍囧噯"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏绘爣鍑�'"
- v-decorator="['standard', validatorRules.standard ]"
- />
- </a-form-item>
- </a-col>
- <a-col :span="12">
+
+ <!-- <a-col :span="12">
<a-form-item
label="缁翠繚涓撲笟"
:labelCol="labelCol"
@@ -154,9 +154,9 @@
v-decorator="['maintenanceSpecialtyId', validatorRules.maintenanceSpecialtyId]"
/>
</a-form-item>
- </a-col>
+ </a-col> -->
</a-row>
- <a-row :gutter="24">
+ <!-- <a-row :gutter="24">
<a-col :span="12">
<a-form-item
label="宸ユ椂瀹氶"
@@ -172,21 +172,8 @@
/>
</a-form-item>
</a-col>
- <a-col :span="12">
- <a-form-item
- label="淇濆吇閮ㄤ綅"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- >
- <a-input
- allow-clear
- :disabled="disableSubmit"
- :placeholder="disableSubmit?'':'璇疯緭鍏ヤ繚鍏婚儴浣�'"
- v-decorator="['location', validatorRules.location ]"
- />
- </a-form-item>
- </a-col>
- </a-row>
+
+ </a-row> -->
<a-row :gutter="24">
<a-col :span="24">
<a-form-item
--
Gitblit v1.9.3