From 64985934b6b7378d1c101313083b456a231c7fd5 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 03 十二月 2024 17:36:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/contract/components/addCollectionBill.vue | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/admin/src/views/contract/components/addCollectionBill.vue b/admin/src/views/contract/components/addCollectionBill.vue
index a67dc5b..23a35cb 100644
--- a/admin/src/views/contract/components/addCollectionBill.vue
+++ b/admin/src/views/contract/components/addCollectionBill.vue
@@ -37,8 +37,7 @@
type="daterange"
range-separator="鑷�"
v-model="form.date"
- :min-date="new Date(time.startDate)"
- :max-date="new Date(time.endDate)"
+ :picker-options="pickerOptions"
@change="changeDate"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -111,6 +110,7 @@
billTypeCopy: 0,
date: []
},
+ pickerOptions: {},
time: {
startDate: '',
endDate: ''
@@ -146,6 +146,14 @@
this.title = title
this.time.startDate = time.startDate
this.time.endDate = time.endDate
+ this.pickerOptions = {
+ disabledDate(time) {
+ // 濡傛灉娌℃湁鍚庨潰鐨� -8.64e7 灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ const beginDate = new Date(time.startDate).getTime() - 8.64e7
+ const endDate = new Date(time.endDate).getTime() - 8.64e7
+ return beginDate > time.getTime() || endDate < time.getTime()
+ }
+ }
this.getCompany()
this.visible = true
// 鏂板缓
--
Gitblit v1.9.3