From dc1af3f3cacd1e917076aa16ab2d74225f547c4d Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期三, 04 十二月 2024 17:35:44 +0800
Subject: [PATCH] 改bug
---
admin/src/views/contract/components/contractEdit.vue | 12 +
admin/src/components/common/GlobalWindow.vue | 4
admin/src/views/finance/components/details.vue | 2
admin/src/views/contract/components/terminateLease.vue | 34 +----
admin/src/views/finance/components/flowingWater.vue | 7
admin/src/views/finance/components/bullDetail.vue | 130 ++++++++++++---------
admin/src/views/contract/contractList.vue | 10 -
admin/src/views/finance/bull.vue | 16 +-
admin/src/views/contract/components/contractDetail.vue | 108 +++++++++++++----
9 files changed, 189 insertions(+), 134 deletions(-)
diff --git a/admin/src/components/common/GlobalWindow.vue b/admin/src/components/common/GlobalWindow.vue
index 376a5b7..b734be2 100644
--- a/admin/src/components/common/GlobalWindow.vue
+++ b/admin/src/components/common/GlobalWindow.vue
@@ -125,11 +125,11 @@
.window__body {
// width: 1100px;
// margin: 0 auto;
- // background-color: #fff;
+ background-color: #fff;
width: 100%;
height: 100%;
overflow-y: auto;
- padding: 12px 16px;
+ padding: 0 16px 12px 16px;
// 鏍囩
// .el-form-item__label {
// float: none;
diff --git a/admin/src/views/contract/components/contractDetail.vue b/admin/src/views/contract/components/contractDetail.vue
index f13cf9a..730f2c2 100644
--- a/admin/src/views/contract/components/contractDetail.vue
+++ b/admin/src/views/contract/components/contractDetail.vue
@@ -6,22 +6,25 @@
:confirm-working="isWorking"
@close="close"
@confirm="confirm">
- <div class="home_title" v-if="info">
- <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="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 style="width: 100%; position: sticky; top: 0; left: 0; z-index: 999; background: #ffffff;">
+ <div class="home_title" v-if="info">
+ <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="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>
- <el-button plain type="danger" v-if="[0, 1, 2].includes(info.status)" @click="refund">閫�绉�</el-button>
- </div>
- <div class="remark" v-if="info">{{info.remark}}</div>
- <div class="tabs">
- <div class="tab" :class="{ active: activeTabs === 0 }" @click="tabsClick(0)">鍚堝悓淇℃伅</div>
- <div class="tab" :class="{ active: activeTabs === 1 }" @click="tabsClick(1)">鍏宠仈璐﹀崟</div>
- <div class="tab" :class="{ active: activeTabs === 2 }" @click="tabsClick(2)">鎿嶄綔璁板綍</div>
+ <div class="remark" v-if="info">{{info.remark}}</div>
+ <div class="remark" v-if="info && info.status === 3">{{info.btRemark}}</div>
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTabs === 0 }" @click="tabsClick(0)">鍚堝悓淇℃伅</div>
+ <div class="tab" :class="{ active: activeTabs === 1 }" @click="tabsClick(1)">鍏宠仈璐﹀崟</div>
+ <div class="tab" :class="{ active: activeTabs === 2 }" @click="tabsClick(2)">鎿嶄綔璁板綍</div>
+ </div>
</div>
<div class="main" v-if="activeTabs === 0 && info">
<div class="title">鍩虹淇℃伅</div>
@@ -40,7 +43,7 @@
</div>
<div class="item">
<div class="la">鍚堝悓绉熻祦鏁�</div>
- <div class="val">{{ info.totalArea }}</div>
+ <div class="val">{{ info.totalArea }}銕�</div>
</div>
<div class="item">
<div class="la">鎵�灞炲叕鍙�</div>
@@ -99,7 +102,7 @@
<div class="list" style="background: #F7F7F7; padding: 15px 20px;" v-if="info.type === 2 || info.type === 0">
<div class="item">
<div class="la">鎶奸噾閲戦</div>
- <div class="val">{{ info.zlDeposit }}</div>
+ <div class="val">{{ info.zlDeposit }}鍏�</div>
</div>
<div class="item">
<div class="la">浠樻鏂瑰紡</div>
@@ -116,14 +119,22 @@
<el-table :data="info.zlDetailList" stripe style="margin-bottom: 20px;" v-if="info.type === 2 || info.type === 0">
<el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100" show-overflow-tooltip />
<el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100" show-overflow-tooltip />
- <el-table-column prop="price" label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip />
- <el-table-column prop="advanceDays" label="浠樻鎻愬墠澶╂暟" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.price}} {{returnUnit(row.circleType)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="浠樻鎻愬墠澶╂暟" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.advanceDays}}澶�
+ </template>
+ </el-table-column>
</el-table>
<div class="title" v-if="info.type === 1 || info.type === 0">鐗╀笟璐规潯娆�</div>
<div class="list" style="background: #F7F7F7; padding: 15px 20px;" v-if="info.type === 1 || info.type === 0">
<div class="item">
<div class="la">鎶奸噾閲戦</div>
- <div class="val">{{ info.wyDeposit }}</div>
+ <div class="val">{{ info.wyDeposit }}鍏�</div>
</div>
<div class="item">
<div class="la">浠樻鏂瑰紡</div>
@@ -140,13 +151,25 @@
<el-table :data="info.wyDetailList" stripe style="margin-bottom: 20px;" v-if="info.type === 1 || info.type === 0">
<el-table-column prop="startDate" label="寮�濮嬫棩鏈�" min-width="100" show-overflow-tooltip />
<el-table-column prop="endDate" label="缁撴潫鏃ユ湡" min-width="100" show-overflow-tooltip />
- <el-table-column prop="price" label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip />
- <el-table-column prop="advanceDays" label="浠樻鎻愬墠澶╂暟" min-width="100" show-overflow-tooltip />
+ <el-table-column label="鍚堝悓鍗曚环" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.price}} {{returnUnit(row.circleType)}}
+ </template>
+ </el-table-column>
+ <el-table-column label="浠樻鎻愬墠澶╂暟" min-width="100" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ {{row.advanceDays}}澶�
+ </template>
+ </el-table-column>
</el-table>
<div class="title">鍚堝悓闄勪欢</div>
<div class="list">
<el-table :data="info.fileList" stripe>
- <el-table-column prop="name" label="闄勪欢鍚嶇О" show-overflow-tooltip />
+ <el-table-column label="闄勪欢鍚嶇О" show-overflow-tooltip>
+ <template slot-scope="{row}">
+ <u style="color: #0c6ce3; cursor: pointer;" @click="xiazai(row.fileurlFull)">{{row.name}}</u>
+ </template>
+ </el-table-column>
<el-table-column prop="userName" label="鎿嶄綔浜�" show-overflow-tooltip />
<el-table-column prop="createDate" label="鎿嶄綔鏃堕棿" show-overflow-tooltip />
</el-table>
@@ -182,18 +205,22 @@
<el-table-column
:key="Date.now()"
prop="receivableFee"
- label="搴旀敹閲戦">
+ :label="`搴�${type === 0 ? '鏀�' : '浠�'}閲戦`">
</el-table-column>
<el-table-column
prop="actReceivableFee"
- label="瀹炴敹閲戦">
+ :label="`瀹�${type === 0 ? '鏀�' : '浠�'}閲戦`">
</el-table-column>
<el-table-column
- prop="needReceivableFee"
- label="闇�鏀堕噾棰�">
+ :label="`闇�${type === 0 ? '鏀�' : '浠�'}閲戦`">
<template slot-scope="{row}">
- <el-tag type="success" v-if="row.needReceivableFee > 0">鏀�</el-tag>
- <el-tag type="warning" v-else>浠�</el-tag>
+ <template v-if="type === 0">
+ <el-tag type="success" v-if="row.needReceivableFee > 0">鏀�</el-tag>
+ <el-tag type="warning" v-else-if="row.needReceivableFee < 0">浠�</el-tag>
+ </template>
+ <template v-else>
+ <el-tag type="warning" v-if="row.needReceivableFee !== 0">浠�</el-tag>
+ </template>
<span style="margin-left: 10px;">{{Math.abs(row.needReceivableFee)}}</span>
</template>
</el-table-column>
@@ -205,6 +232,7 @@
</template>
</el-table-column>
<el-table-column
+ width="200"
label="璁¤垂鍛ㄦ湡">
<template slot-scope="{row}">
{{ row.startDate }} ~ {{ row.endDate }}
@@ -325,6 +353,27 @@
this.id = id
this.getData()
},
+ xiazai (url) {
+ window.open(url)
+ },
+ returnUnit (type) {
+ switch (type) {
+ case 0:
+ return '鍏�/m虏路澶�'
+ case 1:
+ return '鍏�/m虏路鏈�'
+ case 2:
+ return '鍏�/m虏路骞�'
+ case 3:
+ return '鍏�/澶�'
+ case 4:
+ return '鍏�/鏈�'
+ case 5:
+ return '鍏�/骞�'
+ case 6:
+ return '鍏�/鍦�'
+ }
+ },
getData () {
getById(this.id)
.then(res => {
@@ -342,6 +391,7 @@
capacity: this.pageSize,
page: this.page,
model: {
+ status: 0,
billType: this.type,
contractId: this.info.id
}
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index 6dd8331..66c0851 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -82,6 +82,12 @@
:default-expanded-keys="ids"
:default-checked-keys="ids"
:props="{ children: 'projectDataVOList', label: 'name' }">
+ <span class="custom-tree-node" style="width: 100%; display: flex; align-items: center; justify-content: space-between;" slot-scope="{ node, data }">
+ <span>{{ data.name }}</span>
+ <span style="color: #2080f7;" v-if="data.lv === 3">
+ {{ data.area }}銕�
+ </span>
+ </span>
</el-tree>
</div>
</div>
@@ -173,7 +179,7 @@
</el-table-column>
<el-table-column label="鏈熸暟" align="center" show-overflow-tooltip>
<template slot-scope="{row}">
- <el-tag type="success">{{row.sortnum}}</el-tag>
+ <el-tag type="success" v-if="row.sortnum > 0">{{row.sortnum}}</el-tag>
</template>
</el-table-column>
<el-table-column label="鍖洪棿" align="center" show-overflow-tooltip>
@@ -256,7 +262,7 @@
</el-table-column>
<el-table-column label="鏈熸暟" align="center" show-overflow-tooltip>
<template slot-scope="{row}">
- <el-tag type="success">{{row.sortnum}}</el-tag>
+ <el-tag type="success" v-if="row.sortnum > 0">{{row.sortnum}}</el-tag>
</template>
</el-table-column>
<el-table-column label="鍖洪棿" align="center" show-overflow-tooltip>
@@ -484,7 +490,7 @@
if (!num) {
return `${year}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
} else {
- return `${year + 1}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day : day}`;
+ return `${year + 1}-${month < 10 ? '0' + month : month}-${day < 10 ? '0' + day - 1 : day - 1}`;
}
},
clearData () {
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 23f9b2f..83108ee 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -84,6 +84,7 @@
label="璐﹀崟缂栧彿">
</el-table-column>
<el-table-column
+ width="100"
label="璐圭敤绫诲瀷">
<template slot-scope="{row}">
<span v-if="row.costType === 0">绉熻祦璐�</span>
@@ -103,13 +104,14 @@
label="搴旀敹浠橀噾棰�/鍘熷搴旀敹浠�">
<template v-slot="{row}">
<div style="display: flex; align-items: center;">
- <el-input v-model="row.receivableFee" @input="changeReceivableFee($event, row)" placeholder="璇疯緭鍏ュ唴瀹�" style="width: 90px;"></el-input>
+ <el-input v-model="row.receivableFee" @input="changeReceivableFee($event, row)" placeholder="璇疯緭鍏ュ唴瀹�" style="flex: 1;"></el-input>
<span style="margin: 0 10px;">/</span>
{{row.receivableFeeCopy}}
</div>
</template>
</el-table-column>
<el-table-column
+ width="120"
prop="actReceivableFee"
label="瀹炴敹/浠橀噾棰�">
</el-table-column>
@@ -179,7 +181,7 @@
</el-table-column>
</el-table>
<div class="footer">
- 鍚堣搴旀敹锛�<span>{{receivable.toFixed(2)}}</span>鍏冿紝 鍚堣搴斾粯锛�<span>{{meet.toFixed(2)}}</span>鍏�
+ 鍚堣搴旀敹锛�<span>{{receivable}}</span>鍏冿紝 鍚堣搴斾粯锛�<span>{{meet}}</span>鍏�
</div>
</div>
<!-- 鍒涘缓鏀舵璐﹀崟 -->
@@ -247,26 +249,6 @@
loading: false
}
},
- watch: {
- // info: {
- // deep: true,
- // immediate: true,
- // handler(news, olds) {
- // const arr = [...this.info.terminateList, ...this.info.depositList]
- // let total1 = 0
- // let total2 = 0
- // arr.forEach(item => {
- // if (item.billType === 0) {
- // total1 += Number(item.price)
- // } else if (item.billType === 1) {
- // total2 += Number(item.price)
- // }
- // })
- // this.receivable = total1
- // this.meet = total2
- // }
- // }
- },
methods: {
open (title, info) {
this.title = title
@@ -279,12 +261,12 @@
this.$refs.form.resetFields()
})
this.info.canBackRentBills.forEach(item => {
- this.$set(item, 'receivableFeeCopy', item.receivableFee)
- this.$set(item, 'receivableFee', item.needReceivableFee)
if ([2,3,7].includes(item.costType)) {
this.$set(item, 'billType', 1)
this.$set(item, 'price', item.actReceivableFee)
} else {
+ this.$set(item, 'receivableFeeCopy', item.receivableFee)
+ this.$set(item, 'receivableFee', item.needReceivableFee)
this.$set(item, 'price', item.needReceivableFee)
}
})
@@ -315,8 +297,8 @@
total2 += Number(item.price)
}
})
- this.receivable = total1
- this.meet = total2
+ this.receivable = total1.toFixed(2)
+ this.meet = total2.toFixed(2)
},
getDay () {
const today = new Date();
diff --git a/admin/src/views/contract/contractList.vue b/admin/src/views/contract/contractList.vue
index 13a9176..089e6f5 100644
--- a/admin/src/views/contract/contractList.vue
+++ b/admin/src/views/contract/contractList.vue
@@ -15,14 +15,8 @@
<el-table-column prop="zlFirstPrice" label="绉熻祦鍗曚环" min-width="100" show-overflow-tooltip>
<template slot-scope="{row}">
<div style="display: flex; align-items: center;">
- <span>{{row.zlFirstPrice}}</span>
- <span v-if="row.zlFirstCircle === 0">鍏�/m虏路澶�</span>
- <span v-if="row.zlFirstCircle === 1">鍏�/m虏路鏈�</span>
- <span v-if="row.zlFirstCircle === 2">鍏�/澶�</span>
- <span v-if="row.zlFirstCircle === 3">鍏�/鏈�</span>
- <span v-if="row.zlFirstCircle === 4">鍏�/骞�</span>
- <span v-if="row.zlFirstCircle === 5">鍏�/m虏路骞�</span>
- <span v-if="row.zlFirstCircle === 6">鍏�/鍦�</span>
+ <span>{{row.zlFirstPrice || row.wyFirstPrice}}</span>
+ <span>{{row.zlFirstCircleStr || row.wyFirstCircleStr}}</span>
</div>
</template>
</el-table-column>
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index 4c7923a..e0e4de8 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -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>
@@ -145,8 +149,8 @@
{ value: 0, label: '寰呮敹娆�' },
{ value: 1, label: '宸茬粨绠�' },
{ value: 2, label: '閮ㄥ垎缁撴竻' },
- { value: 3, label: '寰呴��娆�' },
- { value: 4, label: '寰呬粯娆�' }
+ { value: 3, label: '寰呬粯娆�' },
+ { value: 4, label: '寰呴��娆�' }
]
},
{
diff --git a/admin/src/views/finance/components/bullDetail.vue b/admin/src/views/finance/components/bullDetail.vue
index bfea17f..be49e7b 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -1,63 +1,65 @@
<template>
<GlobalWindow :title="'璐﹀崟璇︽儏'" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
- <div class="home_title">
- <div class="left">
- <span class="mr10">浠樻鏂癸細{{info.customerName}}</span>
- <el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
- <el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
+ <div style="width: 100%; position: sticky; top: 0; left: 0; z-index: 999; background: #ffffff;">
+ <div class="home_title">
+ <div class="left">
+ <span class="mr10">浠樻鏂癸細{{info.customerName}}</span>
+ <el-tag type="success" v-if="info.status === 0">寮�鍚�</el-tag>
+ <el-tag type="info" v-if="info.status === 1">鍏抽棴</el-tag>
+ </div>
+ <el-button plain type="primary" v-if="![1].includes(info.payStatus)" @click="$refs.flowingWater.open('鍒涘缓鏀舵敮娴佹按', {
+ billType: returnBillType(),
+ billId: info.id,
+ costType: info.costType,
+ receivableFee: Math.abs(info.needReceivableFee),
+ costTypeName: returnText(info.costType),
+ contractCode: info.contractCode,
+ contractId: info.contractId,
+ startDate: info.startDate,
+ endDate: info.endDate,
+ multifileList: [],
+ date: `${info.startDate} ~ ${info.endDate}`,
+ companyId: info.companyId,
+ companyName: info.companyName,
+ actReceivableFee: Math.abs(info.needReceivableFee),
+ needReceivableFeeCopy: info.needReceivableFee
+ })">鏂板缓鏀舵敮娴佹按</el-button>
</div>
- <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,
- startDate: info.startDate,
- endDate: info.endDate,
- multifileList: [],
- date: `${info.startDate} ~ ${info.endDate}`,
- companyId: info.companyId,
- companyName: info.companyName,
- actReceivableFee: info.actReceivableFee
- })">鏂板缓鏀舵敮娴佹按</el-button>
- </div>
- <div class="line"></div>
- <div class="main">
- <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
- <div class="item" style="flex: 1;">
- <div class="la">缁撴竻鐘舵��</div>
- <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 0">寰呮敹娆�</div>
- <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 1">宸茬粨娓�</div>
- <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 2">閮ㄥ垎缁撴竻</div>
- <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 3">寰呬粯娆�</div>
- <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 4">寰呴��娆�</div>
- <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 5">宸插叧闂�</div>
- </div>
- <div class="item" style="flex: 1;">
- <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">瀹瀧{info.billType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
- <div class="val" style="margin-top: 10px;">{{info.actReceivableFee}}</div>
- </div>
- <div class="item" style="flex: 1;">
- <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">搴攞{info.billType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
- <div class="val" style="margin-top: 10px;">{{info.planPayDate}}</div>
+ <div class="line"></div>
+ <div class="main">
+ <div class="list" style="background: rgba(0,0,0,0); padding: 0; margin-bottom: 0;">
+ <div class="item" style="flex: 1;">
+ <div class="la">缁撴竻鐘舵��</div>
+ <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 0">寰呮敹娆�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 1">宸茬粨娓�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 2">閮ㄥ垎缁撴竻</div>
+ <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 3">寰呬粯娆�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 4">寰呴��娆�</div>
+ <div class="val" style="margin-top: 10px;" v-if="info.payStatus === 5">宸插叧闂�</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <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">瀹瀧{info.billType === 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+ <div class="val" style="margin-top: 10px;">{{info.actReceivableFee}}</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <div class="la">闇�{{info.needReceivableFee > 0 ? '鏀�' : '浠�'}}閲戦锛堝厓锛�</div>
+ <div class="val" style="margin-top: 10px;">{{Math.abs(info.needReceivableFee)}}</div>
+ </div>
+ <div class="item" style="flex: 1;">
+ <div class="la">搴攞{info.billType === 0 ? '鏀�' : '浠�'}}鏃ユ湡</div>
+ <div class="val" style="margin-top: 10px;">{{info.planPayDate}}</div>
+ </div>
</div>
</div>
- </div>
- <div class="tabs">
- <div class="tab" :class="{ active: activeTabs == 0 }" @click="tabsClick(0)">鍩虹淇℃伅</div>
-<!-- <div class="tab" :class="{ active: activeTabs == 1 }" @click="tabsClick(1)">璐﹀崟鏄庣粏</div>-->
- <div class="tab" :class="{ active: activeTabs == 2 }" @click="tabsClick(2)">鏀舵敮娴佹按</div>
+ <div class="tabs">
+ <div class="tab" :class="{ active: activeTabs == 0 }" @click="tabsClick(0)">鍩虹淇℃伅</div>
+ <div class="tab" :class="{ active: activeTabs == 2 }" @click="tabsClick(2)">鏀舵敮娴佹按</div>
+ </div>
</div>
<div class="main">
<div class="title">鍩虹淇℃伅</div>
@@ -80,7 +82,7 @@
</div>
<div class="item">
<div class="la">鍚堝悓缂栧彿</div>
- <div class="val">{{info.contractCode}}</div>
+ <div class="val" style="color: #2080f7; cursor: pointer;" @click="handleDetail(info.contractId)">{{info.contractCode}}</div>
</div>
<div class="item">
<div class="la">鍒涘缓鏃堕棿</div>
@@ -183,6 +185,8 @@
</div>
<!-- 鍒涘缓娴佹按 -->
<FlowingWater ref="flowingWater" @success="getDetails" @refresh="Refresh" />
+ <!-- 鍚堝悓璇︽儏 -->
+ <ContractDetail ref="ContractDetailRef" />
</GlobalWindow>
</template>
@@ -190,11 +194,13 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import BaseOpera from '@/components/base/BaseOpera'
import FlowingWater from './flowingWater'
+import ContractDetail from '../../contract/components/contractDetail'
import { getYwContractBillById } from '@/api/contract'
export default {
components: {
GlobalWindow,
- FlowingWater
+ FlowingWater,
+ ContractDetail
},
extends: BaseOpera,
data() {
@@ -212,6 +218,9 @@
this.id = id
this.getDetails()
},
+ handleDetail (id) {
+ this.$refs.ContractDetailRef.open('鍚堝悓璇︽儏', id)
+ },
getDetails () {
getYwContractBillById(this.id)
.then(res => {
@@ -219,6 +228,15 @@
this.visible = true
})
},
+ returnBillType () {
+ if (this.info.payStatus === 0) {
+ return 0
+ } else if (this.info.payStatus === 2) {
+ return this.info.billType
+ } else if ([3,4].includes(this.info.payStatus)) {
+ return 1
+ }
+ },
Refresh () {
this.$emit('success')
},
diff --git a/admin/src/views/finance/components/details.vue b/admin/src/views/finance/components/details.vue
index 1336c5a..f349cc1 100644
--- a/admin/src/views/finance/components/details.vue
+++ b/admin/src/views/finance/components/details.vue
@@ -1,5 +1,5 @@
<template>
- <GlobalWindow :title="title" :visible.sync="visible" :confirm-working="isWorking" @close="close"
+ <GlobalWindow :title="title" :withFooter="false" :visible.sync="visible" :confirm-working="isWorking" @close="close"
@confirm="confirm">
<div class="home_title">
<div class="left">
diff --git a/admin/src/views/finance/components/flowingWater.vue b/admin/src/views/finance/components/flowingWater.vue
index d011587..c042606 100644
--- a/admin/src/views/finance/components/flowingWater.vue
+++ b/admin/src/views/finance/components/flowingWater.vue
@@ -17,10 +17,10 @@
<el-form-item label="璁¤垂鍛ㄦ湡" required>
<el-input v-model="form.date" disabled placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
- <el-form-item label="搴旀敹閲戦" required>
+ <el-form-item :label="`搴�${form.needReceivableFeeCopy > 0 ? '鏀�' : '浠�'}閲戦`" required>
<el-input v-model="form.receivableFee" disabled placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
- <el-form-item label="瀹炴敹閲戦" prop="actReceivableFee">
+ <el-form-item :label="`瀹�${form.needReceivableFeeCopy > 0 ? '鏀�' : '浠�'}閲戦`" prop="actReceivableFee">
<el-input v-model="form.actReceivableFee" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
<el-form-item label="鍏ヨ处鏃ユ湡" prop="actPayDate">
@@ -110,7 +110,8 @@
remark: '',
accountId: '',
multifileList: [],
- costTypeName: ''
+ costTypeName: '',
+ needReceivableFeeCopy: ''
},
rules: {
receivableFee: [
--
Gitblit v1.9.3