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 @@
@@ -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 @@
批量取消打包
批量来款
批量开票
- 导出
+ 导出
@@ -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)
}