From 8dcbe3d898f6c60ef3226095d994ca8953bf5f6d Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期二, 03 十二月 2024 18:18:37 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/funingyunwei
---
admin/src/views/contract/components/addCollectionBill.vue | 17 ++++++++---------
1 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/admin/src/views/contract/components/addCollectionBill.vue b/admin/src/views/contract/components/addCollectionBill.vue
index 23a35cb..4a1bb80 100644
--- a/admin/src/views/contract/components/addCollectionBill.vue
+++ b/admin/src/views/contract/components/addCollectionBill.vue
@@ -10,7 +10,7 @@
<div class="main_content">
<el-form :model="form" label-position="top" ref="form" :rules="rules">
<div class="head">
- <div class="m_title">鍩虹淇℃伅-{{time.startDate}}~{{time.endDate}}</div>
+ <div class="m_title">鍩虹淇℃伅</div>
<div class="tabs">
<div class="tab" :class="{ active: form.feeType === 0 }" @click="timeTabClick(0)">鍛ㄦ湡璐圭敤</div>
<div class="tab" :class="{ active: form.feeType === 1 }" @click="timeTabClick(1)">涓�娆℃�ц垂鐢�</div>
@@ -85,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: {
@@ -126,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' }
@@ -143,14 +141,15 @@
},
methods: {
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(time.startDate).getTime() - 8.64e7
- const endDate = new Date(time.endDate).getTime() - 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()
}
}
--
Gitblit v1.9.3