From dc1332295aac2d0f5ae8b96b1782d6f8932d6c6c Mon Sep 17 00:00:00 2001
From: ctw <ctw@email.com>
Date: Fri, 31 Oct 2025 16:49:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../integrated/meeting/serviceUser/index.vue  |   1 -
 src/views/wallet/wallet-manage/index.vue      | 100 +++++++++++++-----
 2 files changed, 72 insertions(+), 29 deletions(-)

diff --git a/src/views/integrated/meeting/serviceUser/index.vue b/src/views/integrated/meeting/serviceUser/index.vue
index 1db1b87..aae3e77 100644
--- a/src/views/integrated/meeting/serviceUser/index.vue
+++ b/src/views/integrated/meeting/serviceUser/index.vue
@@ -40,7 +40,6 @@
 					></right-toolbar>
 				</div>
 			</el-row>
-			11111
 			<el-table
 				:data="state.dataList"
 				v-loading="state.loading"
diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index 59eec21..b2d425b 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/index.vue
@@ -1,13 +1,20 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<DraggableDepTree ref="draggableDepTreeRef" placeholder="请输入部门名称" :show-expand="true"
-				@getSelectNode="handleGetSelectNode" switch-inactive-text="包含" switch-active-text="不包含"
-				:defaultTreeWidth="20" :nodeClickable="false">
+			<DraggableDepTree
+				ref="draggableDepTreeRef"
+				placeholder="请输入部门名称"
+				:show-expand="true"
+				@getSelectNode="handleGetSelectNode"
+				switch-inactive-text="包含"
+				switch-active-text="不包含"
+				:defaultTreeWidth="20"
+				:nodeClickable="false"
+			>
 				<template #default>
 					<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
-						<select-user v-model="state.queryForm.userId" />
 						<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="cardNumber">
 							<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
@@ -16,26 +23,43 @@
 							<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 						</el-form-item>
 						<el-form-item>
-							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
-							}}</el-button>
+							<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn") }}</el-button>
 							<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 						</el-form-item>
-						</el-row>
 					</el-form>
 					<el-row>
 						<div class="mb8" style="width: 100%">
-							<el-button plain :disabled="multiple" icon="Delete" type="primary"
-								v-auth="'wallet_walletManage_del'" @click="handleDelete(selectObjs)">
+							<el-button
+								plain
+								:disabled="multiple"
+								icon="Delete"
+								type="primary"
+								v-auth="'wallet_walletManage_del'"
+								@click="handleDelete(selectObjs)"
+							>
 								删除
 							</el-button>
-							<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletManage_export'"
-								@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
-								@queryTable="getDataList"></right-toolbar>
+							<right-toolbar
+								v-model:showSearch="showSearch"
+								:export="'wallet_walletManage_export'"
+								@exportExcel="exportExcel"
+								class="ml10 mr20"
+								style="float: right"
+								@queryTable="getDataList"
+							></right-toolbar>
 						</div>
 					</el-row>
-					<el-table :data="state.dataList" v-loading="state.loading" border :summary-method="getSummaries"
-						show-summary :cell-style="tableStyle.cellStyle" :header-cell-style="tableStyle.headerCellStyle"
-						@selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
+					<el-table
+						:data="state.dataList"
+						v-loading="state.loading"
+						border
+						:summary-method="getSummaries"
+						show-summary
+						:cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle"
+						@selection-change="selectionChangHandle"
+						@sort-change="sortChangeHandle"
+					>
 						<el-table-column type="selection" width="40" align="center" />
 						<el-table-column type="index" label="#" width="80" />
 						<el-table-column prop="username" width="100" label="用户" />
@@ -79,29 +103,49 @@
 						</el-table-column>
 						<el-table-column v-if="false" prop="activeBindStatus" width="120" label="饭卡绑定状态" />
 						<el-table-column prop="createTime" width="200" label="创建时间" />
-						<el-table-column label="操作" fixed="right" width="250" v-auths="[
-							'wallet_walletManage_edit',
-							'wallet_walletTransaction_update_balance',
-							'wallet_walletRuleTransaction_transfer_accounts',
-						]">
+						<el-table-column
+							label="操作"
+							fixed="right"
+							width="250"
+							v-auths="[
+								'wallet_walletManage_edit',
+								'wallet_walletTransaction_update_balance',
+								'wallet_walletRuleTransaction_transfer_accounts',
+							]"
+						>
 							<template #default="{ row }">
 								<div class="flex items-start">
-									<el-button icon="InfoFilled" text type="primary" v-auth="'wallet_walletManage_edit'"
-										@click="formDialogRef.openDialog(row.id)">详情</el-button>
-									<el-button icon="Money" text type="primary"
+									<el-button
+										icon="InfoFilled"
+										text
+										type="primary"
+										v-auth="'wallet_walletManage_edit'"
+										@click="formDialogRef.openDialog(row.id)"
+										>详情</el-button
+									>
+									<el-button
+										icon="Money"
+										text
+										type="primary"
 										v-auth="'wallet_walletTransaction_update_balance'"
-										@click="changeBalanceRef.openDialog(row.userId, row.id)">充值/扣款</el-button>
-									<el-button v-if="row.isRule == 1" icon="SwitchFilled" text type="primary"
+										@click="changeBalanceRef.openDialog(row.userId, row.id)"
+										>充值/扣款</el-button
+									>
+									<el-button
+										v-if="row.isRule == 1"
+										icon="SwitchFilled"
+										text
+										type="primary"
 										v-auth="'wallet_walletRuleTransaction_transfer'"
-										@click="doTransferAccounts(row)">
+										@click="doTransferAccounts(row)"
+									>
 										转账
 									</el-button>
 								</div>
 							</template>
 						</el-table-column>
 					</el-table>
-					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle"
-						v-bind="state.pagination" />
+					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 				</template>
 			</DraggableDepTree>
 		</div>