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/inspectionCycle/InspectionCycleForm.vue | 39 ++++++++++++++++++++-------------------
1 files changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
index 4ce46b9..fbfa3a4 100644
--- a/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
+++ b/src/views/eam/modules/inspectionCycle/InspectionCycleForm.vue
@@ -122,6 +122,20 @@
</a-col>
<a-col :span="24/2">
<a-form-model-item
+ label="鐗堟湰"
+ :labelCol="labelCol"
+ :wrapperCol="wrapperCol"
+ prop="version"
+ >
+ <a-input
+ v-model="model.version"
+ placeholder="璇疯緭鍏ョ増鏈彿"
+ :disabled=true
+ ></a-input>
+ </a-form-model-item>
+ </a-col>
+ <!-- <a-col :span="24/2">
+ <a-form-model-item
label="寮�宸ユ潯浠�"
:labelCol="labelCol"
:wrapperCol="wrapperCol"
@@ -134,9 +148,9 @@
v-model="model.startCondition"
/>
</a-form-model-item>
- </a-col>
+ </a-col> -->
</a-row>
- <a-row>
+ <!-- <a-row>
<a-col :span="24/2">
<a-form-model-item
label="璋冩暣鏂瑰紡"
@@ -167,9 +181,9 @@
/>
</a-form-model-item>
</a-col>
- </a-row>
+ </a-row> -->
<a-row>
- <a-col :span="24/2">
+ <!-- <a-col :span="24/2">
<a-form-model-item
label="渚濇嵁鏃ュ巻"
:labelCol="labelCol"
@@ -183,21 +197,8 @@
v-model="model.accordingCalendar"
/>
</a-form-model-item>
- </a-col>
- <a-col :span="24/2">
- <a-form-model-item
- label="鐗堟湰"
- :labelCol="labelCol"
- :wrapperCol="wrapperCol"
- prop="version"
- >
- <a-input
- v-model="model.version"
- placeholder="璇疯緭鍏ョ増鏈彿"
- :disabled=true
- ></a-input>
- </a-form-model-item>
- </a-col>
+ </a-col> -->
+
</a-row>
<a-row>
--
Gitblit v1.9.3