From 3b419d47d6125b976939d30680ba12cbc3c8d99f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 1 Jul 2025 10:06:01 +0800
Subject: [PATCH 1/2] 11

---
 src/views/wallet/wallet-manage/index.vue      | 100 +++++-------------
 .../wallet/wallet-recharge-invoice/index.vue  |   6 +-
 2 files changed, 30 insertions(+), 76 deletions(-)

diff --git a/src/views/wallet/wallet-manage/index.vue b/src/views/wallet/wallet-manage/index.vue
index ef127f0..921a6b9 100644
--- a/src/views/wallet/wallet-manage/index.vue
+++ b/src/views/wallet/wallet-manage/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>
@@ -21,47 +14,30 @@
 								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
 							</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>
-								<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="用户" />
@@ -105,49 +81,29 @@
 						</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>
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index 21ee60c..c61c7bb 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -16,7 +16,7 @@
 					</el-form-item>
 					<el-form-item>
 						<el-button icon="Search" type="primary" @click="getDataList">{{ $t("common.queryBtn")
-							}}</el-button>
+						}}</el-button>
 						<el-button icon="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
 					</el-form-item>
 				</el-row>
@@ -63,11 +63,9 @@
 					</template>
 				</el-table-column>
 				<el-table-column prop="remark" label="备注" />
+				<el-table-column prop="createTime" width="200" label="创建时间" />
 				<el-table-column label="操作" width="200" fixed="right">
 					<template #default="{ row }">
-						<!-- <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRechargeInvoice_edit'"
-              @click="formDialogRef.openDialog(scope.row.id)">编辑</el-button> -->
-						<!-- v-if="['1'].includes(row.processStatus)" -->
 						<el-button v-auth="'wallet_walletRechargeApply_print'" icon="printer" text type="primary"
 							:loading="getReceiptDataLoading" @click="previewInvoice(row)">
 							查看发票

From ab4669a55517f43b1d5487bc96dadcb4c773210f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 1 Jul 2025 10:21:51 +0800
Subject: [PATCH 2/2] 11

---
 .../wallet/wallet-recharge-apply/index.vue    | 133 ++++++------------
 1 file changed, 42 insertions(+), 91 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index ba26871..2531454 100644
--- a/src/views/wallet/wallet-recharge-apply/index.vue
+++ b/src/views/wallet/wallet-recharge-apply/index.vue
@@ -1,7 +1,8 @@
 <template>
 	<div class="layout-padding">
 		<div class="layout-padding-auto layout-padding-view">
-			<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
+			<el-form v-show="showSearch" ref="queryRef" :inline="true" :model="state.queryForm"
+				@keyup.enter="getDataList">
 				<el-row>
 					<el-form-item style="width: 300px" label="用户" prop="userIds">
 						<select-user v-model="state.queryForm.userIds" placeholder="用户" />
@@ -10,60 +11,47 @@
 						<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 					</el-form-item>
 					<el-form-item style="width: 200px" label="充值类型" prop="bizType">
-						<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge" placeholder="充值类型" />
+						<dict-select v-model="state.queryForm.bizType" dict-code="wallet_biz_recharge"
+							placeholder="充值类型" />
 					</el-form-item>
 					<el-form-item style="width: 450px" label="创建时间" prop="createTimeList">
-						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss" type="datetimerange" />
+						<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD HH:mm:ss"
+							type="datetimerange" />
 					</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%">
-					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()" v-auth="'wallet_walletRechargeApply_add'">
+					<el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
+						v-auth="'wallet_walletRechargeApply_add'">
 						导 入
 					</el-button>
-					<el-button
-						v-if="false"
-						plain
-						:disabled="multiple"
-						icon="Delete"
-						type="primary"
-						v-auth="'wallet_walletRechargeApply_del'"
-						@click="handleDelete(selectObjs)"
-					>
+					<el-button v-if="false" plain :disabled="multiple" icon="Delete" type="primary"
+						v-auth="'wallet_walletRechargeApply_del'" @click="handleDelete(selectObjs)">
 						删除
 					</el-button>
 					<div class="flex justify-between items-center">
 						<el-tabs class="flex-1" v-model="activeName" @tab-click="handleClickTabItem">
 							<el-tab-pane v-for="v in tabItems" :key="v.id" :label="v.label" :name="v.value" />
 						</el-tabs>
-						<right-toolbar
-							v-model:showSearch="showSearch"
-							:export="'wallet_walletRechargeApply_export'"
-							@exportExcel="exportExcel"
-							class="ml10 mr20"
-							style="float: right"
-							@queryTable="getDataList"
-						/>
+						<right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletRechargeApply_export'"
+							@exportExcel="exportExcel" class="ml10 mr20" style="float: right"
+							@queryTable="getDataList" />
 					</div>
 				</div>
 			</el-row>
-			<el-table
-				:data="state.dataList"
-				v-loading="state.loading"
-				border
-				: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 :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" label="申请人" />
@@ -115,86 +103,48 @@
 						</div>
 					</template>
 				</el-table-column>
-				<el-table-column
-					label="操作"
-					v-auths="[
-						'wallet_walletRechargeApply_view',
-						'wallet_walletRechargeApply_apply',
-						'wallet_walletRechargeApply_edit',
-						'wallet_walletRechargeApply_del',
-						'wallet_walletRechargeApply_check',
-					]"
-					width="300"
-					fixed="right"
-				>
+				<el-table-column label="操作" v-auths="[
+					'wallet_walletRechargeApply_view',
+					'wallet_walletRechargeApply_apply',
+					'wallet_walletRechargeApply_edit',
+					'wallet_walletRechargeApply_del',
+					'wallet_walletRechargeApply_check',
+				]" width="300" fixed="right">
 					<template #default="{ row }">
-						<el-button
-							v-if="row.importTime"
-							icon="Document"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargeApply_view'"
-							@click="doInfo(row)"
-						>
+						<el-button v-if="row.importTime" icon="Document" text type="primary"
+							v-auth="'wallet_walletRechargeApply_view'" @click="doInfo(row)">
 							数据
 						</el-button>
-						<el-button
-							v-if="row.importTime && !row.processId"
-							icon="Connection"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargeApply_apply'"
-							@click="doApply(row)"
-						>
+						<el-button v-if="row.importTime && !row.processId" icon="Connection" text type="primary"
+							v-auth="'wallet_walletRechargeApply_apply'" @click="doApply(row)">
 							申请
 						</el-button>
-						<el-button
-							v-if="!row.processId"
-							icon="edit-pen"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargeApply_edit'"
-							@click="formDialogRef.openDialog(row.id)"
-						>
+						<el-button v-if="!row.processId" icon="edit-pen" text type="primary"
+							v-auth="'wallet_walletRechargeApply_edit'" @click="formDialogRef.openDialog(row.id)">
 							编辑
 						</el-button>
-						<el-button
-							v-if="row.isCheckUser && row.processStatus == '1'"
-							type="primary"
-							size="small"
-							link
-							icon="VideoPlay"
-							@click="deal(row)"
-							v-auth="'wallet_walletRechargeApply_check'"
-						>
+						<el-button v-if="row.isCheckUser && row.processStatus == '1'" type="primary" size="small" link
+							icon="VideoPlay" @click="deal(row)" v-auth="'wallet_walletRechargeApply_check'">
 							开始处理
 						</el-button>
 						<el-button
 							v-if="row.userId == userInfos?.user?.userId && [null, '1'].includes(row.processStatus)"
-							icon="delete"
-							text
-							type="primary"
-							v-auth="'wallet_walletRechargeApply_del'"
-							@click="handleDelete([row.id])"
-						>
+							icon="delete" text type="primary" v-auth="'wallet_walletRechargeApply_del'"
+							@click="handleDelete([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" />
 		</div>
 
 		<!-- 编辑、新增  -->
 		<form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
-		<upload-excel
-			ref="uploadExcelRef"
-			title="充值导入"
-			url="/wallet/wallet-recharge-apply/read-excel"
-			temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx"
-			@refreshDataList="getDataList(false)"
-		/>
+		<upload-excel ref="uploadExcelRef" title="充值导入" url="/wallet/wallet-recharge-apply/read-excel"
+			temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
 
 		<!-- 审批抽屉 -->
 		<process-drawer ref="processDrawerRef" @task-submit-event="taskSubmitEvent" />
@@ -307,6 +257,7 @@ const selectionChangHandle = (objs: { id: string }[]) => {
 onMounted(async () => {
 	const { data } = await getDicts("check_status")
 	data.unshift({ label: "全部", value: null })
+	data.push({ label: "未提交", value: 99 })
 	tabItems.value = data
 })