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/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue |   24 ++++++++++++++++++++----
 1 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
index 30d3d4b..41abd9e 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
@@ -79,7 +79,7 @@
             span: 24
           },
           sm: {
-            span: 6
+            span: 8
           }
         },
         wrapperCol: {
@@ -87,7 +87,7 @@
             span: 24
           },
           sm: {
-            span: 18
+            span: 16
           }
         },
         labelColLong: {
@@ -95,7 +95,7 @@
             span: 24
           },
           sm: {
-            span: 3
+            span: 4
           }
         },
         wrapperColLong: {
@@ -103,7 +103,7 @@
             span: 24
           },
           sm: {
-            span: 21
+            span: 20
           }
         },
         confirmLoading: false,
@@ -125,6 +125,22 @@
               },
             ],
           },
+          startTime:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨鍔犵彮寮�濮嬫椂闂�"
+              },
+            ],
+          },
+          endTime:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
+              },
+            ],
+          },
           // mdcRepairType:{
           //   rules:[
           //     {

--
Gitblit v1.9.3