From 2512d3bfbf51dfe9cfc252ce8780c79d5bc0e426 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Mon, 7 Jul 2025 10:17:43 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E5=85=85=E5=80=BC=E6=98=BE=E7=A4=BAbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/wallet/wallet-recharge-apply/form.vue    |  2 +-
 src/views/wallet/wallet-recharge-invoice/index.vue | 11 +++++++----
 2 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/form.vue b/src/views/wallet/wallet-recharge-apply/form.vue
index d1e004a..aba3eb4 100644
--- a/src/views/wallet/wallet-recharge-apply/form.vue
+++ b/src/views/wallet/wallet-recharge-apply/form.vue
@@ -14,7 +14,7 @@
 					<el-form-item label="充值类型" prop="bizType">
 						<!-- :hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3', auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2', '1']" -->
 						<dict-select v-model="form.bizType" :disabled="form.invoiceId" dict-code="wallet_biz_recharge"
-							:hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3', auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2', '1']"
+							:hide-ids="[(roleCodes.includes('RETURN_CANTEEN') || auths(['wallet_walletRechargeApply_refund'])) ? '' : '3', auths(['wallet_walletRechargeApply_select_jz']) ? '' : '2', form.bizType == '1' ? '' : '1']"
 							placeholder="请选择饭卡类型" />
 					</el-form-item>
 				</el-col>
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index 9d0e204..8874f2f 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -4,15 +4,18 @@
 			<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">
+					<el-form-item style="width: 450px" label="申请用户" prop="userIds">
 						<select-user v-model="state.queryForm.userIds" placeholder="申请用户" />
 					</el-form-item>
-					<el-form-item style="width: 300px" label="交款单位或个人" prop="deptOrUser">
+					<el-form-item style="width: 450px" label="交款单位或个人" prop="deptOrUser">
 						<el-input v-model="state.queryForm.deptOrUser" clearable placeholder="交款单位或个人" />
 					</el-form-item>
-					<el-form-item style="width: 300px" label="发票状态" prop="userIds">
+					<el-form-item style="width: 450px" label="发票状态" prop="userIds">
 						<dict-select v-model="state.queryForm.status" dict-code="recharge_invoice_status" />
 					</el-form-item>
+					<el-form-item style="width: 450px" label="备注" prop="remark">
+						<el-input v-model="state.queryForm.remark" />
+					</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" />
@@ -61,7 +64,7 @@
 						{{ displayPrice(row.totalPrice) }}
 					</template>
 				</el-table-column>
-				<el-table-column prop="payeeUser" min-width="120" label="收款人" show-overflow-tooltip />
+				<el-table-column prop="payeeUser" min-width="120" label="开票人" show-overflow-tooltip />
 				<el-table-column prop="payeeDept" min-width="120" label="收款单位" show-overflow-tooltip />
 				<el-table-column prop="processStatus" width="100" label="审核状态">
 					<template #default="{ row }">