From a80fcaaf130286f215a35aa62450421b480b4d5a Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 二月 2025 11:41:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1

---
 admin/src/views/contract/components/pendingBills.vue |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/contract/components/pendingBills.vue b/admin/src/views/contract/components/pendingBills.vue
index b694d96..a068377 100644
--- a/admin/src/views/contract/components/pendingBills.vue
+++ b/admin/src/views/contract/components/pendingBills.vue
@@ -65,11 +65,17 @@
                         label="瀹炴敹/浠橀噾棰�">
                     </el-table-column>
                     <el-table-column
-                        prop="needReceivableFee"
                         label="闇�鏀�/浠橀噾棰�">
+                        <template slot-scope="{row}">
+                            <div style="display: flex; align-items: center;">
+                                <el-tag type="success" v-if="row.needReceivableFee > 0">鏀�</el-tag>
+                                <el-tag type="warning" v-if="row.needReceivableFee < 0">浠�</el-tag>
+                                <span>{{Math.abs(row.needReceivableFee)}}</span>
+                            </div>
+                        </template>
                     </el-table-column>
                     <el-table-column
-                        prop="receivableFee"
+                        prop="actPayDate"
                         label="搴旀敹/浠樻棩鏈�">
                     </el-table-column>
                 </el-table>

--
Gitblit v1.9.3