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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/deviceRepair/DeviceRepairModelEdit.vue

@@ -6,8 +6,10 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择开始时间" :disabledDate="disabledDate"
                      class="query-group-cust" v-decorator="['startTime', validatorRules.startTime]"></j-date>
              <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
                      placeholder="请选择开始时间" :disabledDate="disabledDate"
                      class="query-group-cust" v-decorator="['startTime', validatorRules.startTime]"
                      :disabledTime="disabledDateTime" :showToday="false"></j-date>
            </a-form-item>

          </a-col>
@@ -21,8 +23,11 @@
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="true" date-format="YYYY-MM-DD HH:mm:ss" placeholder="请选择结束时间" :disabledDate="disabledDate"
                      class="query-group-cust" v-decorator="['endTime', validatorRules.endTime]"></j-date>
              <j-date :show-time="{hideDisabledOptions:true}" date-format="YYYY-MM-DD HH:mm:ss"
                      placeholder="请选择结束时间"
                      :disabledDate="disabledDate"
                      class="query-group-cust" v-decorator="['endTime', validatorRules.endTime]"
                      :disabledTime="disabledDateTime" :showToday="false"></j-date>
            </a-form-item>
          </a-col>
          <a-col :span="12">
@@ -36,7 +41,8 @@
      </a-form>
    </a-spin>
    <!--<device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-list-model>-->
    <device-repair-edit-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-edit-list-model>
    <device-repair-edit-list-model ref="deviceRepairListModel"
                                   @sendSelectionRows="getDeviceRows"></device-repair-edit-list-model>
  </a-modal>
</template>

@@ -57,18 +63,18 @@

  export default {
    name: 'DeviceRepairModelEdit',
    components: {DeviceRepairListModel,JDate,DeviceRepairEditListModel},
    components: { DeviceRepairListModel, JDate, DeviceRepairEditListModel },
    props: {},
    data() {
      return {
        readOnly:true,
        readOnly: true,
        title: '',
        visible: false,
        show: false,
        model: {},
        checked: false,
        startData:"",
        endData:"",
        startData: '',
        endData: '',
        labelCol: {
          xs: {
            span: 24
@@ -104,22 +110,38 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentId:{
            rules:[
          equipmentId: {
            rules: [
              {
                required:true,
                message: ""
              },
            ],
                required: true,
                message: ''
              }
            ]
          },
          equipmentName:{
            rules:[
          equipmentName: {
            rules: [
              {
                required:true,
                message: ""
              },
            ],
                required: true,
                message: ''
              }
            ]
          },
          startTime: {
            rules: [
              {
                required: true,
                message: '请选择开始时间'
              }
            ]
          },
          endTime: {
            rules: [
              {
                required: true,
                message: '请选择结束时间'
              }
            ]
          }
          // mdcRepairType:{
          //   rules:[
          //     {
@@ -139,17 +161,17 @@
        disableSubmit: true,
        partCategoryCascade: [],
        cascadeDefaultValue: [],
        editStart:''
        editStart: ''
      }
    },
    created() {
    },

    methods: {
      disabledDate(current){
      disabledDate(current) {
        //Can not slect days before today and today
        // return current && current < moment().endOf("day");
        return current < moment().subtract(+1, 'day')//今天之前的年月日不可选，不包括今天
        return current < moment().subtract(+2, 'day').endOf('day')//前一天之前的年月日不可选，不包括前一天
      },
      moment,
      // onChange(dates) {
@@ -161,17 +183,17 @@
      //   // this.endData = dateStrings[1];
      //   // console.log(this.startData,this.endData);
      // },
      onChangeEnd(dates, dateStrings){
        this.endTime = dateStrings[0];
      onChangeEnd(dates, dateStrings) {
        this.endTime = dateStrings[0]
      },
      getDeviceRows(val) {
        this.form.setFieldsValue({
          equipmentId: val.equipmentId,
          equipmentName: val.equipmentName,
        //   // equipmentModel: val.equipmentModel,
        //   // equipmentIp: val.equipmentIp,
        //   // dataPort: val.dataPort,
        //   // driveType: val.driveType
          equipmentName: val.equipmentName
          //   // equipmentModel: val.equipmentModel,
          //   // equipmentIp: val.equipmentIp,
          //   // dataPort: val.dataPort,
          //   // driveType: val.driveType
        })
        // var equipmentIds;
        // for(var i = 0;i<val.length;i++){
@@ -220,10 +242,10 @@
      edit(record) {
        this.form.resetFields()
        this.model = Object.assign({}, record)
        this.editStart  = (this.model.startTime).replace(/:/g,'');
        this.editStart = (this.model.startTime).replace(/:/g, '')
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'tierType', 'parentName', 'equipmentId', 'equipmentName','startTime', 'endTime',
          this.form.setFieldsValue(pick(this.model, 'tierType', 'parentName', 'equipmentId', 'equipmentName', 'startTime', 'endTime'
          ))
        })
      },
@@ -239,113 +261,148 @@
          if (!err) {
            that.confirmLoading = true
            let formData = Object.assign(this.model, values)
            let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss');
            let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss');
            let startOne = start.replace(/:/g,'');
            let endOne = end.replace(/:/g,'');
            var data = new Date();
            let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
            let dataStart = stertDate.replace(/:/g,'');
            if(this.editStart != startOne){
              if(startOne < dataStart) {
                // that.$message.warning("开始时间不能小于当前时间")
                that.$notification.warning({
                  message:'消息',
                  description:"开始时间不能小于当前时间"
                });
                that.confirmLoading = false
              }else{
                if(startOne>=endOne){
                  // that.$message.warning("结束时间不能小于开始时间");
                  that.$notification.warning({
                    message:'消息',
                    description:"结束时间不能小于当前时间"
                  });
                  // console.log(this.model)
                  // this.endTime = ''
                  that.confirmLoading = false

                }else{

                  let obj
                  if (!this.model.id) {
                    obj = postAction(this.url.add, formData)
                  } else {

                    obj = requestPut(this.url.edit, formData, {
                      id: this.model.id
                    })
                    let shijian = startOne
                  }
                  obj.then((res) => {
                    if (res.success) {
                      // that.$message.success("修改成功")
                      // that.$message.success(res.message)
                      that.$notification.warning({
                        message:'消息',
                        description:res.message
                      });
                      that.$emit('ok', res.result)
                    } else {
                      // that.$message.warning(res.message)
                      that.$notification.warning({
                        message:'消息',
                        description:res.message
                      });
                    }
                  }).finally(() => {
                    that.confirmLoading = false
                    that.close()
                  })
                }
              }
            }else{
              if(startOne>=endOne){
                // that.$message.warning("结束时间不能小于开始时间");
                that.$notification.warning({
                  message:'消息',
                  description:"结束时间不能小于开始时间"
                });
                // console.log(this.model)
                // this.endTime = ''
                that.confirmLoading = false

              }else{

                let obj
                if (!this.model.id) {
                  obj = postAction(this.url.add, formData)
                } else {

                  obj = requestPut(this.url.edit, formData, {
                    id: this.model.id
                  })
                  let shijian = startOne
                }
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("修改成功")
                    // that.$message.success(res.message)
                    that.$notification.warning({
                      message:'消息',
                      description:res.message
                    });
                    that.$emit('ok', res.result)
                  } else {
                    // that.$message.warning(res.message)
                    that.$notification.warning({
                      message:'消息',
                      description:res.message
                    });
                  }
                }).finally(() => {
                  that.confirmLoading = false
                  that.close()
            let start = moment(formData.startTime).format('YYYY-MM-DD HH:mm:ss')
            let end = moment(formData.endTime).format('YYYY-MM-DD HH:mm:ss')
            let startOne = start.replace(/:/g, '')
            let endOne = end.replace(/:/g, '')
            var data = new Date()
            let stertDate = moment(data).format('YYYY-MM-DD HH:mm:ss')
            let dataStart = stertDate.replace(/:/g, '')
            // if (this.editStart != startOne) {
            //   if (startOne < dataStart) {
            //     // that.$message.warning("开始时间不能小于当前时间")
            //     that.$notification.warning({
            //       message: '消息',
            //       description: '开始时间不能小于当前时间'
            //     })
            //     that.confirmLoading = false
            //   } else {
            //     if (startOne >= endOne) {
            //       // that.$message.warning("结束时间不能小于开始时间");
            //       that.$notification.warning({
            //         message: '消息',
            //         description: '结束时间不能小于当前时间'
            //       })
            //       // console.log(this.model)
            //       // this.endTime = ''
            //       that.confirmLoading = false
            //
            //     } else {
            //       let obj
            //       if (!this.model.id) {
            //         obj = postAction(this.url.add, formData)
            //       } else {
            //
            //         obj = requestPut(this.url.edit, formData, {
            //           id: this.model.id
            //         })
            //         let shijian = startOne
            //       }
            //       obj.then((res) => {
            //         if (res.success) {
            //           // that.$message.success("修改成功")
            //           // that.$message.success(res.message)
            //           that.$notification.success({
            //             message: '消息',
            //             description: res.message
            //           })
            //           that.$emit('ok', res.result)
            //         } else {
            //           // that.$message.warning(res.message)
            //           that.$notification.warning({
            //             message: '消息',
            //             description: res.message
            //           })
            //         }
            //       }).finally(() => {
            //         that.confirmLoading = false
            //         that.close()
            //       })
            //     }
            //   }
            // } else {
            //   if (startOne >= endOne) {
            //     // that.$message.warning("结束时间不能小于开始时间");
            //     that.$notification.warning({
            //       message: '消息',
            //       description: '结束时间不能小于开始时间'
            //     })
            //     // console.log(this.model)
            //     // this.endTime = ''
            //     that.confirmLoading = false
            //
            //   } else {
            //     let obj
            //     if (!this.model.id) {
            //       obj = postAction(this.url.add, formData)
            //     } else {
            //
            //       obj = requestPut(this.url.edit, formData, {
            //         id: this.model.id
            //       })
            //       let shijian = startOne
            //     }
            //     obj.then((res) => {
            //       if (res.success) {
            //         // that.$message.success("修改成功")
            //         // that.$message.success(res.message)
            //         that.$notification.success({
            //           message: '消息',
            //           description: res.message
            //         })
            //         that.$emit('ok', res.result)
            //       } else {
            //         // that.$message.warning(res.message)
            //         that.$notification.warning({
            //           message: '消息',
            //           description: res.message
            //         })
            //       }
            //     }).finally(() => {
            //       that.confirmLoading = false
            //       that.close()
            //     })
            //   }
            // }
            if (startOne >= endOne) {
              // that.$message.warning("结束时间不能小于开始时间");
              that.$notification.warning({
                message: '消息',
                description: '结束时间不能小于开始时间'
              })
              // console.log(this.model)
              // this.endTime = ''
              that.confirmLoading = false
            } else {
              let obj
              if (!this.model.id) {
                obj = postAction(this.url.add, formData)
              } else {
                obj = requestPut(this.url.edit, formData, {
                  id: this.model.id
                })
              }
              obj.then((res) => {
                if (res.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.$notification.warning({
                    message: '消息',
                    description: res.message
                  })
                }
              }).finally(() => {
                that.confirmLoading = false
                that.close()
              })
            }


          }
        })
      },
@@ -385,6 +442,22 @@
      },
      checkboxChange(e) {
        this.checked = e.target.checked
      },
      range(start, end) {
        const result = []
        for (let i = start; i < end; i++) {
          result.push(i)
        }
        return result
      },
      /**
       * 禁用日期选择器中的时间选择
       * @returns {{disabledSeconds: (function(): number[])}} 返回值为一个对象，可以禁止小时、分钟、秒，目前仅禁止所有秒数,最低从1开始，从0开始确定按钮将被禁用
       */
      disabledDateTime() {
        return {
          disabledSeconds: () => this.range(1, 60)
        }
      }
    }
  }