Merge branch 'master' of http://gitea.zianxin.com/zianxin-tec/biz-pc-cloud

src/views/wallet/wallet-qb/index.vue

@@ -17,8 +17,8 @@
 							<el-form-item style="width: 300px" label="用户" prop="userId">
 								<select-user v-model="state.queryForm.userId" />
 							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡卡号" prop="cardNumber">
+							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<el-input v-model="state.queryForm.cardNumber" placeholder="饭卡卡号" clearable />
+								<select-wallet-type v-model="state.queryForm.walletTypeId" placeholder="饭卡类型" clearable />
 							</el-form-item>
 							<el-form-item style="width: 200px" label="月份" prop="walletRecordMonth">
 								<el-date-picker
@@ -29,9 +29,6 @@
 									placeholder="选择月份"
 								/>
 							</el-form-item>
-							<el-form-item style="width: 200px" label="饭卡类型" prop="walletTypeId">
-								<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="Refresh" @click="resetQuery">{{ $t("common.resetBtn") }}</el-button>
@@ -97,23 +94,18 @@
 								<div class="color-primary">{{ displayPrice(row.balance) }}</div>
 							</template>
 						</el-table-column>
-						<el-table-column prop="totalExpense" align="center" width="100" label="累计支出">
-							<template #default="{ row }">
-								<div class="color-danger">{{ displayPrice(row.totalExpense) }}</div>
-							</template>
-						</el-table-column>
-						<el-table-column prop="totalRecharge" align="center" width="100" label="累计充值">
-							<template #default="{ row }">
-								<div class="color-success">{{ displayPrice(row.totalRecharge) }}</div>
-							</template>
-						</el-table-column>
 						<el-table-column prop="isFreeze" width="120" label="是否冻结饭卡">
 							<template #default="{ row }">
 								<dict-tag :options="yes_no_type" :value="row.isFreeze" />
 							</template>
 						</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 prop="lastTopUpTime" width="200" label="最后充值时间">
+							<template #default="{ row }">
+								<span v-if="row.lastTopUpTime">{{ row.lastTopUpTime }}</span>
+								<span v-else class="color-danger">本月未充值</span>
+							</template>
+						</el-table-column>
 					</el-table>
 					<pagination @size-change="sizeChangeHandle" @current-change="currentChangeHandle" v-bind="state.pagination" />
 				</template>
@@ -165,7 +157,7 @@ const resetQuery = () => {
 // 导出excel
 const exportExcel = () => {
 	postDownBlobFile(
-		"/wallet/wallet-manage/export",
+		"/wallet/wallet-manage/export-qb",
 		Object.assign(state.queryForm, { current: state.pagination?.current, size: state.pagination?.size }),
 		"wallet_walletRecord.xlsx",
 	)
@@ -173,7 +165,7 @@ const exportExcel = () => {
 
 const getSummaries = (param: any) => {
 	const { columns, data } = param
-	const totalColumns = ["balance", "totalExpense", "totalRecharge"]
+	const totalColumns = ["balance"]
 	const totalRow = Array.from({ length: columns.length })
 	columns.forEach((i: any, index: number) => {
 		if (totalColumns.includes(i.property)) {