From 069d34a14711d82327c98517f71d6cb5c962966a Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Fri, 30 Jan 2026 09:54:36 +0800
Subject: [PATCH] =?UTF-8?q?feat:bug=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/hard-sh/index.vue              |  2 +-
 .../wallet/wallet-recharge-water/index.vue    | 62 +++++++------------
 2 files changed, 22 insertions(+), 42 deletions(-)

diff --git a/src/views/hard/hard-sh/index.vue b/src/views/hard/hard-sh/index.vue
index da92a6f..9a95517 100644
--- a/src/views/hard/hard-sh/index.vue
+++ b/src/views/hard/hard-sh/index.vue
@@ -21,7 +21,7 @@
 							<el-form-item style="width: 250px" label="商户" prop="merchantId">
 								<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false }" />
 							</el-form-item>
-							<el-form-item v-if="activeTab === 'DAY'" style="width: 450px" label="创建时间(天)"
+							<el-form-item v-if="activeTab === 'MCH'" style="width: 450px" label="创建时间(天)"
 								prop="payTimeList">
 								<el-date-picker v-model="state.queryForm.payTimeList" value-format="YYYY-MM-DD HH:mm:ss"
 									type="datetimerange" />
diff --git a/src/views/wallet/wallet-recharge-water/index.vue b/src/views/wallet/wallet-recharge-water/index.vue
index e026946..19c9ab0 100644
--- a/src/views/wallet/wallet-recharge-water/index.vue
+++ b/src/views/wallet/wallet-recharge-water/index.vue
@@ -1,16 +1,9 @@
 <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">
 						<el-row>
@@ -24,47 +17,38 @@
 								<dict-select v-model="state.queryForm.processStatus" dict-code="check_status" />
 							</el-form-item>
 							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型"
+									clearable />
 							</el-form-item>
 							<el-form-item style="width: 450px" label="审核时间" prop="processTimeList">
-								<el-date-picker v-model="state.queryForm.processTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+								<el-date-picker v-model="state.queryForm.processTimeList"
+									value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
 							</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%">
-							<right-toolbar
-								v-model:showSearch="showSearch"
-								:export="'wallet_walletRechargeApply_export'"
-								@exportExcel="exportExcel"
-								class="ml10 mr20"
-								style="float: right"
-								@queryTable="getDataList"
-							></right-toolbar>
+							<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletRechargeApply_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
-						:cell-style="tableStyle.cellStyle"
-						:header-cell-style="tableStyle.headerCellStyle"
-						:summary-method="getSummaries"
-						show-summary
-						@selection-change="selectionChangHandle"
-						@sort-change="sortChangeHandle"
-					>
+					<el-table :data="state.dataList" v-loading="state.loading" border :cell-style="tableStyle.cellStyle"
+						:header-cell-style="tableStyle.headerCellStyle" :summary-method="getSummaries" show-summary
+						@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 width="200" label="用户">
 							<template #default="{ row }">
 								<div class="flex flex-row items-center justify-center">
 									<preview-image width="50px" height="50px" :src="row.userAvatar" />
-									<div class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
+									<div
+										class="flex flex-col ml-2 items-start cursor-pointer hover:underline hover:text-blue-500">
 										<span> {{ row.username }} </span>
 										<span> {{ row.userMobile }} </span>
 										<span> {{ row.userDeptName }} </span>
@@ -106,19 +90,15 @@
 						</el-table-column>
 						<el-table-column v-auths="['wallet_walletRechargeImport_recover']" label="操作" width="200">
 							<template #default="{ row }">
-								<el-button
-									v-auth="'wallet_walletRechargeImport_recover'"
-									icon="RefreshRight"
-									text
-									type="primary"
-									@click="handleRecover(row.id)"
-								>
+								<el-button v-auth="'wallet_walletRechargeImport_recover'" icon="RefreshRight" text
+									type="primary" @click="handleRecover(row.id)">
 									恢复
 								</el-button>
 							</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>