From f4cf11fa6ddf3cd51c99437a3638951bf5ac9304 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 09 十二月 2024 18:17:12 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/contract/components/addCollectionBill.vue | 29 ++++++++++++++++++++++-------
1 files changed, 22 insertions(+), 7 deletions(-)
diff --git a/admin/src/views/contract/components/addCollectionBill.vue b/admin/src/views/contract/components/addCollectionBill.vue
index 1d4a3f5..4a1bb80 100644
--- a/admin/src/views/contract/components/addCollectionBill.vue
+++ b/admin/src/views/contract/components/addCollectionBill.vue
@@ -37,6 +37,7 @@
type="daterange"
range-separator="鑷�"
v-model="form.date"
+ :picker-options="pickerOptions"
@change="changeDate"
start-placeholder="寮�濮嬫棩鏈�"
end-placeholder="缁撴潫鏃ユ湡"
@@ -84,11 +85,9 @@
extends: BaseOpera,
data () {
const validateArr = (rule, value, callback) => {
- if (value.length === 0 || !value) {
- callback(new Error('璇烽�夋嫨'));
- } else {
- callback();
- }
+ if (!value) return callback(new Error('璇烽�夋嫨'));
+ if (!value.length === 0) return callback(new Error('璇烽�夋嫨'));
+ callback();
};
return {
form: {
@@ -109,6 +108,11 @@
billTypeCopy: 0,
date: []
},
+ pickerOptions: {},
+ time: {
+ startDate: '',
+ endDate: ''
+ },
rules: {
contractCode: [
{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }
@@ -120,7 +124,7 @@
{ required: true, message: '璇烽�夋嫨', trigger: 'blur' }
],
date: [
- { validator: validateArr, trigger: 'blur' }
+ { required: true, validator: validateArr, trigger: 'blur' }
],
receivableFee: [
{ required: true, message: '璇疯緭鍏�', trigger: 'blur' }
@@ -136,8 +140,19 @@
}
},
methods: {
- open (title, target) {
+ open (title, target, time) {
+ var that = this
this.title = title
+ this.time.startDate = time.startDate
+ this.time.endDate = time.endDate
+ this.pickerOptions = {
+ disabledDate(time) {
+ // 濡傛灉娌℃湁鍚庨潰鐨� -8.64e7 灏辨槸涓嶅彲浠ラ�夋嫨浠婂ぉ鐨�
+ const beginDate = new Date(that.time.startDate).getTime() - 8.64e7
+ const endDate = new Date(that.time.endDate).getTime()
+ return beginDate > time.getTime() || endDate < time.getTime()
+ }
+ }
this.getCompany()
this.visible = true
// 鏂板缓
--
Gitblit v1.9.3