From a264f8abffbed65d0361a8d1a60b2bf445b85cf1 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Thu, 23 Jan 2025 10:03:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E9=92=B1=E5=8C=85=E5=AF=BC=E5=87=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/wallet-cz/index.vue     |  6 +++++-
 src/views/wallet/wallet-manage/index.vue | 13 +++++++++++--
 src/views/wallet/wallet-tk/index.vue     |  6 +++++-
 src/views/wallet/wallet-xf/index.vue     |  6 +++++-
 4 files changed, 26 insertions(+), 5 deletions(-)

diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index 94b29cc..6f89a8b 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -136,7 +136,11 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/wallet-transaction/export-cz", Object.assign(state.queryForm), "walletRecharge.xlsx")
+	downBlobFile(
+		"/wallet/wallet-transaction/export-cz",
+		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
+		"walletRecharge.xlsx",
+	)
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 18b2ab1..a7c8901 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -13,6 +13,11 @@
 							<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
 						</el-form-item>
 					</el-col>
+					<el-col :span="4">
+						<el-form-item class="w100" label="饭卡类型" prop="walletTypeId">
+							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+						</el-form-item>
+					</el-col>
 					<el-form-item>
 						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
 						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
@@ -51,7 +56,7 @@
 				@sort-change="sortChangeHandle"
 			>
 				<el-table-column type="selection" width="40" align="center" />
-				<el-table-column type="index" label="#" width="40" />
+				<el-table-column type="index" label="#" width="80" />
 				<el-table-column prop="username" width="100" label="用户" />
 				<el-table-column prop="userAvatar" width="80" label="头像">
 					<template #default="{ row }">
@@ -163,7 +168,11 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/walletManage/export", Object.assign(state.queryForm, { ids: selectObjs }), "walletManage.xlsx")
+	downBlobFile(
+		"/wallet/wallet-manage/export",
+		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
+		"walletManage.xlsx",
+	)
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index c9e4b31..89e7a41 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -153,7 +153,11 @@ const doRefund = async (row: any) => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/wallet-transaction/export-tk", Object.assign(state.queryForm), "walletRecharge.xlsx")
+	downBlobFile(
+		"/wallet/wallet-transaction/export-tk",
+		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
+		"walletRecharge.xlsx",
+	)
 }
 
 // 多选事件
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index c157f54..56a237f 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -144,7 +144,11 @@ const resetQuery = () => {
 
 // 导出excel
 const exportExcel = () => {
-	downBlobFile("/wallet/wallet-transaction/export-xf", Object.assign(state.queryForm), "walletRecharge.xlsx")
+	downBlobFile(
+		"/wallet/wallet-transaction/export-xf",
+		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
+		"walletRecharge.xlsx",
+	)
 }
 
 const doRefund = (row: any) => {