From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 14:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/finance/bull.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index 4c7923a..e0e4de8 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -33,9 +33,13 @@
         </template>
       </el-table-column>
       <el-table-column prop="totleFee" label="璐﹀崟閲戦" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="receivableFee" label="搴旀敹閲戦" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="actReceivableFee" label="瀹炴敹閲戦" min-width="100" show-overflow-tooltip />
-      <el-table-column prop="needReceivableFee" label="闇�鏀堕噾棰�" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="receivableFee" :label="`搴�${billType === 0 ? '鏀�' : '浠�'}閲戦`" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="actReceivableFee" :label="`瀹�${billType === 0 ? '鏀�' : '浠�'}閲戦`" min-width="100" show-overflow-tooltip />
+      <el-table-column :label="`闇�鏀�/浠橀噾棰漙" min-width="100" show-overflow-tooltip>
+        <template slot-scope="{row}">
+          {{Math.abs(row.needReceivableFee)}}
+        </template>
+      </el-table-column>
       <el-table-column label="璐圭敤绫诲瀷" min-width="100" show-overflow-tooltip>
         <template slot-scope="{row}">
           <span v-if="row.costType === 0">绉熻祦璐�</span>
@@ -59,7 +63,7 @@
           {{ row.startDate }} ~ {{ row.endDate }}
         </template>
       </el-table-column>
-      <el-table-column prop="planPayDate" label="搴旀敹鏃ユ湡" min-width="100" show-overflow-tooltip />
+      <el-table-column prop="planPayDate" :label="`搴�${billType === 0 ? '鏀�' : '浠�'}鏃ユ湡`" min-width="100" show-overflow-tooltip />
       <el-table-column label="璐﹀崟鏉ユ簮" min-width="100" show-overflow-tooltip>
         <template slot-scope="{row}">
           <span v-if="row.type === 0">鍚堝悓璐﹀崟</span>
@@ -145,8 +149,8 @@
               { value: 0, label: '寰呮敹娆�' },
               { value: 1, label: '宸茬粨绠�' },
               { value: 2, label: '閮ㄥ垎缁撴竻' },
-              { value: 3, label: '寰呴��娆�' },
-              { value: 4, label: '寰呬粯娆�' }
+              { value: 3, label: '寰呬粯娆�' },
+              { value: 4, label: '寰呴��娆�' }
             ]
           },
           {

--
Gitblit v1.9.3