1、解决计划与非计划停机管理页面新增记录时选择设备组后无法消除表单验证提示文字问题 2、计划与非计划停机管理页面按照日期查询由单日改为日期范围

zhaowei

2024-12-10 f46ef369f32fcad5b62404dfe262bfec3c223033

1、解决计划与非计划停机管理页面新增记录时选择设备组后无法消除表单验证提示文字问题
2、计划与非计划停机管理页面按照日期查询由单日改为日期范围

 src/views/mdc/base/modules/MdcPlanCloseManagement/MdcPlanCloseForm.vue

@@ -76,7 +76,7 @@
        confirmLoading: false,
        validatorRules: {
          equipmentIds: [
            { required: true, message: '请选择设备!' }
            { required: true, message: '请选择设备!', trigger: 'blur' }
          ],
          planCloseType: [
            { required: true, message: '请选择事项!' }
@@ -157,7 +157,7 @@
       */
      selectOK(data) {
        this.$set(this.model, 'equipmentIds', data.join(','))
        console.log('model', this.model)
        if (this.model.equipmentIds) this.$refs.form.clearValidate('equipmentIds')
      }
    }
  }

 src/views/mdc/base/modules/MdcPlanCloseManagement/MdcPlanCloseList.vue

@@ -17,8 +17,8 @@
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="日期">
              <a-date-picker v-model="queryParam.theDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                             style="width: 100%"></a-date-picker>
              <a-range-picker v-model="dates" format="YYYY-MM-DD" style="width: 100%"
                              @change="dateParamChange"></a-range-picker>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -70,7 +70,6 @@
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
@@ -100,15 +99,13 @@
</template>

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import moment from 'moment'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import MdcPlanCloseModal from './MdcPlanCloseModal'

  export default {
    name: 'MdcPlanCloseList',
    mixins: [JeecgListMixin, mixinDevice],
    mixins: [JeecgListMixin],
    components: {
      MdcPlanCloseModal
    },
@@ -116,6 +113,7 @@
    data() {
      return {
        description: 'mdcPlanClose管理页面',
        disableMixinCreated: true,
        /* 分页参数 */
        ipagination: {
          current: 1,
@@ -128,6 +126,7 @@
          showSizeChanger: true,
          total: 0
        },
        dates: [moment().subtract(1, 'day'), moment()],
        queryParam: {
          closeType: 1
        },
@@ -231,6 +230,11 @@
      }
    },
    methods: {
      dateParamChange(v1, v2) {
        this.queryParam.startTime = v2[0]
        this.queryParam.endTime = v2[1]
        this.dates = [v1[0], v1[1]]
      },
      importTemplate(fileName) {
        var a = document.createElement('a')
        a.href = '/static/计划停机管理.xls'
@@ -240,11 +244,12 @@
        a.click()
        a.remove()
      },
      initDictConfig() {
      },
      searchReset() {
        this.dates = [moment().subtract(1, 'day'), moment()]
        this.queryParam = {
          closeType: 1
          closeType: 1,
          startTime: this.dates[0].format('YYYY-MM-DD'),
          endTime: this.dates[1].format('YYYY-MM-DD')
        }
        this.loadData(1)
      },
@@ -257,6 +262,11 @@
        this.scrollY = boxHeight - tableHeadHeight - 50
      }
    },
    created() {
      this.queryParam.startTime = this.dates[0].format('YYYY-MM-DD')
      this.queryParam.endTime = this.dates[1].format('YYYY-MM-DD')
      this.loadData()
    },
    mounted() {
      window.addEventListener('resize', this.handleWindowResize)
      this.handleWindowResize()

 src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseForm.vue

@@ -159,7 +159,7 @@
       */
      selectOK(data) {
        this.$set(this.model, 'equipmentIds', data.join(','))
        console.log('model', this.model)
        if (this.model.equipmentIds) this.$refs.form.clearValidate('equipmentIds')
      }
    }
  }

 src/views/mdc/base/modules/MdcUnplannedCloseManagement/MdcUnplannedCloseList.vue

@@ -17,8 +17,8 @@
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
            <a-form-item label="日期">
              <a-date-picker v-model="queryParam.theDate" format="YYYY-MM-DD" value-format="YYYY-MM-DD"
                             style="width: 100%"></a-date-picker>
              <a-range-picker v-model="dates" format="YYYY-MM-DD" style="width: 100%"
                              @change="dateParamChange"></a-range-picker>
            </a-form-item>
          </a-col>
          <a-col :xl="6" :lg="7" :md="8" :sm="24">
@@ -70,7 +70,6 @@
        :pagination="ipagination"
        :loading="loading"
        :rowSelection="{selectedRowKeys: selectedRowKeys, onChange: onSelectChange}"
        class="j-table-force-nowrap"
        @change="handleTableChange">

        <span slot="action" slot-scope="text, record">
@@ -100,22 +99,21 @@
</template>

<script>

  import '@/assets/less/TableExpand.less'
  import { mixinDevice } from '@/utils/mixin'
  import moment from 'moment'
  import { JeecgListMixin } from '@/mixins/JeecgListMixin'
  import MdcUnplannedCloseModal from './MdcUnplannedCloseModal'

  export default {
    name: 'MdcUnplannedCloseList',
    mixins: [JeecgListMixin, mixinDevice],
    mixins: [JeecgListMixin],
    components: {
      MdcUnplannedCloseModal
    },
    props: { nodeTree: '', Type: '', nodePeople: '' },
    data() {
      return {
        description: 'mdcPlanClose管理页面',
        description: 'mdcUnplannedClose管理页面',
        disableMixinCreated: true,
        /* 分页参数 */
        ipagination: {
          current: 1,
@@ -128,6 +126,7 @@
          showSizeChanger: true,
          total: 0
        },
        dates: [moment().subtract(1, 'day'), moment()],
        queryParam: {
          closeType: 2
        },
@@ -231,6 +230,11 @@
      }
    },
    methods: {
      dateParamChange(v1, v2) {
        this.queryParam.startTime = v2[0]
        this.queryParam.endTime = v2[1]
        this.dates = [v1[0], v1[1]]
      },
      importTemplate(fileName) {
        var a = document.createElement('a')
        a.href = '/static/计划停机管理.xls'
@@ -240,11 +244,12 @@
        a.click()
        a.remove()
      },
      initDictConfig() {
      },
      searchReset() {
        this.dates = [moment().subtract(1, 'day'), moment()]
        this.queryParam = {
          closeType: 2
          closeType: 2,
          startTime: this.dates[0].format('YYYY-MM-DD'),
          endTime: this.dates[1].format('YYYY-MM-DD')
        }
        this.loadData(1)
      },
@@ -257,6 +262,11 @@
        this.scrollY = boxHeight - tableHeadHeight - 50
      }
    },
    created() {
      this.queryParam.startTime = this.dates[0].format('YYYY-MM-DD')
      this.queryParam.endTime = this.dates[1].format('YYYY-MM-DD')
      this.loadData()
    },
    mounted() {
      window.addEventListener('resize', this.handleWindowResize)
      this.handleWindowResize()