Merge remote-tracking branch 'origin/master' into develop

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 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:"保存成功"
                  });