From a2299a6d4a6f99e9c11132138f5d3e9ec68f03ea Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 19:19:34 +0800
Subject: [PATCH] 开发更新

---
 admin/src/views/finance/bull.vue |   25 +++++++++++++++++--------
 1 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index 4f502d9..f2344d0 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -9,7 +9,7 @@
       <div class="btns">
         <el-button type="primary" @click="addOpen" icon="el-icon-plus"
           v-permissions="['business:ywpatrolline:create']">鏂板缓</el-button>
-        <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>
+<!--        <el-button @click="handleDetail" v-permissions="['business:ywpatrolline:create']">瀵煎嚭</el-button>-->
       </div>
     </div>
     <el-table v-loading="loading" :data="list" stripe>
@@ -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>
@@ -124,6 +128,11 @@
             label: '瀹㈡埛鍚嶇О'
           },
           {
+            filed: 'contractCode',
+            type: 'input',
+            label: '鍚堝悓缂栧彿'
+          },
+          {
             filed: 'status',
             type: 'select',
             label: '璐﹀崟鐘舵��',
@@ -138,10 +147,10 @@
             label: '缁撴竻鐘舵��',
             options: [
               { value: 0, label: '寰呮敹娆�' },
-              { value: 1, label: '宸茬粨绠�' },
+              { value: 1, label: '宸茬粨娓�' },
               { value: 2, label: '閮ㄥ垎缁撴竻' },
-              { value: 3, label: '寰呴��娆�' },
-              { value: 4, label: '寰呬粯娆�' }
+              { value: 3, label: '寰呬粯娆�' },
+              { value: 4, label: '寰呴��娆�' }
             ]
           },
           {

--
Gitblit v1.9.3