From dd6ac5d0620854d5fa91438214420b3579d0ac4e Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 十二月 2024 19:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/.env | 4 ++--
admin/src/views/contract/components/terminateLease.vue | 5 +++++
admin/src/views/finance/payments.vue | 7 ++++++-
admin/src/views/finance/components/bullDetail.vue | 2 +-
admin/src/views/finance/components/bullEdit.vue | 3 ++-
admin/src/views/finance/bull.vue | 2 +-
6 files changed, 17 insertions(+), 6 deletions(-)
diff --git a/admin/.env b/admin/.env
index c471f0b..18495ab 100644
--- a/admin/.env
+++ b/admin/.env
@@ -3,8 +3,8 @@
# 璺敱鏂瑰紡
VUE_APP_ROUTER_MODE = 'hash'
-# 椤圭洰涓婁笅鏂囪矾寰� fn_admin/#/
-VUE_APP_CONTEXT_PATH = '/'
+# 椤圭洰涓婁笅鏂囪矾寰�
+VUE_APP_CONTEXT_PATH = '/fn_admin/#/'
# 鎺ュ彛鍓嶇紑
VUE_APP_API_PREFIX = '/gateway_interface'
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index b4e60cb..751ac20 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -463,6 +463,11 @@
flex-direction: column;
border-bottom: 1px solid #ececec;
margin-bottom: 15px;
+ position: sticky;
+ top: 0;
+ left: 0;
+ z-index: 999;
+ background: #ffffff;
span {
color: black;
font-size: 16px;
diff --git a/admin/src/views/finance/bull.vue b/admin/src/views/finance/bull.vue
index e0e4de8..f2344d0 100644
--- a/admin/src/views/finance/bull.vue
+++ b/admin/src/views/finance/bull.vue
@@ -147,7 +147,7 @@
label: '缁撴竻鐘舵��',
options: [
{ value: 0, label: '寰呮敹娆�' },
- { value: 1, label: '宸茬粨绠�' },
+ { value: 1, label: '宸茬粨娓�' },
{ value: 2, 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 ba7206d..ac60691 100644
--- a/admin/src/views/finance/components/bullDetail.vue
+++ b/admin/src/views/finance/components/bullDetail.vue
@@ -4,7 +4,7 @@
<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>
+ <span class="mr10">{{info.billType === 0 ? '鏀舵鏂�' : '浠樻鏂�'}}锛歿{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>
diff --git a/admin/src/views/finance/components/bullEdit.vue b/admin/src/views/finance/components/bullEdit.vue
index acf1da2..40128b5 100644
--- a/admin/src/views/finance/components/bullEdit.vue
+++ b/admin/src/views/finance/components/bullEdit.vue
@@ -177,10 +177,11 @@
changeContract (e) {
this.form.renterName = this.contract.filter(item => {
if (item.id === e) {
+ this.form.companyId = item.companyId
return item
}
})[0].renterName
- this.getHouseDate()
+ // this.getHouseDate()
},
getHouseDate () {
getContractRoom({ contractId: this.form.contractId, type: 0 })
diff --git a/admin/src/views/finance/payments.vue b/admin/src/views/finance/payments.vue
index 037813b..212bc99 100644
--- a/admin/src/views/finance/payments.vue
+++ b/admin/src/views/finance/payments.vue
@@ -45,7 +45,7 @@
<el-table-column label="鎿嶄綔" min-width="190" fixed="right">
<template slot-scope="{row}">
<el-button type="text" @click="$refs.details.open('鏀舵敮娴佹按璇︽儏', row.id)">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" @click="closeDW(row.id)" v-if="row.status !== 1 || !['3','4'].includes(row.contractStatus)">鍏抽棴娴佹按</el-button>
+ <el-button type="text" @click="closeDW(row.id)" v-if="isShow(row.status, row.contractStatus)">鍏抽棴娴佹按</el-button>
</template>
</el-table-column>
</el-table>
@@ -123,6 +123,11 @@
this.getList()
},
methods: {
+ isShow (status, contractStatus) {
+ if (status === 1) return false
+ if (contractStatus === '3' || contractStatus === '4') return false
+ return true
+ },
getList(page) {
const { pagination, filters } = this
let form = JSON.parse(JSON.stringify(filters))
--
Gitblit v1.9.3