From 2f7a3dcfd4380bc082df928d759e963bd22d1039 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 15 Apr 2025 11:18:19 +0800
Subject: [PATCH 1/2] 11

---
 .../wallet-recharge-apply/preview-excel.vue   | 39 ++++---------------
 1 file changed, 8 insertions(+), 31 deletions(-)

diff --git a/src/views/wallet/wallet-recharge-apply/preview-excel.vue b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
index 06f2ee0..5b9c9b0 100644
--- a/src/views/wallet/wallet-recharge-apply/preview-excel.vue
+++ b/src/views/wallet/wallet-recharge-apply/preview-excel.vue
@@ -27,22 +27,17 @@
 				<el-table-column prop="bizType" label="充值类型" align="center" width="100">
 					<dict-tag :options="wallet_biz_recharge" :value="detail.bizType" />
 				</el-table-column>
-				<el-table-column prop="prenBalance" label="操作前余额" align="center" min-width="180">
-					<template #default="{ row }">
-						<span class="color-primary">{{ displayPrice(row.prenBalance) }}</span>
-					</template>
-				</el-table-column>
-				<el-table-column v-if="detail.bizType == 2" prop="discountBalance" label="记账扣款后余额" align="center" min-width="180">
-					<template #default="{ row }">
-						<div class="color-danger">{{ displayPrice(row.discountBalance) }}</div>
-						<div v-if="row.discountBalance < 0" class="color-danger">(余额不足记账扣款)</div>
-					</template>
-				</el-table-column>
-				<el-table-column prop="currentImport_price" label="操作金额" align="center" min-width="180">
+				<el-table-column prop="currentImport_price" label="操作金额" align="center" min-width="250">
 					<template #default="{ row }">
 						<div class="color-success">{{ displayPrice(row.currentImport_price) }}</div>
 					</template>
 				</el-table-column>
+				<el-table-column v-if="detail.bizType == 2 && false" prop="afterBalance" label="记账扣款后余额" align="center" min-width="180">
+					<template #default="{ row }">
+						<div class="color-danger">{{ displayPrice(row.afterBalance) }}</div>
+						<div v-if="row.afterBalance < 0" class="color-danger">(余额不足记账扣款)</div>
+					</template>
+				</el-table-column>
 				<slot v-if="data.tableList && data.tableList.length">
 					<el-table-column :prop="v" v-for="(v, i) in data.tableList" :key="i" align="center" min-width="250">
 						<template #header>
@@ -198,25 +193,7 @@ const getSummaries = (param: SummaryMethodProps) => {
 			} else {
 				sums[index] = "NaN"
 			}
-		} else if (column.property === "prenBalance") {
-			const values = data1.map((item) => Number(item[column.property]))
-			if (!values.every((value) => Number.isNaN(value))) {
-				sums[index] = h("span", { style: { color: "#2e5cf6" } }, [
-					displayPrice(
-						values.reduce((prev, curr) => {
-							const value = Number(curr)
-							if (!Number.isNaN(value)) {
-								return prev + curr
-							} else {
-								return prev
-							}
-						}, 0),
-					),
-				])
-			} else {
-				sums[index] = "NaN"
-			}
-		} else if (column.property === "discountBalance") {
+		} else if (column.property === "afterBalance") {
 			const values = data1.map((item) => Number(item[column.property]))
 			if (!values.every((value) => Number.isNaN(value))) {
 				sums[index] = h("span", { style: { color: "#f56c6c" } }, [

From e41471cb7d42ae2f7dc4caa9f2c1c6e795b47658 Mon Sep 17 00:00:00 2001
From: dzc <2388224167@qq.com>
Date: Tue, 15 Apr 2025 11:23:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?feat:=E6=99=BA=E8=83=BD=E6=9F=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E8=AF=B7=E6=B1=82=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/hard/third-door-log/index.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/hard/third-door-log/index.vue b/src/views/hard/third-door-log/index.vue
index 7ba4cd4..405094f 100644
--- a/src/views/hard/third-door-log/index.vue
+++ b/src/views/hard/third-door-log/index.vue
@@ -3,11 +3,11 @@
 		<div class="layout-padding-auto layout-padding-view">
 			<el-form ref="queryRef" :inline="true" :model="state.queryForm" @keyup.enter="getDataList">
 				<el-row>
-					<el-form-item style="width: 300px" label="请求类型" prop="thirdApiType">
-						<dict-select v-model="state.queryForm.thirdApiType" dict-code="third_api_type" />
+					<el-form-item style="width: 300px" label="请求类型" prop="apiType">
+						<dict-select v-model="state.queryForm.apiType" dict-code="third_api_type" />
 					</el-form-item>
-					<el-form-item style="width: 300px" label="接口类型" prop="thirdBizType">
-						<dict-select v-model="state.queryForm.thirdBizType" dict-code="third_biz_type" />
+					<el-form-item style="width: 300px" label="接口类型" prop="bizType">
+						<dict-select v-model="state.queryForm.bizType" dict-code="third_biz_type" />
 					</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" />