From eb291c55ed2860b38b40385be78a30f30552685f Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 16:51:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 admin/src/views/finance/components/bullDetail.vue |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index be49e7b..ba7206d 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -1,5 +1,5 @@
 <template>
-  <GlobalWindow :title="'璐﹀崟璇︽儏'" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+  <GlobalWindow :title="'璐﹀崟璇︽儏'" :withFooter="false" :visible.sync="visible" :confirm-working="isWorking" @close="close"
     @confirm="confirm">
     <div style="width: 100%; position: sticky; top: 0; left: 0; z-index: 999; background: #ffffff;">
       <div class="home_title">
@@ -47,7 +47,10 @@
             <div class="val" style="margin-top: 10px;">{{info.actReceivableFee}}</div>
           </div>
           <div class="item" style="flex: 1;">
-            <div class="la">闇�{{info.needReceivableFee > 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+            <template v-if="info.billType === 1">
+              <div class="la">闇�浠橀噾棰濓紙鍏冿級</div>
+            </template>
+            <div class="la" v-else>闇�{{info.needReceivableFee > 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
             <div class="val" style="margin-top: 10px;">{{Math.abs(info.needReceivableFee)}}</div>
           </div>
           <div class="item" style="flex: 1;">

--
Gitblit v1.9.3