1、优化数据报表模块页面布局 2、修复因时间选择器的showTime属性导致的布局混乱 3、删除假期管理页面中重复的导出按钮组件

zhuzhuanzhuan

2023-09-21 a1ff69f228b7a0d08959e6b25eff2dac6085df8d

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

@@ -25,6 +25,22 @@
            </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">
@@ -39,15 +55,15 @@
            </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>
@@ -68,10 +84,11 @@
  import {
    duplicateCheck
  } from '@/api/api'
  import AFormItem from 'ant-design-vue/es/form/FormItem'

  export default {
    name: 'DeviceRepairModel',
    components: {DeviceRepairListModel,JDate},
    components: { AFormItem, DeviceRepairListModel,JDate},
    props: {},
    data() {
      return {
@@ -119,11 +136,11 @@
        confirmLoading: false,
        form: this.$form.createForm(this),
        validatorRules: {
          equipmentId:{
          equipmentIds:{
            rules:[
              {
                required:true,
                message: ""
                message: "请选择设备"
              },
            ],
          },
@@ -143,7 +160,23 @@
              },
            ],
            initialValue: 1
          }
          },
          startTime:{
            rules:[
              {
                required:true,
                message: "请选择开始时间"
              },
            ],
          },
          endTime:{
            rules:[
              {
                required:true,
                message: "请选择结束时间"
              },
            ],
          },
        },

        url: {
@@ -153,8 +186,9 @@

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

    },
    created() {
    },
@@ -260,11 +294,19 @@
            let stertDate = moment(data).format("YYYY-MM-DD HH:mm:ss");
            let dataStart = stertDate.replace(/:/g,'');
            if(startOne < dataStart){
              that.$message.warning("开始时间不能小于当前时间")
              // that.$message.warning("开始时间不能小于当前时间")
              that.$notification.warning({
                message:'消息',
                description:"开始时间不能小于当前时间"
              });
              that.confirmLoading = false
            }else{
              if(startOne>=endOne){
                that.$message.warning("结束时间不能小于开始时间");
                // that.$message.warning("结束时间不能小于开始时间");
                that.$notification.warning({
                  message:'消息',
                  description:"结束时间不能小于开始时间"
                });
                // console.log(this.model)
                // this.endTime = ''
                that.confirmLoading = false
@@ -279,11 +321,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
@@ -331,7 +381,7 @@
      },
      checkboxChange(e) {
        this.checked = e.target.checked
      }
      },
    }
  }
</script>