From 72f198b1503e3a1676b22464f8b46c8d4cf5e3d7 Mon Sep 17 00:00:00 2001
From: zhuzhuanzhuan
Date: 星期五, 01 九月 2023 16:37:02 +0800
Subject: [PATCH] 加班管理

---
 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue |   31 ++++++++++++++++---------------
 1 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
index a8995f5..30d3d4b 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue
@@ -12,19 +12,20 @@
 
           </a-col>
           <a-col :span="12">
-            <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
-                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
+            <a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"  @change="changeStartTime"
+                             v-decorator="['startTime',validatorRules.startTime]"/>
             </a-form-item>
           </a-col>
         </a-row>
         <a-row :gutter="24">
           <a-col :span="12">
-            <a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
-              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"  @change="changeStartTime"
-                            v-decorator="['startTime',validatorRules.startTime]"/>
+            <a-form-item label="璁惧鍚嶇О" :labelCol="labelCol" :wrapperCol="wrapperCol">
+              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="璇疯緭鍏ヨ澶囧悕绉�"
+                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
             </a-form-item>
           </a-col>
+
           <a-col :span="12">
             <a-form-item label="鍔犵彮缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" @change="changeEndTime"
@@ -305,13 +306,13 @@
             //   that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
             //   that.confirmLoading = false
             // }else{
-            // if(startOne>=endOne){
-            //   that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
-            //   // console.log(this.model)
-            //   // this.endTime = ''
-            //   that.confirmLoading = false
-            // }
-            // else{
+            if(startOne>=endOne){
+              that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
+              // console.log(this.model)
+              // this.endTime = ''
+              that.confirmLoading = false
+            }
+            else{
               let obj
 
               if (!this.model.id) {
@@ -331,7 +332,7 @@
                   // that.$message.success("娣诲姞鎴愬姛")
                   that.$notification.success({
                     message:'娑堟伅',
-                    description:"娣诲姞鎴愬姛"
+                    description:"淇敼鎴愬姛"
                   });
                   // that.$message.success(res.message)
                   that.$emit('ok', res.result)
@@ -349,7 +350,7 @@
             }
           // }
 
-          // }
+          }
         })
       },
       handleCancel() {

--
Gitblit v1.9.3