From 77946261ec663aa1fe7f6f97e550532ed879f982 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 06 六月 2025 13:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0.1' into 2.0.1
---
admin/src/views/contract/components/terminateLease.vue | 19 ++++++++++++++-----
1 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index 0f0fd5d..5520b8a 100644
--- a/admin/src/views/contract/components/terminateLease.vue
+++ b/admin/src/views/contract/components/terminateLease.vue
@@ -27,6 +27,7 @@
<el-date-picker
v-model="form.btDate"
type="date"
+ :picker-options="pickerOptions"
@change="changeBtDate"
value-format="yyyy-MM-dd"
placeholder="璇烽�夋嫨">
@@ -56,12 +57,12 @@
<el-table-column prop="projectName" label="椤圭洰鍚嶇О" show-overflow-tooltip />
<el-table-column label="鎴挎簮鍚嶇О" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.buildingName}}/{{row.code}}
+ {{row.buildingName}}/{{row.roomNum}}
</template>
</el-table-column>
<el-table-column label="绉熻祦闈㈢Н(銕�)" show-overflow-tooltip>
<template slot-scope="{row}">
- {{row.area}}銕�
+ {{row.rentArea}}銕�
</template>
</el-table-column>
</el-table>
@@ -96,7 +97,7 @@
<i class="el-icon-delete"
style="color: red; margin-left: 10px; font-size: 18px; cursor: pointer;"
@click="deleRow(scope.$index)"
- v-if="scope.row.date && scope.row.date.length !==0">
+ v-if="scope.row.isDele">
</i>
</div>
</template>
@@ -250,7 +251,7 @@
},
list: [],
-
+ pickerOptions: {},
agentList: [],
receivable: '',
@@ -263,6 +264,14 @@
open (title, info) {
this.title = title
this.info = info
+ this.pickerOptions = {
+ disabledDate(time) {
+ // 濡傛灉娌℃湁鍚庨潰鐨� -8.64e7 灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ const beginDate = new Date(info.startDate).getTime() - 8.64e7
+ const endDate = new Date(info.endDate).getTime()
+ return beginDate > time.getTime() || endDate < time.getTime()
+ }
+ }
this.form.id = info.id
this.form.btSignDate = this.getDay()
this.form.btUserId = this.userInfo.id
@@ -370,9 +379,9 @@
})
},
getObjS (obj) {
- console.log(obj)
obj.startDate = obj.startDate.substring(0, 10)
obj.endDate = obj.endDate.substring(0, 10)
+ obj.isDele = true
this.info.terminateList.push(obj)
this.countData()
},
--
Gitblit v1.9.3