From b40f8dfb6ce225bbc133d88e26b9166219b64a31 Mon Sep 17 00:00:00 2001
From: renkang <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 06 十二月 2024 19:26:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/.env | 4 ++--
admin/src/views/contract/components/contractEdit.vue | 2 ++
admin/src/views/finance/components/details.vue | 6 +++---
admin/.env.test | 2 +-
admin/src/views/contract/components/terminateLease.vue | 5 +++++
admin/src/views/finance/payments.vue | 7 ++++++-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java | 9 +++++----
admin/src/views/finance/components/bullDetail.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java | 4 ++--
admin/src/views/finance/components/bullEdit.vue | 5 +++--
admin/src/views/finance/bull.vue | 2 +-
server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java | 2 +-
12 files changed, 32 insertions(+), 18 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/.env.test b/admin/.env.test
index 8690fa3..b641171 100644
--- a/admin/.env.test
+++ b/admin/.env.test
@@ -7,7 +7,7 @@
# VUE_APP_API_URL = 'http://192.168.0.163:10010/'
# 钀嶅
-VUE_APP_API_URL = 'http://192.168.0.105:10010/'
+VUE_APP_API_URL = 'http://192.168.0.108:10010/'
# 娴嬭瘯鏈嶅姟
# VUE_APP_API_URL = 'https://dmtest.ahapp.net/gateway_interface'
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index cc88366..a2ae60c 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -843,6 +843,8 @@
this.$emit('close')
} else {
this.activeTabs = 0
+ this.zlList = []
+ this.wyList = []
}
}
}
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 de28758..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 })
@@ -219,7 +220,7 @@
this.$refs.selectHouse.open('閫夋嫨鎴挎簮', { contractId: this.form.contractId, type: 0 })
},
getCompanyList () {
- companyList({})
+ companyList({ type: 2, status: 0 })
.then(res => {
this.comparyList = res
})
diff --git a/admin/src/views/finance/components/details.vue b/admin/src/views/finance/components/details.vue
index f349cc1..e8ff47b 100644
--- a/admin/src/views/finance/components/details.vue
+++ b/admin/src/views/finance/components/details.vue
@@ -7,7 +7,7 @@
<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 type="danger" v-if="info.status === 0" @click="closeDW()">鍏抽棴娴佹按</el-button>
+ <el-button type="danger" v-if="info.status !== 1 || !['3','4'].includes(info.contractStatus)" @click="closeDW()">鍏抽棴娴佹按</el-button>
</div>
<div class="line"></div>
<div class="main">
@@ -225,13 +225,13 @@
tabsClick(val) {
this.activeTabs = val
},
- closeDW (id) {
+ closeDW () {
this.$confirm('纭鍏抽棴姝ゆ祦姘村悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
type: 'warning'
}).then(() => {
- close(id)
+ close(this.info.id)
.then(res => {
this.getDetails()
})
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))
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
index 1ceeb44..0b05aba 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/dao/business/model/YwContractBill.java
@@ -53,8 +53,8 @@
private String title;
@ApiModelProperty(value = "璐﹀崟缂栧彿")
private String code;
- @ApiModelProperty(value = "绫诲瀷 0鍚堝悓璐﹀崟 1鑷缓璐﹀崟", example = "1")
- @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鑷缓璐﹀崟;")
+ @ApiModelProperty(value = "绫诲瀷 0鍚堝悓璐﹀崟 1鑷缓璐﹀崟 2閫�娆捐处鍗�", example = "1")
+ @ExcelColumn(name="璐﹀崟鏉ユ簮",index = 12,width = 6,valueMapping = "0=鍚堝悓璐﹀崟;1=鑷缓璐﹀崟;2=閫�娆捐处鍗�")
private Integer type;
@ApiModelProperty(value = "鐘舵�� 0寮�濮嬶紱1鍏抽棴锛�", example = "1")
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
index 7bb86c9..00daa7a 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractBillServiceImpl.java
@@ -210,7 +210,8 @@
);
//鎴挎簮鏁版嵁
- ywContractBill.setYwContractRoomList(ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
+ ywContractBill.setYwContractRoomList(
+ ywContractRoomMapper.selectJoinList(YwContractRoom.class,new MPJLambdaWrapper<YwContractRoom>()
.selectAll(YwContractRoom.class)
.selectAs(YwProject::getName,YwRoom::getProjectName)
.selectAs(YwFloor::getName,YwRoom::getFloorName)
@@ -223,8 +224,8 @@
.leftJoin(YwBuilding.class,YwBuilding::getId,YwRoom::getBuildingId)
.eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE),YwContractRoom::getContractId,id)
.eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ONE),YwContractRoom::getType,Constants.ONE)
- .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO),YwContractRoom::getContractId,ywContractBill.getContractId())
- .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO),YwContractRoom::getType,Constants.ZERO)
+ .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO) || Constants.equalsInteger(ywContractBill.getType(),Constants.TWO),YwContractRoom::getContractId,ywContractBill.getContractId())
+ .eq(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)| Constants.equalsInteger(ywContractBill.getType(),Constants.TWO),YwContractRoom::getType,Constants.ZERO)
));
//鏀舵敮璁板綍
@@ -394,7 +395,7 @@
for (YwContractBill ywContractBill:ywContractBillList) {
if(Constants.equalsInteger(ywContractBill.getType(),Constants.ZERO)){
ywContractBill.setYwContractRoomList(
- ywContractRoomList.stream().filter(i->Constants.equalsInteger(i.getType(),Constants.ZERO)&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())
+ ywContractRoomList.stream().filter(i->(Constants.equalsInteger(i.getType(),Constants.TWO)||Constants.equalsInteger(i.getType(),Constants.ZERO))&&Constants.equalsInteger(i.getContractId(),ywContractBill.getContractId())).collect(Collectors.toList())
);
}else{
ywContractBill.setYwContractRoomList(
diff --git a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
index a81b54e..13d35ef 100644
--- a/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
+++ b/server/visits/dmvisit_service/src/main/java/com/doumee/service/business/impl/YwContractServiceImpl.java
@@ -485,7 +485,7 @@
for(YwContractBill addBill : param.getAddBillList()){
addBill.setIsdeleted(Constants.ZERO);
addBill.setContractId(param.getId());
- addBill.setType(Constants.ONE);
+ addBill.setType(Constants.TWO);
addBill.setStatus(Constants.ZERO);
addBill.setTotleFee(addBill.getReceivableFee());
addBill.setCompanyId(param.getCompanyId());
--
Gitblit v1.9.3