From 5542f6cb12e956fa28768542652e24ebb152f9e8 Mon Sep 17 00:00:00 2001
From: zhaoxiao <zhaoxiao@syxysoft.com>
Date: Tue, 14 Sep 2021 13:47:12 +0800
Subject: [PATCH] =?UTF-8?q?[update]=20=E6=89=93=E5=8C=85=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E7=BB=B4=E6=8A=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/packManagement/PackCompanyList.vue     |  4 ++--
 .../packManagement/PackProjectMaintenance.vue    | 16 ++++++++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/src/views/packManagement/PackCompanyList.vue b/src/views/packManagement/PackCompanyList.vue
index 45a9d6a..4ce5cec 100644
--- a/src/views/packManagement/PackCompanyList.vue
+++ b/src/views/packManagement/PackCompanyList.vue
@@ -31,7 +31,7 @@
       <!--    操作按钮区域-->
       <div class="table-operator">
         <a-button type="primary" icon="plus" @click="handleAdd">新增</a-button>
-        <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('打包企业列表')">导出</a-button>
         <a-button type="danger" icon="delete" @click="batchDel">批量删除</a-button>
       </div>
       <!--    操作按钮区域-end-->
@@ -150,7 +150,7 @@ export default {
         list: '/pack/payPackCompany/list',
         delete: '/pack/payPackCompany/delete',
         deleteBatch: '/pack/payPackCompany/deleteBatch',
-        exportXlsUrl: ''
+        exportXlsUrl: '/pack/payPackCompany/exportXls'
       }
     }
   },
diff --git a/src/views/packManagement/PackProjectMaintenance.vue b/src/views/packManagement/PackProjectMaintenance.vue
index 561e9db..7fb0346 100644
--- a/src/views/packManagement/PackProjectMaintenance.vue
+++ b/src/views/packManagement/PackProjectMaintenance.vue
@@ -68,7 +68,7 @@
         <a-button type="danger" icon="close-circle" @click="batchCancelPack">批量取消打包</a-button>
         <a-button type="primary" icon="pay-circle" @click="batchIncomePayment">批量来款</a-button>
         <a-button type="primary" icon="file-text" @click="batchInvoicing">批量开票</a-button>
-        <a-button type="primary" icon="export" @click="handleExportXls('企业管理')">导出</a-button>
+        <a-button type="primary" icon="export" @click="handleExportXls('打包项目列表')">导出</a-button>
       </div>
       <!--    操作按钮区域-end-->
 
@@ -183,7 +183,7 @@ export default {
           dataIndex: 'receiptExpense'
         }, {
           title: '已开票金额',
-          dataIndex: ''
+          dataIndex: 'invoiceAmount'
         }, {
           title: '已来款未开票金额',
           dataIndex: 'uninvoicedAmount'
@@ -350,7 +350,14 @@ export default {
           batchRemovePackProject(param).then(res => {
             if (res.success) {
               that.$message.success(res.message)
+              // 判断当前删除的数据是否是最后一页的全部数据，如果是的话页码减一
+              if (that.ipagination.current > 1 && (that.ipagination.current === Math.ceil(that.ipagination.total / that.ipagination.pageSize)) &&
+                that.selectedRowKeys.length === that.dataSource.length
+              ) {
+                that.ipagination.current -= 1
+              }
               that.loadData()
+              that.onClearSelected()
             } else {
               that.$message.warn(res.message)
             }
@@ -395,7 +402,12 @@ export default {
           removePackProject(param).then(res => {
             if (res.success) {
               that.$message.success(res.message)
+              // 判断当前删除的数据是否是最后一页的最后一条数据，如果是的话页码减一
+              if (that.ipagination.current > 1 && ((that.ipagination.current - 1) * that.ipagination.pageSize) + 1 === that.ipagination.total) {
+                that.ipagination.current -= 1
+              }
               that.loadData()
+              that.onClearSelected()
             } else {
               that.$message.warn(res.message)
             }