From a0cbb1d0a5a82111b5e24739faea1e2cba2ff59f Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 8 Jul 2025 20:05:55 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E7=BB=9F=E8=AE=A1=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E8=B4=AD=E4=B9=B0=E6=AC=A1=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hard/canteen-product-total/index.vue      | 64 +++++++------------
 .../wallet/wallet-recharge-invoice/index.vue  |  2 +-
 .../wallet-recharge-invoice/print-dialog.vue  | 10 +--
 3 files changed, 31 insertions(+), 45 deletions(-)

diff --git a/src/views/hard/canteen-product-total/index.vue b/src/views/hard/canteen-product-total/index.vue
index b8a6aec..8f3708a 100644
--- a/src/views/hard/canteen-product-total/index.vue
+++ b/src/views/hard/canteen-product-total/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>
@@ -18,41 +11,30 @@
 								<dict-select v-model="state.queryForm.hourType" dict-code="daily_menu" />
 							</el-form-item>
 							<el-form-item style="width: 250px" label="食堂" prop="merchantId">
-								<select-mch v-model="state.queryForm.merchantId" :apiParams="{ parentIsNull: false, types: '1' }" />
+								<select-mch v-model="state.queryForm.merchantId"
+									:apiParams="{ parentIsNull: false, types: '1' }" />
 							</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" type="daterange" />
+								<el-date-picker v-model="state.queryForm.createTimeList" value-format="YYYY-MM-DD"
+									type="daterange" />
 							</el-form-item>
 							<el-form-item>
-								<el-button icon="Search" type="primary" @click="doSearch">{{ $t("common.queryBtn") }}</el-button>
+								<el-button icon="Search" type="primary" @click="doSearch">{{ $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
-								:search="false"
-								v-model:showSearch="showSearch"
-								:export="'wallet_walletTransaction_export'"
-								@exportExcel="exportExcel"
-								class="ml10 mr20"
-								style="float: right"
-								@queryTable="getDataList"
-							></right-toolbar>
+							<right-toolbar :search="false" v-model:showSearch="showSearch"
+								:export="'wallet_walletTransaction_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="true"
-						@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="true" @selection-change="selectionChangHandle" @sort-change="sortChangeHandle">
 						<el-table-column type="selection" width="80" align="center" />
 						<el-table-column type="index" label="#" width="50" />
 						<el-table-column label="用餐时间" align="center" prop="createTime">
@@ -65,6 +47,11 @@
 								<dict-tag :options="daily_menu" :value="row.hourType" />
 							</template>
 						</el-table-column>
+						<el-table-column label="购买次数" align="center" prop="payCount">
+							<template #default="{ row }">
+								<span class="color-primary"> {{ row.timeCount || 0 }}次 </span>
+							</template>
+						</el-table-column>
 						<el-table-column label="售出商品数量" align="center" prop="payCount">
 							<template #default="{ row }">
 								<span class="color-success"> {{ row.payCount || 0 }}份 </span>
@@ -78,18 +65,15 @@
 
 						<el-table-column fixed="right" label="操作" width="200">
 							<template #default="{ row }">
-								<el-button
-									icon="Tickets"
-									text
-									type="primary"
-									@click="productTotalTableRef.openDialog(parseTime(row.createTime, '{y}-{m}-{d}'), row.hourType)"
-								>
+								<el-button icon="Tickets" text type="primary"
+									@click="productTotalTableRef.openDialog(parseTime(row.createTime, '{y}-{m}-{d}'), row.hourType)">
 									菜品详情
 								</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>
diff --git a/src/views/wallet/wallet-recharge-invoice/index.vue b/src/views/wallet/wallet-recharge-invoice/index.vue
index b386512..e9f3451 100644
--- a/src/views/wallet/wallet-recharge-invoice/index.vue
+++ b/src/views/wallet/wallet-recharge-invoice/index.vue
@@ -71,7 +71,7 @@
 						<dict-tag :options="check_status" :value="row.processStatus" />
 					</template>
 				</el-table-column>
-				<el-table-column prop="status" label="发票状态" width="100">
+				<el-table-column prop="status" label="发票状态" width="120">
 					<template #default="{ row }">
 						<dict-tag :options="recharge_invoice_status" :value="row.status" />
 					</template>
diff --git a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
index 4b7c1f2..1d84155 100644
--- a/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
+++ b/src/views/wallet/wallet-recharge-invoice/print-dialog.vue
@@ -96,10 +96,11 @@
 				:disabled="loading">
 				作废
 			</el-button>
-			<el-button v-if="!receiptData.processStatus" type="primary" :disabled="loading"
-				@click="applyStamp">申请审批</el-button>
-			<el-button v-if="receiptData.processStatus == undefined" v-auth="'wallet_walletRechargeApply_receiptSave'"
-				type="primary" @click="saveReceipt" :disabled="loading">保存</el-button>
+			<el-button v-if="!receiptData.processStatus && !['6'].includes(receiptData.status)" type="primary"
+				:disabled="loading" @click="applyStamp">申请审批</el-button>
+			<el-button v-if="receiptData.processStatus == undefined && !['6'].includes(receiptData.status)"
+				v-auth="'wallet_walletRechargeApply_receiptSave'" type="primary" @click="saveReceipt"
+				:disabled="loading">保存</el-button>
 			<el-button v-if="receiptData.stampPicUrl" type="warning" @click="handlePrint"
 				:disabled="loading">打印</el-button>
 		</template>
@@ -131,6 +132,7 @@ interface ReceiptData {
 	picUrl: string
 	stampPicUrl: string
 	processStatus: string | null
+	status?: string
 }
 
 const emit = defineEmits(["refresh"])