From 00f53e360f0ba144ee3150a05c9897d147fc1a1b Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Wed, 25 Jun 2025 10:35:48 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E8=AE=B0=E8=B4=A6=E6=89=A3=E6=AC=BE?=
 =?UTF-8?q?=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/wallet/wallet-recharge-invoice.ts     |   4 +-
 .../wallet/wallet-recharge-apply/form.vue     |   2 +-
 .../wallet/wallet-recharge-apply/index.vue    | 146 ++++++------------
 .../wallet-recharge-apply/print-dialog.vue    |  41 ++---
 4 files changed, 69 insertions(+), 124 deletions(-)

diff --git a/src/api/wallet/wallet-recharge-invoice.ts b/src/api/wallet/wallet-recharge-invoice.ts
index e09696b..885b86c 100644
--- a/src/api/wallet/wallet-recharge-invoice.ts
+++ b/src/api/wallet/wallet-recharge-invoice.ts
@@ -15,11 +15,11 @@ export function getInvoice(query: any) {
 /**
  * 绑定发票
  */
-export function bindInvoice(query: any) {
+export function bindInvoice(data: any) {
 	return request({
 		url: "/wallet/walletRechargeInvoice/bind-invoice",
 		method: "post",
-		params: query,
+		data: data,
 	})
 }
 
diff --git a/src/views/wallet/wallet-recharge-apply/form.vue b/src/views/wallet/wallet-recharge-apply/form.vue
index 8a9722d..0ab2fdd 100644
--- a/src/views/wallet/wallet-recharge-apply/form.vue
+++ b/src/views/wallet/wallet-recharge-apply/form.vue
@@ -13,7 +13,7 @@
 				<el-col :span="24" class="mb20">
 					<el-form-item label="充值类型" prop="bizType">
 						<dict-select v-model="form.bizType" dict-code="wallet_biz_recharge"
-							:hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3']"
+							:hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3', auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2']"
 							placeholder="请选择饭卡类型" />
 					</el-form-item>
 				</el-col>
diff --git a/src/views/wallet/wallet-recharge-apply/index.vue b/src/views/wallet/wallet-recharge-apply/index.vue
index 1d0e38e..226755b 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" />
@@ -367,7 +311,7 @@ const previewInvoice = async (row: any) => {
 	try {
 		getReceiptDataLoading.value = true
 		const res = await getInvoice({ id: row.id })
-		if (res.code == 0 && printDialogRef.value) return printDialogRef.value.openDialog(res.data)
+		if (res.code == 0 && printDialogRef.value) return printDialogRef.value.openDialog(res.data, row.id)
 	} catch (error: any) {
 		useMessage().error(error.msg)
 	} finally {
diff --git a/src/views/wallet/wallet-recharge-apply/print-dialog.vue b/src/views/wallet/wallet-recharge-apply/print-dialog.vue
index 8ac1d91..08c93dd 100644
--- a/src/views/wallet/wallet-recharge-apply/print-dialog.vue
+++ b/src/views/wallet/wallet-recharge-apply/print-dialog.vue
@@ -6,7 +6,9 @@
 			<div class="flex justify-between items-end mb-1">
 				<div></div>
 				<div class="text-lg">
-					{{ formatDate(new Date(receiptData.time), "YYYY年mm月dd日") || "    年    月    日".replace(/ /g, "&nbsp;&nbsp;") }}
+					{{
+						formatDate(new Date(receiptData.time), "YYYY年mm月dd日") || " 年 月 日".replace(/ /g, "&nbsp;&nbsp;")
+					}}
 				</div>
 				<span class="text-xl text-red-500">No. {{ receiptData.code || "0000000" }}</span>
 			</div>
@@ -17,12 +19,9 @@
 						<tr class="border border-gray-300">
 							<td class="border border-gray-300 px-2 w-3/12 h-10">交款单位（或个人）</td>
 							<td class="border border-gray-300 px-2 w-9/12 h-10 text-sm text-blue-800" colspan="4">
-								<input
-									type="text"
-									v-model="receiptData.deptOrUser"
+								<input type="text" v-model="receiptData.deptOrUser"
 									class="caret-red-600 w-full h-full bg-transparent text-center"
-									ref="deptOrUserInput"
-								/>
+									ref="deptOrUserInput" />
 							</td>
 						</tr>
 						<tr>
@@ -58,26 +57,27 @@
 						<tr>
 							<td class="border border-gray-300 px-2 w-1/6 h-10">收款单位<br />（盖章）</td>
 							<td class="border border-gray-300 px-2 text-left w-1/6 h-10 text-sm text-blue-800">
-								<input type="text" v-model="receiptData.payeeDept" class="w-full h-full bg-transparent" />
+								<input type="text" v-model="receiptData.payeeDept"
+									class="w-full h-full bg-transparent" />
 							</td>
 							<td class="border border-gray-300 px-2 w-1/6 h-10">收款人<br />（签名）</td>
 							<td class="border border-gray-300 px-2 text-left w-1/6 h-10 text-sm text-blue-800">
-								<input type="text" v-model="receiptData.payeeUser" class="w-full h-full bg-transparent" />
+								<input type="text" v-model="receiptData.payeeUser"
+									class="w-full h-full bg-transparent" />
 							</td>
 							<td class="border border-gray-300 px-2 text-left align-text-top w-1/3 h-10">
 								<div class="flex">
 									<span class="whitespace-nowrap">备注：</span>
-									<textarea
-										v-model="receiptData.remark"
-										class="flex-1 text-sm text-blue-800 w-full h-full my-1 bg-transparent resize-none overflow-y-hidden"
-									/>
+									<textarea v-model="receiptData.remark"
+										class="flex-1 text-sm text-blue-800 w-full h-full my-1 bg-transparent resize-none overflow-y-hidden" />
 								</div>
 							</td>
 						</tr>
 					</table>
 				</div>
 				<div class="flex items-center ml-1">
-					<span class="text-gray-500 text-md whitespace-nowrap" style="writing-mode: vertical-rl; letter-spacing: 0.2em">
+					<span class="text-gray-500 text-md whitespace-nowrap"
+						style="writing-mode: vertical-rl; letter-spacing: 0.2em">
 						第一联 存根联
 					</span>
 				</div>
@@ -93,15 +93,14 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, nextTick } from "vue"
+import { ref, computed } from "vue"
 import * as htmlToImage from "html-to-image"
-import { toPng, toJpeg, toBlob, toPixelData, toSvg } from "html-to-image"
 import { useMessage } from "/@/hooks/message"
 import request from "/@/utils/request"
 import { formatDate } from "/@/utils/formatTime"
-import { displayPrice, storePrice } from "/@/utils/formatMoney"
+import { displayPrice } from "/@/utils/formatMoney"
 import printJS from "print-js"
-import { putObj } from "/@/api/wallet/wallet-recharge-invoice"
+import { bindInvoice } from "/@/api/wallet/wallet-recharge-invoice"
 
 interface ReceiptData {
 	itemJson: string
@@ -131,6 +130,7 @@ const receiptData = ref<ReceiptData>({
 	payeeUser: "", // 收款人
 	remark: "", // 备注
 })
+const applyId = ref<any>()
 const receiptDataItems = computed(() => {
 	try {
 		const itemJson = JSON.parse(receiptData.value.itemJson)
@@ -144,9 +144,10 @@ const receiptDataItems = computed(() => {
 })
 const totalPrice = computed(() => displayPrice(receiptData.value.totalPrice, ""))
 
-const openDialog = (data: ReceiptData) => {
+const openDialog = (data: ReceiptData, id: any) => {
 	visible.value = true
 	receiptData.value = data
+	applyId.value = id
 	timer.value = setTimeout(() => deptOrUserInput.value?.focus(), 50)
 }
 
@@ -163,7 +164,6 @@ const genImageUpload = async (): Promise<string | void> => {
 			canvasHeight: 900,
 			backgroundColor: "#ffffff",
 		})
-
 		if (blob) {
 			const formData = new FormData()
 			formData.append("file", blob, "receipt.png")
@@ -187,7 +187,7 @@ const saveReceipt = async () => {
 		loading.value = true
 		const url = await genImageUpload()
 		if (url) {
-			const { code, data } = await putObj({ url, deptOrUser: receiptData.value.deptOrUser })
+			const { code, data } = await bindInvoice({ ...receiptData.value, picUrl: url, deptOrUser: receiptData.value.deptOrUser, applyId: applyId.value })
 			if (code == 0) return useMessage().success("保存成功")
 			useMessage().error(data.msg || "保存失败")
 		}
@@ -220,6 +220,7 @@ defineExpose({
 	@page {
 		size: A4 landscape;
 	}
+
 	input {
 		border: none;
 		box-shadow: none;