From 16217be9c85f95cb236e639da6e546bb38cdc53d Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 05 十二月 2024 14:45:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/contract/components/contractEdit.vue | 199 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 142 insertions(+), 57 deletions(-)
diff --git a/admin/src/views/contract/components/contractEdit.vue b/admin/src/views/contract/components/contractEdit.vue
index 213d597..3fa3f50 100644
--- a/admin/src/views/contract/components/contractEdit.vue
+++ b/admin/src/views/contract/components/contractEdit.vue
@@ -1,6 +1,4 @@
<template>
-<!-- :text="activeTabs === 0 ? '涓嬩竴姝�' : '鎻愪氦'"-->
-<!-- :backText="activeTabs === 0 ? '杩斿洖' : '涓婁竴姝�'"-->
<GlobalWindow
width="100%"
:title="title"
@@ -42,7 +40,7 @@
<el-date-picker type="date" v-model="form.endDate" @change="getHouseData" :clearable="false" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
</el-form-item>
<el-form-item label="褰掑睘椤圭洰" prop="projectId">
- <el-select v-model="form.projectId" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.projectId" @change="getHouseTree" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in projectList" :key="index" :value="item.id" :label="item.name"></el-option>
</el-select>
</el-form-item>
@@ -65,8 +63,11 @@
<el-input v-model="form.renterName" readonly placeholder="璇风偣鍑婚�夋嫨绉熷" />
</div>
</el-form-item>
- <el-form-item label="鑱旂郴浜�" prop="memberName">
- <el-input v-model="form.memberName" readonly placeholder="璇风偣鍑婚�夋嫨绉熷" />
+ <el-form-item label="鑱旂郴浜�" prop="memberId">
+ <el-select v-model="form.memberId" placeholder="璇烽�夋嫨">
+ <el-option v-for="(item, index) in contactsList" :key="index" :value="item.id" :label="item.name"></el-option>
+ </el-select>
+<!-- <el-input v-model="form.memberName" readonly placeholder="璇风偣鍑婚�夋嫨绉熷" />-->
</el-form-item>
</div>
</el-form>
@@ -81,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>
@@ -117,10 +124,10 @@
<div class="m_title">绉熻祦淇℃伅</div>
<div class="list">
<el-form-item label="鎶奸噾閲戦(鍏�)" prop="zlDeposit">
- <el-input v-model="form.zlDeposit" placeholder="璇疯緭鍏�" v-trim />
+ <el-input v-model="form.zlDeposit" @input="clearzl" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
<el-form-item label="浠樻鏂瑰紡" prop="zlPayType">
- <el-select v-model="form.zlPayType" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.zlPayType" @change="clearzl" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in payMethods" :key="index" :value="item.value" :label="item.name"></el-option>
</el-select>
</el-form-item>
@@ -134,20 +141,26 @@
<el-button type="text" size="medium" @click="addZl">澧炲姞</el-button>
</div>
<div class="list">
- <div v-for="(item, index) in form.zlDetailList" :key="index">
- <el-form-item label="璧峰鏃ユ湡" prop="time">
- <el-date-picker type="daterange" v-model="item.time" @change="getDate1($event, index)" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
+ <div style="width: 100%; display: flex; flex-wrap: wrap;" v-for="(zlDetailList, index) in form.zlDetailList" :key="index">
+ <el-form-item label="璧峰鏃ユ湡" :prop="'zlDetailList.' + index + '.time'" :rules="{
+ required: true, message: '璇烽�夋嫨', trigger: 'blur'
+ }">
+ <el-date-picker type="daterange" v-model="zlDetailList.time" @change="getDate1($event, index)" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
</el-form-item>
- <el-form-item label="鍚堝悓鍗曚环" prop="price">
- <el-input placeholder="璇疯緭鍏�" v-model="item.price" class="input-with-select">
- <el-select v-model="item.circleType" style="width: 150px;" slot="append" placeholder="璇烽�夋嫨">
+ <el-form-item label="鍚堝悓鍗曚环" :prop="'zlDetailList.' + index + '.price'" :rules="{
+ required: true, message: '璇疯緭鍏�', trigger: 'blur'
+ }">
+ <el-input placeholder="璇疯緭鍏�" v-model="zlDetailList.price" @input="clearzl" class="input-with-select">
+ <el-select v-model="zlDetailList.circleType" @change="clearzl" style="width: 150px;" slot="append" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in unitOps" :key="index" :value="item.value" :label="item.name"></el-option>
</el-select>
</el-input>
</el-form-item>
- <el-form-item label="浠樻鎻愬墠澶╂暟" prop="advanceDays">
+ <el-form-item label="浠樻鎻愬墠澶╂暟" :prop="'zlDetailList.' + index + '.advanceDays'" :rules="{
+ required: true, message: '璇疯緭鍏�', trigger: 'blur'
+ }">
<div style="display: flex; align-items: center; justify-content: space-between;">
- <el-input v-model="item.advanceDays" placeholder="璇疯緭鍏�" v-trim />
+ <el-input v-model="zlDetailList.advanceDays" @input="clearzl" placeholder="璇疯緭鍏�" v-trim />
<el-link :underline="false" type="danger" @click="deleZl(index)" style="margin-left: 20px; flex-shrink: 0;">鍒犻櫎</el-link>
</div>
</el-form-item>
@@ -172,7 +185,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>
@@ -200,10 +213,10 @@
<div class="m_title">鐗╀笟淇℃伅</div>
<div class="list">
<el-form-item label="鐗╀笟鎶奸噾" prop="wyDeposit">
- <el-input v-model="form.wyDeposit" placeholder="璇疯緭鍏�" v-trim />
+ <el-input v-model="form.wyDeposit" @input="clearwy" placeholder="璇疯緭鍏�" v-trim />
</el-form-item>
<el-form-item label="浠樻鏂瑰紡" prop="wyPayType">
- <el-select v-model="form.wyPayType" placeholder="璇烽�夋嫨">
+ <el-select v-model="form.wyPayType" @change="clearwy" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in payMethods" :key="index" :value="item.value" :label="item.name"></el-option>
</el-select>
</el-form-item>
@@ -217,20 +230,26 @@
<el-button type="text" size="medium" @click="addWy">澧炲姞</el-button>
</div>
<div class="list">
- <div v-for="(item, index) in form.wyDetailList" :key="index">
- <el-form-item label="璧峰鏃ユ湡" prop="time">
- <el-date-picker type="daterange" v-model="item.time" @change="getDate2($event, index)" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
+ <div style="width: 100%; display: flex; flex-wrap: wrap;" v-for="(wyDetailList, index) in form.wyDetailList" :key="index">
+ <el-form-item label="璧峰鏃ユ湡" :prop="'wyDetailList.' + index + '.time'" :rules="{
+ required: true, message: '璇疯緭鍏�', trigger: 'blur'
+ }">
+ <el-date-picker type="daterange" v-model="wyDetailList.time" @change="getDate2($event, index)" value-format="yyyy-MM-dd" placeholder="璇烽�夋嫨" />
</el-form-item>
- <el-form-item label="鍚堝悓鍗曚环" prop="price">
- <el-input placeholder="璇疯緭鍏�" v-model="item.price">
- <el-select v-model="item.circleType" style="width: 150px;" slot="append" placeholder="璇烽�夋嫨">
+ <el-form-item label="鍚堝悓鍗曚环" :prop="'wyDetailList.' + index + '.price'" :rules="{
+ required: true, message: '璇疯緭鍏�', trigger: 'blur'
+ }">
+ <el-input placeholder="璇疯緭鍏�" @input="clearwy" v-model="wyDetailList.price">
+ <el-select v-model="wyDetailList.circleType" @change="clearwy" style="width: 150px;" slot="append" placeholder="璇烽�夋嫨">
<el-option v-for="(item, index) in unitOps" :key="index" :value="item.value" :label="item.name"></el-option>
</el-select>
</el-input>
</el-form-item>
- <el-form-item label="浠樻鎻愬墠澶╂暟" prop="advanceDays">
+ <el-form-item label="浠樻鎻愬墠澶╂暟" :prop="'wyDetailList.' + index + '.advanceDays'" :rules="{
+ required: true, message: '璇疯緭鍏�', trigger: 'blur'
+ }">
<div style="display: flex; align-items: center; justify-content: space-between;">
- <el-input v-model="item.advanceDays" placeholder="璇疯緭鍏�" v-trim />
+ <el-input v-model="wyDetailList.advanceDays" @input="clearwy" placeholder="璇疯緭鍏�" v-trim />
<el-link :underline="false" type="danger" @click="deleWy(index)" style="margin-left: 20px; flex-shrink: 0;">鍒犻櫎</el-link>
</div>
</el-form-item>
@@ -255,7 +274,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>
@@ -294,6 +313,7 @@
import MemberSearch from '@/components/common/MemberSearch'
import { rules } from './config'
import { create, getBillList } from '@/api/contract'
+import { ywList } from '@/api/customer'
import { getUserList } from '@/api/system/user'
import { getProjectList, tree } from '@/api/project/ywProject'
import { companyList } from '@/api/company'
@@ -335,6 +355,7 @@
zlDate: [],
zlDetailList: [
{
+ circleType: 0,
startDate: '',
endDate: '',
time: [],
@@ -350,6 +371,7 @@
wyDate: [],
wyDetailList: [
{
+ circleType: 0,
startDate: '',
endDate: '',
time: [],
@@ -367,6 +389,8 @@
wyList: [],
rules,
+
+ contactsList: [],
loadingInstance: null,
uploadImgUrl: process.env.VUE_APP_API_PREFIX + '/visitsAdmin/cloudService/public/uploadBatch',
@@ -388,7 +412,7 @@
{ name: '涓�娆℃�т粯娆�', value: 0 },
{ name: '3涓湀涓�浠�', value: 1 },
{ name: '6涓湀涓�浠�', value: 2 },
- { name: '1骞翠竴浠�', value: 2 },
+ { name: '1骞翠竴浠�', value: 3 },
],
unitOps: [
{ name: '鍏�/m虏路澶�', value: 0 },
@@ -407,6 +431,9 @@
open (title, target) {
this.title = title
this.ids = []
+ this.houseList = []
+ this.zlPrice = ''
+ this.wyPrice = ''
this.getUser()
this.getProject()
this.getCompany()
@@ -420,31 +447,41 @@
this.form[key] = ''
}
}
- this.form.zlDetailList = [
- {
- startDate: '',
- endDate: '',
- time: [],
- price: '',
- advanceDays: ''
- }
- ]
- this.form.wyDetailList = [
- {
- startDate: '',
- endDate: '',
- time: [],
- price: '',
- advanceDays: ''
- }
- ]
this.wyList = []
this.zlList = []
this.form.userId = this.userInfo.id
this.form.signDate = this.getDayTime()
this.form.startDate = this.getDayTime()
this.form.endDate = this.getDayTime(1)
- this.getHouseTree()
+ this.form.zlDetailList = [
+ {
+ circleType: 0,
+ startDate: this.form.startDate,
+ endDate: this.form.endDate,
+ time: [this.form.startDate, this.form.endDate],
+ price: '',
+ advanceDays: ''
+ }
+ ]
+ this.form.wyDetailList = [
+ {
+ circleType: 0,
+ startDate: this.form.startDate,
+ endDate: this.form.endDate,
+ time: [this.form.startDate, this.form.endDate],
+ price: '',
+ advanceDays: ''
+ }
+ ]
+ // this.getHouseTree()
+ })
+ },
+ // 鑾峰彇鑱旂郴浜�
+ getYwList () {
+ ywList({
+ customerId: this.form.renterId
+ }).then(res => {
+ this.contactsList = res
})
},
getHouseData () {
@@ -467,13 +504,45 @@
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 () {
+ this.form.zlDetailList = [
+ {
+ circleType: 0,
+ startDate: this.form.startDate,
+ endDate: this.form.endDate,
+ time: [this.form.startDate, this.form.endDate],
+ price: '',
+ advanceDays: ''
+ }
+ ]
+ this.form.wyDetailList = [
+ {
+ circleType: 0,
+ startDate: this.form.startDate,
+ endDate: this.form.endDate,
+ time: [this.form.startDate, this.form.endDate],
+ price: '',
+ advanceDays: ''
+ }
+ ]
+ },
+ clearzl () {
+ this.zlList = []
+ this.zlPrice = ''
+ },
+ clearwy () {
+ this.wyList = []
+ this.wyPrice = ''
+ },
confirm () {
+ var that = this
if (this.activeTabs === 0) {
this.$refs.form.validate((valid) => {
if (!valid) return
+ if (this.form.roomIds.length === 0) return this.$message.warning('璇烽�夋嫨鎴挎簮锛�')
this.activeTabs = 1
})
} else if (this.activeTabs === 1) {
@@ -486,6 +555,8 @@
if (!valid2) {
return
}
+ if (that.zlList.length === 0) return that.$message.warning('璇峰厛鐢熸垚绉熻祦璐﹀崟锛�')
+ if (that.wyList.length === 0) return that.$message.warning('璇峰厛鐢熸垚鐗╀笟璐﹀崟锛�')
this.submit()
})
})
@@ -494,6 +565,7 @@
if (!valid1) {
return
}
+ if (that.zlList.length === 0) return that.$message.warning('璇峰厛鐢熸垚绉熻祦璐﹀崟锛�')
this.submit()
})
} else if (this.form.type === 1) {
@@ -501,6 +573,7 @@
if (!valid2) {
return
}
+ if (that.wyList.length === 0) return that.$message.warning('璇峰厛鐢熸垚鐗╀笟璐﹀崟锛�')
this.submit()
})
}
@@ -522,10 +595,12 @@
getDate1 (e, index) {
this.form.zlDetailList[index].startDate = e[0]
this.form.zlDetailList[index].endDate = e[1]
+ this.clearzl()
},
getDate2 (e, index) {
this.form.wyDetailList[index].startDate = e[0]
this.form.wyDetailList[index].endDate = e[1]
+ this.clearwy()
},
checkHouseRoom (a, b) {
this.ids = b.checkedKeys
@@ -539,7 +614,8 @@
getHouseTree () {
tree({
startDate: this.form.startDate,
- endDate: this.form.endDate
+ endDate: this.form.endDate,
+ projectId: this.form.projectId
})
.then(res => {
res.forEach(item => {
@@ -576,6 +652,7 @@
generateWY () {
getBillList({ ...this.form, billType: 1 })
.then(res => {
+ this.wy = true
let zlPrice = 0
let arr = []
res.forEach(item => {
@@ -590,18 +667,20 @@
},
addZl () {
this.form.zlDetailList.push({
- startDate: '',
- endDate: '',
- time: [],
+ circleType: 0,
+ startDate: this.form.startDate,
+ endDate: this.form.endDate,
+ time: [this.form.startDate, this.form.endDate],
price: '',
advanceDays: ''
})
},
addWy () {
this.form.wyDetailList.push({
- startDate: '',
- endDate: '',
- time: [],
+ circleType: 0,
+ startDate: this.form.startDate,
+ endDate: this.form.endDate,
+ time: [this.form.startDate, this.form.endDate],
price: '',
advanceDays: ''
})
@@ -609,24 +688,29 @@
deleZl(index) {
if (this.form.zlDetailList.length === 1) return Message.warning('鑷冲皯淇濈暀涓�鏉★紒')
this.form.zlDetailList.splice(index, 1)
+ this.clearzl()
},
deleWy(index) {
if (this.form.wyDetailList.length === 1) return Message.warning('鑷冲皯淇濈暀涓�鏉★紒')
this.form.wyDetailList.splice(index, 1)
+ this.clearwy()
},
getZLDate (e) {
this.form.zlFreeStartDate = e[0]
this.form.zlFreeEndDate = e[1]
+ this.clearzl()
},
getWYDate (e) {
this.form.wyFreeStartDate = e[0]
this.form.wyFreeEndDate = e[1]
+ this.clearwy()
},
getTenant (row) {
this.form.renterId = row.id
this.form.renterName = row.name
- this.form.memberId = row.memberId
- this.form.memberName = row.memberName
+ this.form.memberId = ''
+ this.form.memberName = ''
+ this.getYwList()
},
dele (imgaddr) {
this.form.fileList.forEach((item, index) => {
@@ -718,6 +802,7 @@
position: sticky;
top: 0;
left: 0;
+ z-index: 999;
}
.tabs {
border-bottom: 1px solid #DFE2E8;
--
Gitblit v1.9.3