From 954242aa19c1b990ab74297b533059df8d21a917 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 25 Jun 2025 15:40:33 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=8F=91=E7=A5=A8=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../wallet/wallet-recharge-apply/index.vue    | 144 ++++++------------
 .../wallet/wallet-recharge-invoice/index.vue  |  49 +++---
 2 files changed, 76 insertions(+), 117 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 4b73a35..71dfb41 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="申请人" />
@@ -110,97 +98,53 @@
 						</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>
-						<el-button
-							v-if="['1'].includes(row.processStatus)"
-							v-auth="'wallet_walletRechargeApply_print'"
-							icon="printer"
-							text
-							type="primary"
-							:loading="getReceiptDataLoading"
-							@click="previewInvoice(row)"
-						>
+						<el-button v-if="['1'].includes(row.processStatus)" v-auth="'wallet_walletRechargeApply_print'"
+							icon="printer" text type="primary" :loading="getReceiptDataLoading"
+							@click="previewInvoice(row)">
 							打印发票
 						</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" />
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index ea7f699..15305db 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -3,13 +3,9 @@
     <div class="layout-padding-auto layout-padding-view">
       <el-row>
         <div class="mb8" style="width: 100%">
-          <el-button icon="folder-add" type="primary" class="ml10" @click="formDialogRef.openDialog()"
-            v-auth="'wallet_walletRechargeInvoice_add'">
-            新 增
-          </el-button>
-          <el-button plain :disabled="multiple" icon="Delete" type="primary" v-auth="'wallet_walletRechargeInvoice_del'"
-            @click="handleDelete(selectObjs)">
-            删除
+          <el-button icon="folder-add" type="primary" class="ml10" @click="uploadExcelRef.show()"
+            v-auth="'wallet_walletRechargeApply_add'">
+            导 入
           </el-button>
           <right-toolbar v-model:showSearch="showSearch" :export="'wallet_walletRechargeInvoice_export'"
             @exportExcel="exportExcel" class="ml10 mr20" style="float: right;"
@@ -21,15 +17,26 @@
         @sort-change="sortChangeHandle">
         <el-table-column type="selection" width="40" align="center" />
         <el-table-column type="index" label="#" width="40" />
-        <el-table-column prop="applyId" label="申请id" show-overflow-tooltip />
-        <el-table-column prop="code" label="发票代码(七位数)" show-overflow-tooltip />
-        <el-table-column prop="time" label="发票日期" show-overflow-tooltip />
-        <el-table-column prop="deptOrUser" label="交款单位或个人" show-overflow-tooltip />
-        <el-table-column prop="totalPrice" label="合计人民币" show-overflow-tooltip />
-        <el-table-column prop="payeeDept" label="收款单位" show-overflow-tooltip />
-        <el-table-column prop="payeeUser" label="收款人" show-overflow-tooltip />
-        <el-table-column prop="remark" label="备注" show-overflow-tooltip />
-        <el-table-column prop="status" label="状态" show-overflow-tooltip />
+        <el-table-column prop="code" label="发票编号" />
+        <el-table-column prop="time" label="发票日期">
+          <template #default="{ row }">
+            {{ parseTime(row.time, "{y}-{m}-{d}") }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="deptOrUser" label="交款单位或个人" />
+        <el-table-column prop="totalPrice" label="合计人民币">
+          <template #default="{ row }">
+            {{ displayPrice(row.totalPrice) }}
+          </template>
+        </el-table-column>
+        <el-table-column prop="payeeUser" label="收款人" />
+        <el-table-column prop="payeeDept" label="收款单位" />
+        <el-table-column prop="status" label="发票状态">
+          <template #default="{ row }">
+            <dict-tag :options="recharge_invoice_status" :value="row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column prop="remark" label="备注" />
         <el-table-column label="操作" width="150">
           <template #default="scope">
             <el-button icon="edit-pen" text type="primary" v-auth="'wallet_walletRechargeInvoice_edit'"
@@ -42,6 +49,9 @@
       <pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
     </div>
 
+    <upload-excel ref="uploadExcelRef" title="用户信息导入" url="/wallet/wallet-recharge-apply/read-topup-excel"
+      temp-url="/admin/sys-file/local/file/wallet_recharge.xlsx" @refreshDataList="getDataList(false)" />
+
     <!-- 编辑、新增  -->
     <form-dialog ref="formDialogRef" @refresh="getDataList(false)" />
 
@@ -52,14 +62,19 @@
 import { BasicTableProps, useTable } from "/@/hooks/table";
 import { fetchList, delObjs } from "/@/api/wallet/wallet-recharge-invoice";
 import { useMessage, useMessageBox } from "/@/hooks/message";
-import { useDict } from '/@/hooks/dict';
+import { displayPrice } from "/@/utils/formatMoney"
+import { parseTime } from "/@/utils/formatTime"
+import { useDict } from "/@/hooks/dict"
+
 
 // 引入组件
 const FormDialog = defineAsyncComponent(() => import('./form.vue'));
 // 定义查询字典
 
+const { recharge_invoice_status } = useDict("recharge_invoice_status")
 // 定义变量内容
 const formDialogRef = ref()
+const uploadExcelRef = ref()
 // 搜索变量
 const queryRef = ref()
 const showSearch = ref(true)