From 997835429a1d66643364091e8437ebbbeb8ff97a Mon Sep 17 00:00:00 2001
From: zenglf <18502938215@163.com>
Date: 星期四, 28 九月 2023 14:09:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into develop

---
 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