Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into dev...

zenglf

2023-10-24 575a75a0519e53ceec6bb5d31f682124596c3bae

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

@@ -1,12 +1,12 @@
<template>
  <a-card :bordered="false" class="device_list">
  <div :bordered="false" class="device_list">
    <!-- 查询区域 -->
    <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-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">
@@ -83,8 +83,7 @@
    <!--<device-repair-model-add  ref="modalFormadd" @ok="modalFormOk"></device-repair-model-add>-->
    <!--<device-repair-model-edit ref="modalFormedit" @ok="modalFormOk"></device-repair-model-edit>-->
    <!--<repair-model ref="repairModelFrom" @ok="modalFormOk"></repair-model>-->

  </a-card>
  </div>
</template>

<script>
@@ -155,7 +154,7 @@
          {
            title: '日期',
            align: 'center',
            dataIndex: 'torqueDate',
            dataIndex: 'effectiveDate',
            // scopedSlots:{customRender:'startTime'},
            // customRender:(text,row,index) => {
            //   return moment(text).format("YYYY-MM-DD HH:mm:ss")
@@ -164,27 +163,27 @@
          {
            title: '班次开始时间',
            align: 'center',
            dataIndex: 'torqueValue'
            dataIndex: 'startDate'
          },
          {
            title: '班次结束时间',
            align: 'center',
            dataIndex: 'torqueValue'
            dataIndex: 'endDate'
          },
          {
            title: '加班开始时间',
            align: 'center',
            dataIndex: 'torqueValue'
            dataIndex: 'startTime'
          },
          {
            title: '加班结束时间',
            align: 'center',
            dataIndex: 'torqueValue'
            dataIndex: 'endTime'
          },
          {
            title: '备注',
            align: 'center',
            dataIndex: 'notes'
            dataIndex: 'remark'
          },
          {
            title: '操作',
@@ -195,12 +194,12 @@
          }
        ],
        url: {
          list: '/mdc/MdcTorqueConfig/pageList',
          delete: '/mdc/MdcTorqueConfig/deleteMdcTorqueConfig',
          deleteBatch: '/mdc/MdcTorqueConfig/deleteBatchMdcTorqueConfig',
          list: '/mdc/mdcEquipmentOvertime/list',
          delete: '/mdc/mdcEquipmentOvertime/delete',
          deleteBatch: '/mdc/mdcEquipmentOvertime/deleteBatch',
          getEquipmentByPid: '/mdc/mdcequipment/getEquipmentByPid',
          exportXlsUrl: "/mdc/MdcTorqueConfig/exportXls",
          importExcelUrl: "/mdc/MdcTorqueConfig/importExcel",
          exportXlsUrl: "/mdc/mdcEquipmentOvertime/exportXls",
          importExcelUrl: "/mdc/mdcEquipmentOvertime/importExcel",
        }
      }
    },
@@ -569,7 +568,7 @@
            //重新计算分页问题
            that.reCalculatePage(1)
            // that.$message.success(res.message);
            that.$notification.warning({
            that.$notification.success({
              message:'消息',
              description:res.message
            });
@@ -611,7 +610,7 @@
                  //重新计算分页问题
                  that.reCalculatePage(that.selectedRowKeys.length)
                  // that.$message.success(res.message);
                  that.$notification.warning({
                  that.$notification.success({
                    message:'消息',
                    description:res.message
                  });