From a29e0df3c165dfe2ddd825bb340ed480a64865db Mon Sep 17 00:00:00 2001
From: MrShi <1878285526@qq.com>
Date: 星期四, 02 四月 2026 15:02:30 +0800
Subject: [PATCH] 解决冲突
---
admin/src/views/contract/components/terminateLease.vue | 17 +++++++++++++----
1 files changed, 13 insertions(+), 4 deletions(-)
diff --git a/admin/src/views/contract/components/terminateLease.vue b/admin/src/views/contract/components/terminateLease.vue
index ec9759d..04ed6cf 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="璇烽�夋嫨">
@@ -248,14 +249,14 @@
{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }
]
},
-
- list: [],
+ list: [],
+ pickerOptions: {},
agentList: [],
receivable: '',
meet: '',
-
+
loading: false
}
},
@@ -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
@@ -506,7 +515,7 @@
.main_box {
width: 100%;
display: flex;
- align-items: start;
+ align-items: flex-start;
margin-bottom: 15px;
justify-content: space-between;
.main_box_form {
--
Gitblit v1.9.3