From bbcade0aa73354bf775fe91f88dd618bab6ea4a4 Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期二, 03 十二月 2024 19:14:15 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/contract/components/contractDetail.vue | 21 ++++++++++++++++++---
1 files changed, 18 insertions(+), 3 deletions(-)
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index d7beef3..f13cf9a 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -2,6 +2,7 @@
<GlobalWindow
:title="title"
:visible.sync="visible"
+ :withFooter="false"
:confirm-working="isWorking"
@close="close"
@confirm="confirm">
@@ -9,9 +10,10 @@
<div class="left">
<span class="mr10">鍗曚綅鍚嶇О锛歿{info.renterName}}</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="success" v-if="info.status === 2">宸插埌鏈�</el-tag>
- <el-tag type="success" v-if="info.status === 3">宸查��绉�</el-tag>
+ <el-tag type="success" v-if="info.status === 1">姝ｅ父鎵ц涓�</el-tag>
+ <el-tag type="info" v-if="info.status === 2">宸插埌鏈�</el-tag>
+ <el-tag type="info" v-if="info.status === 3">閫�绉熺粨绠椾腑</el-tag>
+ <el-tag type="info" v-if="info.status === 4">宸查��绉�</el-tag>
</div>
<el-button plain type="danger" v-if="[0, 1, 2].includes(info.status)" @click="refund">閫�绉�</el-button>
</div>
@@ -178,6 +180,7 @@
label="璐﹀崟閲戦">
</el-table-column>
<el-table-column
+ :key="Date.now()"
prop="receivableFee"
label="搴旀敹閲戦">
</el-table-column>
@@ -188,6 +191,11 @@
<el-table-column
prop="needReceivableFee"
label="闇�鏀堕噾棰�">
+ <template slot-scope="{row}">
+ <el-tag type="success" v-if="row.needReceivableFee > 0">鏀�</el-tag>
+ <el-tag type="warning" v-else>浠�</el-tag>
+ <span style="margin-left: 10px;">{{Math.abs(row.needReceivableFee)}}</span>
+ </template>
</el-table-column>
<el-table-column
label="璐﹀崟鏉ユ簮">
@@ -243,14 +251,20 @@
border
style="width: 100%">
<el-table-column
+ :key="Date.now()"
+ width="200"
prop="param1"
label="鎿嶄綔浜�">
</el-table-column>
<el-table-column
+ :key="Date.now()"
+ width="200"
prop="createDate"
label="鎿嶄綔鏃堕棿">
</el-table-column>
<el-table-column
+ :key="Date.now()"
+ width="150"
label="鎿嶄綔">
<template slot-scope="{row}">
<span v-if="row.objType === 0">宸ュ崟鍒涘缓</span>
@@ -262,6 +276,7 @@
</template>
</el-table-column>
<el-table-column
+ :key="Date.now()"
prop="content"
label="鎿嶄綔鍐呭">
</el-table-column>
--
Gitblit v1.9.3