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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

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

@@ -6,16 +6,16 @@
        <a-row :gutter="24">
          <a-col :span="24">
            <!--<a-form-item label="设备编号" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
              <!--<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"-->
                              <!--@search="deviceSearch" enter-button/>-->
              <!--&lt;!&ndash;<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入设备编号"&ndash;&gt;-->
                       <!--&lt;!&ndash;v-decorator="['equipmentId',validatorRules.equipmentId]"/>&ndash;&gt;-->
            <!--<a-input-search :readOnly="true" v-decorator="['equipmentId', validatorRules.equipmentId]"-->
            <!--@search="deviceSearch" enter-button/>-->
            <!--&lt;!&ndash;<a-input :disabled="disableSubmit" :readOnly="disableSubmit" allow-clear placeholder="请输入设备编号"&ndash;&gt;-->
            <!--&lt;!&ndash;v-decorator="['equipmentId',validatorRules.equipmentId]"/>&ndash;&gt;-->
            <!--</a-form-item>-->
          <!--</a-col>-->
          <!--<a-col :span="12">-->
            <!--</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-input :disabled="disableSubmit" :readOnly="readOnly" allow-clear placeholder="请输入设备名称"-->
            <!--v-decorator="['equipmentName',validatorRules.equipmentName]"/>-->
            <!--</a-form-item>-->
            <a-form-item label="设备组" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-input-search :readOnly="true" v-decorator="['equipmentIds', validatorRules.equipmentIds]"
@@ -25,32 +25,58 @@
            </a-form-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="24">
            <a-form-item label="维修类型" :labelCol="labelColLong" :wrapperCol="wrapperColLong">
              <a-radio-group v-decorator="['mdcRepairType', validatorRules.mdcRepairType]">
                <a-radio :value="1">
                  维修
                </a-radio>
                <a-radio :value="2">
                  休班
                </a-radio>
              </a-radio-group>
            </a-form-item>
          </a-col>
        </a-row>

        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item label="开始时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss')}" 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="{defaultValue:moment('08:00:00','HH:mm:ss'),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>
          <a-col :span="12">
            <a-form-item label="结束时间" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <j-date :show-time="{defaultValue:moment('08:00:00','HH:mm:ss')}" 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="{defaultValue:moment('08:00:00','HH:mm:ss'),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-row>
        <a-row :gutter="24">
          <a-col :span="12">
            <a-form-item v-show="this.mesag == 1" label="维修类型" :labelCol="labelCol" :wrapperCol="wrapperCol">
              <a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="请选择设备类型"
                                 :triggerChange="true"
                                 v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>
            </a-form-item>
          </a-col>
        </a-row>
        <!--<a-row :gutter="24">-->
        <!--<a-col :span="12">-->
        <!--<a-form-item v-show="this.mesag == 1" label="维修类型" :labelCol="labelCol" :wrapperCol="wrapperCol">-->
        <!--<a-input :disabled="disableSubmit" :readOnly="readOnly" placeholder="请选择设备类型"-->
        <!--:triggerChange="true"-->
        <!--v-decorator="['mdcRepairType', validatorRules.mdcRepairType]"/>-->
        <!--</a-form-item>-->
        <!--</a-col>-->
        <!--</a-row>-->
      </a-form>
    </a-spin>
    <device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"></device-repair-list-model>
    <device-repair-list-model ref="deviceRepairListModel" @sendSelectionRows="getDeviceRows"
                              :selectedEquipmentIds="selectedEquipmentIds"
    ></device-repair-list-model>

  </a-modal>
</template>
@@ -68,22 +94,29 @@
  import {
    duplicateCheck
  } from '@/api/api'
  import AFormItem from 'ant-design-vue/es/form/FormItem'
  import Vue from 'vue'

  export default {
    name: 'DeviceRepairModel',
    components: {DeviceRepairListModel,JDate},
    props: {},
    components: { AFormItem, DeviceRepairListModel, JDate },
    props: {
      equipmentId: {
        type: String
      }
    },

    data() {
      return {
        mesag:21,
        readOnly:true,
        mesag: 21,
        readOnly: true,
        title: '',
        visible: false,
        show: false,
        model: {},
        checked: false,
        startData:"",
        endData:"",
        startData: '',
        endData: '',
        labelCol: {
          xs: {
            span: 24
@@ -119,30 +152,47 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentId:{
            rules:[
          equipmentIds: {
            rules: [
              {
                required:true,
                message: ""
              },
                required: true,
                message: '请选择设备'
              }
            ],
            initialValue: ''
          },
          equipmentName:{
            rules:[
          equipmentName: {
            rules: [
              {
                required:true,
                message: ""
              },
            ],
                required: true,
                message: ''
              }
            ]
          },
          mdcRepairType:{
            rules:[
          mdcRepairType: {
            rules: [
              {
                required:true,
                message: ""
              },
                required: true,
                message: ''
              }
            ],
            initialValue: 1
          },
          startTime: {
            rules: [
              {
                required: true,
                message: '请选择开始时间'
              }
            ]
          },
          endTime: {
            rules: [
              {
                required: true,
                message: '请选择结束时间'
              }
            ]
          }
        },

@@ -153,17 +203,32 @@

        disableSubmit: true,
        partCategoryCascade: [],
        cascadeDefaultValue: []
        cascadeDefaultValue: [],
        selectedEquipmentIds: ''
      }

    },
    created() {
    },

    watch: {
      // 监控设备编号，当改变树中选项时将值赋值给新增弹窗的设备组选项
      equipmentId: function(val) {
        this.validatorRules.equipmentIds.initialValue = val
      },
      // 监控弹窗显示，如果关闭则清空已选择的多选，如果开启则将树中已选择项赋值给已选择多选
      visible: function(val) {
        if (!val) {
          this.selectedEquipmentIds = ''
        } else {
          this.selectedEquipmentIds = this.validatorRules.equipmentIds.initialValue
        }
      }
    },
    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) {
@@ -175,31 +240,42 @@
      //   // 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) {
        var equipmentIds;
        for(var i = 0;i<val.length;i++){
        // var equipmentIds
        // for (var i = 0; i < val.length; i++) {
        //   if (i == 0) {
        //     equipmentIds = val[i].equipmentId
        //   } else {
        //     equipmentIds = equipmentIds + ',' + val[i].equipmentId
        //   }
        // }
        // // console.log("========",equipmentIds);
        // this.form.setFieldsValue({
        //   equipmentIds: equipmentIds
        // })
        for (var i = 0; i < val.length; i++) {
          if (i == 0) {
            equipmentIds =  val[i].equipmentId;
            this.selectedEquipmentIds = val[i].equipmentId
          } else {
            equipmentIds = equipmentIds + "," + val[i].equipmentId;
            this.selectedEquipmentIds = this.selectedEquipmentIds + ',' + val[i].equipmentId
          }
        }
        // console.log("========",equipmentIds);
        this.form.setFieldsValue({
          equipmentIds: equipmentIds,
          equipmentIds: this.selectedEquipmentIds
        })
      //   this.form.setFieldsValue({
      // equipmentId: val.equipmentId,
      // equipmentName: val.equipmentName,
      // equipmentModel: val.equipmentModel,
      // equipmentIp: val.equipmentIp,
      // dataPort: val.dataPort,
      // driveType: val.driveType
    // })
  },
        //   this.form.setFieldsValue({
        // equipmentId: val.equipmentId,
        // equipmentName: val.equipmentName,
        // equipmentModel: val.equipmentModel,
        // equipmentIp: val.equipmentIp,
        // dataPort: val.dataPort,
        // driveType: val.driveType
        // })
      },
      deviceSearch() {
        this.$refs.deviceRepairListModel.openPage()
        this.$refs.deviceRepairListModel.title = '选择设备'
@@ -236,8 +312,8 @@
        this.model = Object.assign({}, record)
        this.visible = true
        this.$nextTick(() => {
          this.form.setFieldsValue(pick(this.model, 'equipmentIds', 'equipmentName', 'mdcRepairType', 'startTime', 'endTime',
           ))
          this.form.setFieldsValue(pick(this.model, 'equipmentIds', 'equipmentName', 'mdcRepairType', 'startTime', 'endTime'
          ))
        })
      },
      close() {
@@ -252,62 +328,100 @@
          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(startOne < dataStart){
              // that.$message.warning("开始时间不能小于当前时间")
            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 (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
            //       })
            //     }
            //     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()
            //     })
            //   }
            // }
            if (startOne >= endOne) {
              // that.$message.warning("结束时间不能小于开始时间");
              that.$notification.warning({
                message:'消息',
                description:"开始时间不能小于当前时间"
              });
                message: '消息',
                description: '结束时间不能小于开始时间'
              })
              // console.log(this.model)
              // this.endTime = ''
              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
                  })
                }
                obj.then((res) => {
                  if (res.success) {
                    // that.$message.success("添加成功")
                    that.$notification.warning({
                      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()
            } 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()
              })
            }

          }
        })
      },
@@ -347,6 +461,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)
        }
      }
    }
  }
@@ -371,4 +501,6 @@
  .ant-tabs-content .ant-form-item {
    margin-bottom: 0px;
  }


</style>