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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/UnplannedDowntimemManager/UnplannedDowntimemManagerModalEdit.vue

@@ -36,15 +36,15 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="类型" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input :disabled="disableSubmit" placeholder="请输入类型"
                       :triggerChange="true"
                       v-decorator="['noplanType', validatorRules.noplanType]"/>
              <j-dict-select-tag :readOnly="disableSubmit" placeholder="请选择类型"
                                 :triggerChange="true" dictCode="mdc_noplan_type"
                                 v-decorator="['noplanType', validatorRules.noplanType]" allow-clear/>
            </a-form-item>
          </a-col>
        </a-row>
        <a-row :gutter="24">
          <a-form-item label="备注" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
            <a-textarea  :disabled="disableSubmit"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
            <a-textarea :maxLength="20" :disabled="disableSubmit"  v-decorator="['remark', validatorRules.remark]" placeholder="请输入备注"  ></a-textarea>
          </a-form-item>
        </a-row>
      </a-form>
@@ -60,7 +60,6 @@
  import pick from 'lodash.pick'
  // import DeviceRepairListModel from './DeviceRepairListModel'
  // import DeviceRepairEditListModel from './DeviceRepairEditListModel'
  // import JDate from './JDate'
  import {
    getAction,
    postAction,
@@ -134,6 +133,30 @@
              {
                required:true,
                message: ""
              },
            ],
          },
          noplanType:{
            rules:[
              {
                required:true,
                message: "请选择类型"
              },
            ],
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
@@ -261,7 +284,12 @@
            let startOne = start.replace(/:/g,'');
            let endOne = end.replace(/:/g,'');
            if(startOne>=endOne){
              that.$message.warning("结束时间不能小于开始时间");
              // that.$message.warning("结束时间不能小于开始时间");
              that.$notification.warning({
                message:'消息',
                description:"结束时间不能小于开始时间"
              });

              // console.log(this.model)
              // this.endTime = ''
              that.confirmLoading = false
@@ -276,11 +304,19 @@
              }
              obj.then((res) => {
                if (res.success) {
                  that.$message.success("添加成功")
                  // that.$message.success("添加成功")
                  that.$notification.success({
                    message:'消息',
                    description:"修改成功"
                  });
                  // that.$message.success(res.message)
                  that.$emit('ok', res.result)
                } else {
                  that.$message.warning(res.message)
                  // that.$message.warning(res.message)
                  that.$notification.warning({
                    message:'消息',
                    description:res.message
                  });
                }
              }).finally(() => {
                that.confirmLoading = false