From 87cc87c850d1633d027b2581f394b037e430e01d Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 13 Jul 2026 16:09:29 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=A2=9E=E5=8A=A0=E9=92=B1=E5=8C=85?=
 =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E6=90=9C=E7=B4=A2=E6=9D=A1=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Select/SelectWalletType.vue | 22 +++++++---------------
 src/views/hard/hard-dept-total/index.vue   |  5 +++--
 src/views/hard/hard-order/index.vue        |  5 +++--
 src/views/hard/hard-sh/index.vue           |  5 +++--
 src/views/wallet/wallet-cz-total/index.vue |  4 ++++
 src/views/wallet/wallet-cz/index.vue       | 11 ++++++++---
 src/views/wallet/wallet-jz/index.vue       | 11 ++++++++---
 src/views/wallet/wallet-qb/index.vue       | 11 ++++++++---
 src/views/wallet/wallet-th/index.vue       | 11 ++++++++---
 src/views/wallet/wallet-tk/index.vue       | 11 ++++++++---
 src/views/wallet/wallet-xf/index.vue       | 11 ++++++++---
 11 files changed, 68 insertions(+), 39 deletions(-)

diff --git a/src/components/Select/SelectWalletType.vue b/src/components/Select/SelectWalletType.vue
index 8b7d545..60723dc 100644
--- a/src/components/Select/SelectWalletType.vue
+++ b/src/components/Select/SelectWalletType.vue
@@ -1,24 +1,14 @@
 <template>
-	<el-select
-		style="width: 100%"
-		v-model="state.selectId"
-		:placeholder="props.placeholder"
-		:clearable="props.clearable"
-		remote-show-suffix
-		filterable
-		remote
-		:disabled="props.disabled"
-		:remote-method="remoteSearch"
-		:loading="state.loading"
-		@visible-change="(e: boolean) => e && getOptions()"
-		@change="change"
-	>
+	<el-select style="width: 100%" v-model="state.selectId" :placeholder="props.placeholder"
+		:clearable="props.clearable" remote-show-suffix filterable remote :disabled="props.disabled"
+		:remote-method="remoteSearch" :multiple="props.multiple" collapse-tags :loading="state.loading"
+		@visible-change="(e: boolean) => e && getOptions()" @change="change">
 		<el-option v-for="v in state.options" :key="v.id" :label="`${v.name}`" :value="v.id">
 			<div class="flex items-center">
 				<div class="color-primary">{{ v.name }}</div>
 				<div class="flex items-center justify-center ml5">
 					<el-tag size="small">
-						{{ state.walletType.find((i: any) => i.value == v.uniqueCode)?.label }}
+						{{state.walletType.find((i: any) => i.value == v.uniqueCode)?.label}}
 					</el-tag>
 				</div>
 			</div>
@@ -42,6 +32,7 @@ const props = withDefaults(
 		clearable?: boolean
 		autoFirst?: boolean
 		apiParams?: any
+		multiple?: boolean
 	}>(),
 	{
 		placeholder: "请选择",
@@ -49,6 +40,7 @@ const props = withDefaults(
 		clearable: true,
 		autoFirst: false,
 		apiParams: {},
+		multiple: false,
 	},
 )
 
diff --git a/src/views/hard/hard-dept-total/index.vue b/src/views/hard/hard-dept-total/index.vue
index e80f235..f35f7b6 100644
--- a/src/views/hard/hard-dept-total/index.vue
+++ b/src/views/hard/hard-dept-total/index.vue
@@ -12,8 +12,9 @@
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 						<el-row>
-							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="请选择钱包类型" />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="请选择钱包类型" />
 							</el-form-item>
 							<el-form-item style="width: 400px" label="时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList"
diff --git a/src/views/hard/hard-order/index.vue b/src/views/hard/hard-order/index.vue
index d9e8a13..fe3f6d9 100644
--- a/src/views/hard/hard-order/index.vue
+++ b/src/views/hard/hard-order/index.vue
@@ -37,8 +37,9 @@
 							<el-form-item style="width: 250px" label="订单状态" prop="orderStatus">
 								<dict-select v-model="state.queryForm.orderStatus" dict-code="hard_order_status" />
 							</el-form-item>
-							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="请选择钱包类型" />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="请选择钱包类型" />
 							</el-form-item>
 							<el-form-item style="width: 430px" label="创建时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList"
diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index 8df0530..4e5c5e6 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -15,8 +15,9 @@
 							<el-form-item style="width: 200px" label="用餐时间段" prop="hourType">
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 							</el-form-item>
-							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="请选择钱包类型" />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 250px" label="商户类型" prop="merchantType">
 								<dict-select v-model="state.queryForm.merchantType" dict-code="merchant_type" />
diff --git a/src/views/wallet/wallet-cz-total/index.vue b/src/views/wallet/wallet-cz-total/index.vue
index 89522ac..aed0881 100644
--- a/src/views/wallet/wallet-cz-total/index.vue
+++ b/src/views/wallet/wallet-cz-total/index.vue
@@ -21,6 +21,10 @@
                         <el-form-item v-if="false" style="width: 200px" label="充值类型" prop="type">
                             <dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
                         </el-form-item>
+                        <el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+                            <select-wallet-type multiple v-model="state.queryForm.walletTypeIdList" placeholder="饭卡类型"
+                                clearable />
+                        </el-form-item>
                         <el-form-item style="width: 300px" label="充值时间" prop="createTimeList">
                             <el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
                                 type="daterange" />
diff --git a/src/views/wallet/wallet-cz/index.vue b/src/views/wallet/wallet-cz/index.vue
index a816528..8d2bf44 100644
--- a/src/views/wallet/wallet-cz/index.vue
+++ b/src/views/wallet/wallet-cz/index.vue
@@ -16,9 +16,9 @@
 							<el-form-item v-if="false" style="width: 200px" label="充值类型" prop="type">
 								<dict-select v-model="state.queryForm.type" dict-code="wallet_biz_recharge" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="充值时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -114,6 +114,11 @@
 							{{ displayPrice(row.xfTotalPrice) }}
 						</template>
 					</el-table-column>
+					<el-table-column align="center" prop="topupTotalPrice" label="充值钱包充值金额">
+						<template #default="{ row }">
+							{{ displayPrice(row.topupTotalPrice) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
 			</el-table>
 		</el-drawer>
diff --git a/src/views/wallet/wallet-jz/index.vue b/src/views/wallet/wallet-jz/index.vue
index 276cb8e..549ec1a 100644
--- a/src/views/wallet/wallet-jz/index.vue
+++ b/src/views/wallet/wallet-jz/index.vue
@@ -13,9 +13,9 @@
 							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
 								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -97,6 +97,11 @@
 							{{ displayPrice(row.xfTotalPrice) }}
 						</template>
 					</el-table-column>
+					<el-table-column align="center" prop="topupTotalPrice" label="充值钱包记账扣款金额">
+						<template #default="{ row }">
+							{{ displayPrice(row.topupTotalPrice) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
 			</el-table>
 		</el-drawer>
diff --git a/src/views/wallet/wallet-qb/index.vue b/src/views/wallet/wallet-qb/index.vue
index cbbfcd6..ee6f79c 100644
--- a/src/views/wallet/wallet-qb/index.vue
+++ b/src/views/wallet/wallet-qb/index.vue
@@ -10,9 +10,9 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 200px" label="月份" prop="walletRecordMonth">
 								<el-date-picker v-model="state.queryForm.walletRecordMonth" value-format="YYYY-MM"
@@ -107,6 +107,11 @@
 							{{ displayPrice(row.payTotal) }}
 						</template>
 					</el-table-column>
+					<el-table-column align="center" prop="payTotal" label="充值钱包">
+						<template #default="{ row }">
+							{{ displayPrice(row.topupTotal) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
 			</el-table>
 		</el-drawer>
diff --git a/src/views/wallet/wallet-th/index.vue b/src/views/wallet/wallet-th/index.vue
index 4a2546e..7a1469d 100644
--- a/src/views/wallet/wallet-th/index.vue
+++ b/src/views/wallet/wallet-th/index.vue
@@ -10,9 +10,9 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeId">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -101,6 +101,11 @@
 							{{ displayPrice(row.xfTotalPrice) }}
 						</template>
 					</el-table-column>
+					<el-table-column align="center" prop="xfTotalPrice" label="充值钱包记账扣款金额">
+						<template #default="{ row }">
+							{{ displayPrice(row.topupTotalPrice) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
 			</el-table>
 		</el-drawer>
diff --git a/src/views/wallet/wallet-tk/index.vue b/src/views/wallet/wallet-tk/index.vue
index ef25159..0c9679b 100644
--- a/src/views/wallet/wallet-tk/index.vue
+++ b/src/views/wallet/wallet-tk/index.vue
@@ -10,9 +10,9 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="退款时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -103,6 +103,11 @@
 							{{ displayPrice(row.xfTotalPrice) }}
 						</template>
 					</el-table-column>
+					<el-table-column align="center" prop="xfTotalPrice" label="充值钱包记账扣款金额">
+						<template #default="{ row }">
+							{{ displayPrice(row.topupTotalPrice) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
 			</el-table>
 		</el-drawer>
diff --git a/src/views/wallet/wallet-xf/index.vue b/src/views/wallet/wallet-xf/index.vue
index 62f8c7c..f10469d 100644
--- a/src/views/wallet/wallet-xf/index.vue
+++ b/src/views/wallet/wallet-xf/index.vue
@@ -13,9 +13,9 @@
 							<el-form-item style="width: 200px" label="充值方式" prop="bizType">
 								<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="钱包类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
-									clearable />
+							<el-form-item style="width: 250px" label="钱包类型" prop="walletTypeIdList">
+								<select-wallet-type multiple v-model="state.queryForm.walletTypeIdList"
+									placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 300px" label="消费时间" prop="createTimeList">
 								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
@@ -109,6 +109,11 @@
 							{{ displayPrice(row.xfTotalPrice) }}
 						</template>
 					</el-table-column>
+					<el-table-column align="center" prop="xfTotalPrice" label="充值钱包记账扣款金额">
+						<template #default="{ row }">
+							{{ displayPrice(row.topupTotalPrice) }}
+						</template>
+					</el-table-column>
 				</el-table-column>
 			</el-table>
 		</el-drawer>