From 55ba702c1df240929e68df3b42fa9cb0607378b8 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期一, 08 九月 2025 10:58:48 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/business/wxBillDetail.vue | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/business/wxBillDetail.vue b/admin/src/views/business/wxBillDetail.vue
index 2f72f38..5118499 100644
--- a/admin/src/views/business/wxBillDetail.vue
+++ b/admin/src/views/business/wxBillDetail.vue
@@ -60,9 +60,15 @@
<span>{{scope.row.total == 0 ? '-' : scope.row.total }}</span>
</template>
</el-table-column>
- <el-table-column prop="bikefee" label="鑷杞︽敹鍏ワ紙鍏冿級" min-width="100px" align="center">
+ <el-table-column prop="bikefee" label="楠戣鏀跺叆锛堝厓锛�" min-width="100px" align="center">
<template slot-scope="scope">
<span>{{scope.row.bikeFee == 0 ? '-' : scope.row.bikeFee }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="濂楅鏀跺叆(鍏�)" min-width="100px" align="center">
+ <template slot-scope="scope">
+<!-- <span>{{scope.row.discountFee >= 0 ? scope.row.discountFee : '-' }}</span>-->
+ <span>{{ [0,2].includes(scope.$index) ? scope.row.discountFee : '-' }}</span>
</template>
</el-table-column>
<!-- v-if="containPermissions(['business:pricingparam:update', 'business:pricingparam:delete'])" -->
@@ -81,7 +87,6 @@
</template>
</el-table-column>
</el-table>
-
</template>
<BillDetailWindow ref="billDetailWindow"/>
</TableLayout>
@@ -192,7 +197,6 @@
search () {
fetchList(this.searchForm)
.then(res => {
- console.log(res)
this.tableData.list = [
{ billType: '浜ゆ槗瀹炴敹', ...res[0], cmmsAmt: (res[0].sumCmmsAmt + res[0].sumRefundCmmsAmt).toFixed(2) },
{ billType: '閫�娆�', ...res[1], cmmsAmt: (res[1].sumCmmsAmt + res[1].sumRefundCmmsAmt).toFixed(2) },
@@ -212,7 +216,7 @@
this.search()
},
arraySpanMethod ({ row, column, rowIndex, columnIndex }) {
- if (rowIndex == 3) {
+ if (rowIndex === 3) {
if (columnIndex === 0) {
return [1, 8]
} else {
--
Gitblit v1.9.3