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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue

@@ -12,19 +12,20 @@

          </a-col>
          <a-col :span="12">
            <a-form-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
            <a-form-item label="加班开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"  @change="changeStartTime"
                             v-decorator="['startTime',validatorRules.startTime]"/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="加班开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit"  @change="changeStartTime"
                            v-decorator="['startTime',validatorRules.startTime]"/>
            <a-form-item label="设备名称" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"
                       v-decorator="['equipmentName',validatorRules.equipmentName]"/>
            </a-form-item>
          </a-col>

          <a-col :span="12">
            <a-form-item label="加班结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-time-picker :disabled="disableSubmit" :readOnly="disableSubmit" @change="changeEndTime"
@@ -78,7 +79,7 @@
            span: 24
          },
          sm: {
            span: 6
            span: 8
          }
        },
        wrapperCol: {
@@ -86,7 +87,7 @@
            span: 24
          },
          sm: {
            span: 18
            span: 16
          }
        },
        labelColLong: {
@@ -94,7 +95,7 @@
            span: 24
          },
          sm: {
            span: 3
            span: 4
          }
        },
        wrapperColLong: {
@@ -102,7 +103,7 @@
            span: 24
          },
          sm: {
            span: 21
            span: 20
          }
        },
        confirmLoading: false,
@@ -121,6 +122,22 @@
              {
                required:true,
                message: ""
              },
            ],
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择加班开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择加班结束时间"
              },
            ],
          },
@@ -305,13 +322,13 @@
            //   that.$message.warning("开始时间不能小于当前时间")
            //   that.confirmLoading = false
            // }else{
            // if(startOne>=endOne){
            //   that.$message.warning("结束时间不能小于开始时间");
            //   // console.log(this.model)
            //   // this.endTime = ''
            //   that.confirmLoading = false
            // }
            // else{
            if(startOne>=endOne){
              that.$message.warning("结束时间不能小于开始时间");
              // console.log(this.model)
              // this.endTime = ''
              that.confirmLoading = false
            }
            else{
              let obj

              if (!this.model.id) {
@@ -331,7 +348,7 @@
                  // that.$message.success("添加成功")
                  that.$notification.success({
                    message:'消息',
                    description:"添加成功"
                    description:"修改成功"
                  });
                  // that.$message.success(res.message)
                  that.$emit('ok', res.result)
@@ -349,7 +366,7 @@
            }
          // }

          // }
          }
        })
      },
      handleCancel() {