From 5cbba170e270e6f1c99a91e27dbb7951a27d596a Mon Sep 17 00:00:00 2001
From: “linengliang” <vanSuperEnergy@163.com>
Date: 星期五, 24 十一月 2023 16:41:32 +0800
Subject: [PATCH] 故障报修验收

---
 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue |   62 +++++++++++++++++++-----------
 1 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
index ff5ad89..0ed4b81 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
@@ -6,7 +6,7 @@
         <a-row :gutter="24">
           <a-col :span="24">
             <a-form-item label="鐝閫夋嫨" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
-              <a-input-search :readOnly="true" v-decorator="['ids', validatorRules.ids]"
+              <a-input-search :readOnly="true" v-decorator="['calendarId', validatorRules.calendarId]"
                               @search="deviceSearch" enter-button/>
             </a-form-item>
           </a-col>
@@ -15,13 +15,13 @@
           <a-col :span="12">
             <a-form-item label="鍔犵彮寮�濮嬫椂闂�" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear
-                             v-decorator="['startTime',validatorRules.startTime]"/>
+                             v-decorator="['startTime',validatorRules.startTime]"  valueFormat="HH:mm:ss"/>
             </a-form-item>
           </a-col>
           <a-col :span="12">
             <a-form-item label="鍔犵彮缁撴潫鏃堕棿" :labelCol="labelCol" :wrapperCol="wrapperCol">
               <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"
-                             v-decorator="['endTime',validatorRules.endTime]"/>
+                             v-decorator="['endTime',validatorRules.endTime]" valueFormat="HH:mm:ss"/>
             </a-form-item>
           </a-col>
         </a-row>
@@ -73,7 +73,7 @@
             span: 24
           },
           sm: {
-            span: 6
+            span: 8
           }
         },
         wrapperCol: {
@@ -81,7 +81,7 @@
             span: 24
           },
           sm: {
-            span: 18
+            span: 16
           }
         },
         labelColLong: {
@@ -89,7 +89,7 @@
             span: 24
           },
           sm: {
-            span: 3
+            span: 4
           }
         },
         wrapperColLong: {
@@ -97,7 +97,7 @@
             span: 24
           },
           sm: {
-            span: 21
+            span: 20
           }
         },
         confirmLoading: false,
@@ -108,6 +108,30 @@
               {
                 required:true,
                 message: "璇烽�夋嫨璁惧"
+              },
+            ],
+          },
+          calendarId:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨鐝"
+              },
+            ],
+          },
+          startTime:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨鍔犵彮寮�濮嬫椂闂�"
+              },
+            ],
+          },
+          endTime:{
+            rules:[
+              {
+                required:true,
+                message: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
               },
             ],
           },
@@ -151,12 +175,12 @@
           if (i == 0) {
             calendarId =  val[i].id;
           } else {
-            calendarId = ids + "," + val[i].id;
+            calendarId = calendarId + "," + val[i].id;
           }
         }
         // console.log("========",equipmentIds);
         this.form.setFieldsValue({
-          ids: calendarId,
+          calendarId: calendarId,
         })
         //   this.form.setFieldsValue({
         // equipmentId: val.equipmentId,
@@ -219,21 +243,13 @@
           if (!err) {
             that.confirmLoading = true
             let formData = Object.assign(this.model, values)
-            let start = moment(formData.startTime).format('HH:mm:ss');
-            let end = moment(formData.endTime).format('HH:mm:ss');
-            let startOne = start.replace(/:/g,'');
-            let endOne = end.replace(/:/g,'');
-            // var data = new Date();
-            // let stertDate = moment(data).format("HH:mm:ss");
-            // let dataStart = stertDate.replace(/:/g,'');
-            // if(startOne < dataStart){
-            //   that.$message.warning("寮�濮嬫椂闂翠笉鑳藉皬浜庡綋鍓嶆椂闂�")
-            //   that.confirmLoading = false
-            // }else{
+            let startOne = formData.startTime.replace(/:/g,'');
+            let endOne = formData.endTime.replace(/:/g,'')
               if(startOne>=endOne){
-                that.$message.warning("缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�");
-                // console.log(this.model)
-                // this.endTime = ''
+                that.$notification.warning({
+                  message:'娑堟伅',
+                  description:"缁撴潫鏃堕棿涓嶈兘灏忎簬寮�濮嬫椂闂�"
+                });
                 that.confirmLoading = false
               }else{
                 let obj

--
Gitblit v1.9.3