zhuzhuanzhuan
2023-09-01 72f198b1503e3a1676b22464f8b46c8d4cf5e3d7
加班管理
已修改3个文件
39 ■■■■ 文件已修改
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalEdit.vue 31 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
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"
@@ -305,13 +306,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 +332,7 @@
                  // that.$message.success("添加成功")
                  that.$notification.success({
                    message:'消息',
                    description:"添加成功"
                    description:"修改成功"
                  });
                  // that.$message.success(res.message)
                  that.$emit('ok', res.result)
@@ -349,7 +350,7 @@
            }
          // }
          // }
          }
        })
      },
      handleCancel() {
src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementModalList.vue
@@ -207,9 +207,9 @@
      }
    },
    created(){
      this.dates = [moment().subtract('days', 0), moment().subtract('days', 0)]
      this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
      this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
      // this.dates = [moment().subtract('days', 0), moment().subtract('days', 0)]
      // this.queryParam.startTime = moment(this.dates[0]).format('YYYYMMDD')
      // this.queryParam.endTime = moment(this.dates[1]).format('YYYYMMDD')
      // this.queryTreeData()
      this.loadData()
    },
src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue
@@ -283,7 +283,7 @@
                  // that.$message.success("添加成功")
                  that.$notification.success({
                    message:'消息',
                    description:"添加成功"
                    description:"修改成功"
                  });
                  // that.$message.success(res.message)
                  that.$emit('ok', res.result)