src/views/mdc/base/modules/HolidayManagement/HolidayManagementList.vue
@@ -3,7 +3,7 @@
    <!-- 查询区域 -->
    <div style="width: 100%; background-color: #fff" class="table-page-search-wrapper">
      <a-form layout="inline" @keyup.enter.native="searchQuery">
        <a-row :gutter="24">
        <a-row :gutter="24" style="width: 100%;">
          <a-col :md="7" :sm="7">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD"/>
@@ -43,6 +43,7 @@
      <a-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">
      <a-button type="primary" icon="import">导入</a-button>
      </a-upload>
      <a-button type="primary" icon="printer" v-print="'#DeviceList'" v-has="'holidayManagement:print'">打印</a-button>
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
@@ -185,6 +186,18 @@
            fixed:'right'
          }
        ],
        /* 分页参数 */
        ipagination:{
          current: 1,
          pageSize: 30,
          pageSizeOptions: ['30', '50', '100'],
          showTotal: (total, range) => {
            return range[0] + "-" + range[1] + " 共" + total + "条"
          },
          showQuickJumper: true,
          showSizeChanger: true,
          total: 0
        },
        url: {
          list: '/mdc/mdcVacationManagement/pageList',
          delete: '/mdc/mdcVacationManagement/deleteVacation',
@@ -235,7 +248,7 @@
    },
    methods: {
      dateParamChange(v1, v2) {
        // console.log(v1,v2)
        console.log(v1,v2)
        this.queryParam.startTime = v2[0]
        this.queryParam.endTime = v2[1]
        // console.log(v2[0],v2[1])
@@ -350,8 +363,6 @@
        param.field = this.getQueryField();
        param.parentId = this.queryParams.parentId;
        param.equipmentId = this.queryParams.equipmentId;
        param.startTime = this.queryParam.startTime;
        param.endTime =  this.queryParam.endTime;
        getAction(this.url.list,param).then((res) => {
          if(res.success){
            this.dataSource = res.result.records||res.result;
@@ -437,8 +448,10 @@
        param.field = this.getQueryField();
        param.parentId = this.queryParams.parentId;
        param.equipmentId = this.queryParams.equipmentId;
        param.startTime = this.queryParam.startTime;
        param.endTime =  this.queryParam.endTime;
        if(this.queryParam.startTime && this.queryParam.endTime){
          param.startTime = this.queryParam.startTime;
          param.endTime =  this.queryParam.endTime;
        }
        // console.log(param);
        getAction(this.url.list,param).then((res) => {
          if(res.success){