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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 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