From a40e6a45b2207a9b172b7687ce6e4fe7da8b9ac6 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 16:46:49 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/finance/components/bullDetail.vue | 67 +++++++++------------------------
1 files changed, 18 insertions(+), 49 deletions(-)
diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index f330ec0..bfea17f 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -5,12 +5,13 @@
<div class="left">
<span class="mr10">浠樻鏂癸細{{info.customerName}}</span>
<el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
- <el-tag type="success" v-if="info.status === 1">鍏抽棴</el-tag>
+ <el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
</div>
- <el-button plain type="primary" @click="$refs.flowingWater.open(info.billType === 0 ? '鍒涘缓鏀舵璐﹀崟' : '鍒涘缓浠樻璐﹀崟', {
+ <el-button plain type="primary" @click="$refs.flowingWater.open('鍒涘缓鏀舵敮娴佹按', {
billType: info.billType,
billId: info.id,
costType: info.costType,
+ receivableFee: info.needReceivableFee,
costTypeName: returnText(info.costType),
contractCode: info.contractCode,
contractId: info.contractId,
@@ -36,19 +37,19 @@
<div class="val" style="margin-top: 10px;" v-if="info.payStatus === 5">宸插叧闂�</div>
</div>
<div class="item" style="flex: 1;">
- <div class="la">搴旀敹閲戦锛堝厓锛�</div>
+ <div class="la">搴攞{info.billType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
<div class="val" style="margin-top: 10px;">{{info.receivableFee}}</div>
</div>
<div class="item" style="flex: 1;">
- <div class="la">瀹炴敹閲戦锛堝厓锛�</div>
+ <div class="la">瀹瀧{info.billType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
<div class="val" style="margin-top: 10px;">{{info.actReceivableFee}}</div>
</div>
<div class="item" style="flex: 1;">
- <div class="la">闇�浠橀噾棰濓紙鍏冿級</div>
+ <div class="la">闇�{{info.billType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
<div class="val" style="margin-top: 10px;">{{info.needReceivableFee}}</div>
</div>
<div class="item" style="flex: 1;">
- <div class="la">搴旀敹鏃ユ湡</div>
+ <div class="la">搴攞{info.billType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
<div class="val" style="margin-top: 10px;">{{info.planPayDate}}</div>
</div>
</div>
@@ -62,9 +63,8 @@
<div class="title">鍩虹淇℃伅</div>
<div class="list" style="background: rgba(0,0,0,0); padding: 0;">
<div class="item">
- <div class="la">璐﹀崟绫诲瀷</div>
- <div class="val" v-if="info.billType === 0">鏀舵</div>
- <div class="val" v-if="info.billType === 1">浠樻</div>
+ <div class="la">璐圭敤绫诲瀷</div>
+ <div class="val">{{returnText(info.costType)}}</div>
</div>
<div class="item">
<div class="la">璁¤垂鍛ㄦ湡</div>
@@ -92,7 +92,7 @@
</div>
<div class="item">
<div class="la">缁忓姙浜�</div>
- <div class="val">寮犱笁</div>
+ <div class="val">{{info.realname}}</div>
</div>
<div class="item">
<div class="la">鎵�灞炲叕鍙�</div>
@@ -126,47 +126,13 @@
</template>
</el-table-column>
<el-table-column
- prop="area"
label="闈㈢Н">
+ <template slot-scope="{row}">
+ {{row.area}}銕�
+ </template>
</el-table-column>
</el-table>
</div>
-<!-- <div class="title">璐﹀崟鏄庣粏</div>-->
-<!-- <div class="list" style="background: rgba(0,0,0,0); padding: 0;">-->
-<!-- <el-table-->
-<!-- :data="tableData"-->
-<!-- border-->
-<!-- style="width: 100%">-->
-<!-- <el-table-column-->
-<!-- prop="date"-->
-<!-- label="璐圭敤绫诲瀷">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="name"-->
-<!-- label="搴旀敹/浠橀噾棰�">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="address"-->
-<!-- label="瀹炴敹閲戦">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="address"-->
-<!-- label="闇�鏀堕噾棰�">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="address"-->
-<!-- label="璁¤垂鍛ㄦ湡">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="address"-->
-<!-- label="搴旀敹/浠樻棩鏈�">-->
-<!-- </el-table-column>-->
-<!-- <el-table-column-->
-<!-- prop="address"-->
-<!-- label="澶囨敞">-->
-<!-- </el-table-column>-->
-<!-- </el-table>-->
-<!-- </div>-->
<div class="title">鏀舵敮娴佹按</div>
<div class="list" style="background: rgba(0,0,0,0); padding: 0;">
<el-table
@@ -197,7 +163,7 @@
</template>
</el-table-column>
<el-table-column
- prop="payDateEnd"
+ prop="actPayDate"
label="鍏ヨ处鏃ユ湡">
</el-table-column>
<el-table-column
@@ -216,7 +182,7 @@
</div>
</div>
<!-- 鍒涘缓娴佹按 -->
- <FlowingWater ref="flowingWater" />
+ <FlowingWater ref="flowingWater" @success="getDetails" @refresh="Refresh" />
</GlobalWindow>
</template>
@@ -253,6 +219,9 @@
this.visible = true
})
},
+ Refresh () {
+ this.$emit('success')
+ },
tabsClick(val) {
this.activeTabs = val
},
--
Gitblit v1.9.3