From 498e71eb8ce7db34e54f64dc2c83e8edc49c54a3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 08 五月 2024 10:40:06 +0800
Subject: [PATCH] Merge branch 'master' of http://139.186.142.91:10010/r/productDev/dmvisit

---
 h5/pages/visitorApplication/visitorApplication.vue |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 3856651..1838734 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -108,7 +108,6 @@
 			v-if="form1.starttime"
 			:show="show5"
 			:minDate="formatTimeStamp(form1.starttime)"
-			:maxDate="formatTimeStamp(maxTime)"
 			mode="datetime"
 			@cancel="show5 = false"
 			@confirm="setoutDate"
@@ -309,7 +308,9 @@
 				show6: false,
 				show7: false,
 				fileList: [],
-				columns1: [[{name: '韬唤璇�', id: 0}, {name: '娓境璇佷欢', id: 1},{name: '鎶ょ収', id: 2}]],
+				columns1: [
+					[{name: '韬唤璇�', id: 0}, {name: '娓境璇佷欢', id: 1},{name: '鎶ょ収', id: 2}],
+				],
 				columns: [],
 				cars: [],
 				day: null,
@@ -351,9 +352,9 @@
 			if (options.data) {
 				this.form = JSON.parse(options.data)
 			}
-			this.getvisit()
-			this.getVisit1()
-			this.getUserValid()
+			// this.getvisit()
+			// this.getVisit1()
+			// this.getUserValid()
 		},
 		methods: {
 			openInput(type) {
@@ -563,6 +564,7 @@
 			seleIdcard(e) {
 				this.withUserList.idcardType = e.value[0].id
 				this.withUserList.idcardTypeName = e.value[0].name
+				console.log(e);
 				this.show6 = false
 			},
 			submitCart() {
@@ -612,7 +614,9 @@
 			},
 			setinDate(e) {
 				this.form1.starttime = uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM');
-				this.maxTime = getDaysAfterDate(uni.$u.timeFormat(e.value, 'yyyy-mm-dd'), this.day)
+				// this.maxTime = getDaysAfterDate(uni.$u.timeFormat(e.value, 'yyyy-mm-dd hh:MM'), this.day)
+				this.maxTime = this.form1.starttime
+				console.log(this.form1.starttime);
 				this.show4 = false
 			},
 			setoutDate(e) {

--
Gitblit v1.9.3