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

zenglf

2023-09-28 997835429a1d66643364091e8437ebbbeb8ff97a

 src/views/mdc/base/modules/OvertimeManagement/OvertimeManagementList.vue

@@ -6,7 +6,7 @@
        <a-row :gutter="24">
          <a-col :md="7" :sm="7">
            <a-form-item label="时间">
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss" showTime/>
              <a-range-picker @change="dateParamChange" v-model="dates"  format="YYYY-MM-DD HH:mm:ss"/>
            </a-form-item>
          </a-col>
          <a-col :md="4" :sm="4">
@@ -35,11 +35,11 @@
    <div class="table-operator" style="display: inline;">
      <a-button @click="handleAdd" type="primary" icon="plus">新增
      </a-button>
      <a-button type="primary" icon="download" @click="importTemplate('加班管理模板')">导入模板</a-button>
      <!--<a-button type="primary" icon="download" @click="importTemplate('加班管理模板')">导入模板</a-button>-->
      <a-button type="primary" icon="download" @click="handleExportXls('加班管理')">导出</a-button>
      <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-upload name="file" :showUploadList="false" :multiple="false" :headers="tokenHeader" :action="importExcelUrl" @change="handleImportExcel">-->
      <!--&lt;!&ndash;<a-button type="primary" icon="import">导入</a-button>&ndash;&gt;-->
      <!--</a-upload>-->
      <a-dropdown v-if="selectedRowKeys.length > 0">
        <a-menu slot="overlay">
          <a-menu-item key="1" @click="batchDel">
@@ -569,7 +569,7 @@
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });
@@ -611,7 +611,7 @@
                  //重新计算分页问题
                  that.reCalculatePage(that.selectedRowKeys.length)
                  // that.$message.success(res.message);
                  that.$notification.warning({
                  that.$notification.success({
                    message:'消息',
                    description:res.message
                  });