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/shift/ShiftInfoModel.vue | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
index ed99075..1ed89ef 100644
--- a/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
+++ b/src/views/mdc/base/modules/shift/ShiftInfoModel.vue
@@ -232,11 +232,13 @@
formData.isDaySpan = that.isDaySpan
console.log(formData.isDaySpan);
if(formData.isDaySpan == false){
- let startTime = moment(formData.startDate).format('HH:mm:ss');
- let endTime = moment(formData.endDate).format('HH:mm:ss');
- let startTimeOne = startTime.replace(/:/g,'');
- let endTimeOne = endTime.replace(/:/g,'');
- if(startTimeOne>endTimeOne){
+ formData.startDate = moment(formData.startDate).format('HH:mm:ss');
+ formData.endDate = moment(formData.endDate).format('HH:mm:ss');
+ formData.sleepStartDate = moment(formData.sleepStartDate).format('HH:mm:ss');
+ formData.sleepEndDate = moment(formData.sleepEndDate).format('HH:mm:ss');
+ let startTimeOne = formData.startDate.replace(/:/g,'');
+ let endTimeOne = formData.endDate.replace(/:/g,'');
+ if(startTimeOne > endTimeOne){
// that.$message.warning("闈炶法澶╃彮娆＄粨鏉熸椂闂翠笉鑳藉皬浜庣瓑浜庡紑濮嬫椂闂达紒")
that.$notification.warning({
message:'娑堟伅',
@@ -262,7 +264,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success("淇濆瓨鎴愬姛")
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇濆瓨鎴愬姛"
});
@@ -292,7 +294,7 @@
obj.then((res) => {
if (res.success) {
// that.$message.success
- that.$notification.warning({
+ that.$notification.success({
message:'娑堟伅',
description:"淇濆瓨鎴愬姛"
});
--
Gitblit v1.9.3