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/OvertimeManagementModal.vue | 72 ++++++++++++++++++------------------
1 files changed, 36 insertions(+), 36 deletions(-)
diff --git a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
index 6d49fa1..0ed4b81 100644
--- a/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
+++ b/src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModal.vue
@@ -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: "璇烽�夋嫨鍔犵彮缁撴潫鏃堕棿"
},
],
},
@@ -212,19 +236,6 @@
this.visible = false
this.show = false
},
- fun(obj) {
- if(obj){
- if (obj = obj.split("T")) {
- var tim = obj[1];
- if(tim = tim.split(".")){
- var tim0 = tim[0];
- }
- var dd = tim0
- return dd;
- }
- }
-
- },
handleOk() {
const that = this
// 瑙﹀彂琛ㄥ崟楠岃瘉
@@ -232,28 +243,17 @@
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
-
if (!this.model.id) {
- formData.startTime = this.fun(JSON.stringify(formData.startTime));
- formData.endTime = this.fun(JSON.stringify(formData.endTime))
obj = postAction(this.url.add, formData)
} else {
obj = requestPut(this.url.edit, formData, {
--
Gitblit v1.9.3