From d492850f1cc64ddcfaf43798af9c76c2505414fd Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 24 一月 2025 18:24:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/pendingBills.vue | 45 ++++++++++++++++++++++++++++++++-------------
1 files changed, 32 insertions(+), 13 deletions(-)
diff --git a/admin/src/views/contract/components/pendingBills.vue b/admin/src/views/contract/components/pendingBills.vue
index 1ecd98f..b694d96 100644
--- a/admin/src/views/contract/components/pendingBills.vue
+++ b/admin/src/views/contract/components/pendingBills.vue
@@ -10,19 +10,19 @@
<div class="zd_list">
<div class="zd_list_row">
<span>寰呮敹娆捐处鍗曟暟</span>
- <span>2</span>
+ <span>{{info.inAmount || 0}}</span>
</div>
<div class="zd_list_row">
<span>寰呮敹娆鹃噾棰�</span>
- <span>锟�247.00</span>
+ <span>锟{info.inFee || 0}}</span>
</div>
<div class="zd_list_row">
<span>寰呬粯娆捐处鍗曟暟</span>
- <span>3</span>
+ <span>{{info.payAmount || 0}}</span>
</div>
<div class="zd_list_row">
<span>寰呬粯娆鹃噾棰�</span>
- <span>锟�247.00</span>
+ <span>锟{info.payFee || 0}}</span>
</div>
</div>
<div class="zd_content">
@@ -30,7 +30,7 @@
<span>璐﹀崟</span>
</div>
<el-table
- :data="tableData"
+ :data="info.ywContractBillList"
border
style="width: 100%">
<el-table-column
@@ -38,27 +38,38 @@
label="璐﹀崟缂栧彿">
</el-table-column>
<el-table-column
- prop="name"
label="璐圭敤绫诲瀷">
+ <template slot-scope="{row}">
+ <span v-if="row.costType === 0">绉熻祦璐�</span>
+ <span v-if="row.costType === 1">鐗╀笟璐�</span>
+ <span v-if="row.costType === 2">绉熻祦鎶奸噾</span>
+ <span v-if="row.costType === 3">鐗╀笟鎶奸噾</span>
+ <span v-if="row.costType === 4">姘寸數璐�</span>
+ <span v-if="row.costType === 5">鏉傞」璐�</span>
+ <span v-if="row.costType === 6">鍏朵粬</span>
+ <span v-if="row.costType === 7">淇濊瘉閲�</span>
+ </template>
</el-table-column>
<el-table-column
- prop="address"
label="璁¤垂鍛ㄦ湡">
+ <template slot-scope="{row}">
+ {{row.startDate}}~{{row.endDate}}
+ </template>
</el-table-column>
<el-table-column
- prop="address"
+ prop="receivableFee"
label="搴旀敹浠橀噾棰�/鍘熷搴旀敹浠�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="actReceivableFee"
label="瀹炴敹/浠橀噾棰�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="needReceivableFee"
label="闇�鏀�/浠橀噾棰�">
</el-table-column>
<el-table-column
- prop="address"
+ prop="receivableFee"
label="搴旀敹/浠樻棩鏈�">
</el-table-column>
</el-table>
@@ -70,6 +81,7 @@
<script>
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
+ import { getWaitDealList } from '@/api/ywContractBill'
export default {
name: 'pendingBills',
components: {
@@ -78,11 +90,18 @@
extends: BaseOpera,
data () {
return {
- tableData: []
+ info: []
}
},
methods: {
-
+ open (title, contractId) {
+ this.title = title
+ getWaitDealList(contractId)
+ .then(res => {
+ this.info = res
+ this.visible = true
+ })
+ }
}
}
</script>
--
Gitblit v1.9.3