11

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">
+				<el-table-column prop="currentImport_price" label="操作金额" align="center" min-width="250">
-					<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">
 					<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") {
+		} 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: "#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") {
 			const values = data1.map((item) => Number(item[column.property]))
 			if (!values.every((value) => Number.isNaN(value))) {
 				sums[index] = h("span", { style: { color: "#f56c6c" } }, [