From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/pendingBills.vue | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/contract/components/pendingBills.vue b/admin/src/views/contract/components/pendingBills.vue
index b694d96..64496d5 100644
--- a/admin/src/views/contract/components/pendingBills.vue
+++ b/admin/src/views/contract/components/pendingBills.vue
@@ -34,8 +34,10 @@
border
style="width: 100%">
<el-table-column
- prop="date"
label="璐﹀崟缂栧彿">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="handleDetail(row.id)">{{row.code}}</el-button>
+ </template>
</el-table-column>
<el-table-column
label="璐圭敤绫诲瀷">
@@ -65,16 +67,24 @@
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="planPayDate"
label="搴旀敹/浠樻棩鏈�">
</el-table-column>
</el-table>
</div>
</div>
+ <!-- 璐﹀崟璇︽儏 -->
+ <Detail ref="DetailRef" />
</GlobalWindow>
</template>
@@ -82,10 +92,12 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import { getWaitDealList } from '@/api/ywContractBill'
+ import Detail from '../../finance/components/bullDetail.vue'
export default {
name: 'pendingBills',
components: {
- GlobalWindow
+ GlobalWindow,
+ Detail
},
extends: BaseOpera,
data () {
@@ -101,6 +113,9 @@
this.info = res
this.visible = true
})
+ },
+ handleDetail (id) {
+ this.$refs.DetailRef.open('璐﹀崟璇︽儏', id)
}
}
}
--
Gitblit v1.9.3