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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

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

@@ -136,6 +136,30 @@
              },
            ],
          },
          noplanType:{
            rules:[
              {
                required:true,
                message: "请选择类型"
              },
            ],
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
          // mdcRepairType:{
          //   rules:[
          //     {
@@ -260,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
@@ -275,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