From f3fccd4da23c2fb3d2348dbcdd5c93a840fbe8fc Mon Sep 17 00:00:00 2001
From: caoqianming <caoqianming@foxmail.com>
Date: Wed, 5 Apr 2023 01:47:01 +0800
Subject: [PATCH] =?UTF-8?q?refector:=20=E6=97=B6=E9=97=B4=E8=8C=83?=
 =?UTF-8?q?=E5=9B=B4=E6=A0=A1=E9=AA=8C=E5=8F=8A=E9=BB=98=E8=AE=A4=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 pages/workSpace/operation/operationCreate.vue | 12 +++++++++++-
 pages/workSpace/rpj/rpjCreate.vue             |  9 +++++++++
 pages/workSpace/visit/visitCreate.vue         | 16 +++++++++++++---
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/pages/workSpace/operation/operationCreate.vue b/pages/workSpace/operation/operationCreate.vue
index 0470ee1..5c16170 100644
--- a/pages/workSpace/operation/operationCreate.vue
+++ b/pages/workSpace/operation/operationCreate.vue
@@ -116,6 +116,7 @@
 
 <script>
 	var that;
+	import getStartAndEnd from '../../../utils/getTime.js';
 	import baTreePicker from "../../comm/ba-tree-picker/ba-tree-picker.vue";
 	import nonNullCheck from '../../../utils/nonNullCheck.js';
 	import resetData from '../../../utils/common.js';
@@ -181,6 +182,7 @@
 					this.showBtns = false;
 				}
 			}else{
+				this.datetimerange = getStartAndEnd()
 				this.showBtns = true;
 			}
 		},
@@ -356,7 +358,15 @@
 					})
 					return false;
 				}
-
+				
+				if (this.formData.start_time>=this.formData.end_time){
+					uni.showToast({
+						title: '时间选择范围错误',
+						icon: "none"
+					})
+					return false;
+				}
+				
 				if (!nonNullCheck(this.formData.state_work)) {
 					uni.showToast({
 						title: '请选择生产状态',
diff --git a/pages/workSpace/rpj/rpjCreate.vue b/pages/workSpace/rpj/rpjCreate.vue
index 0f70ef9..70d7d4d 100644
--- a/pages/workSpace/rpj/rpjCreate.vue
+++ b/pages/workSpace/rpj/rpjCreate.vue
@@ -83,6 +83,7 @@
 </template>
 
 <script>
+	import getStartAndEnd from '../../../utils/getTime.js';
 	import nonNullCheck from '../../../utils/nonNullCheck.js';
 	import baTreePicker from "../../comm/ba-tree-picker/ba-tree-picker.vue";
 	export default {
@@ -144,6 +145,7 @@
 					this.showBtns = false;
 				}
 			}else{
+				this.datetimerange = getStartAndEnd()
 				this.showBtns = true;
 			}
 		},
@@ -277,6 +279,13 @@
 					})
 					return false;
 				}
+				if (this.formData.come_time>=this.formData.leave_time){
+					uni.showToast({
+						title: '时间选择范围错误',
+						icon: "none"
+					})
+					return false;
+				}
 
 				// if (!nonNullCheck(this.formData.belong_dept)) {
 				// 	uni.showToast({
diff --git a/pages/workSpace/visit/visitCreate.vue b/pages/workSpace/visit/visitCreate.vue
index b9a381f..da1779c 100644
--- a/pages/workSpace/visit/visitCreate.vue
+++ b/pages/workSpace/visit/visitCreate.vue
@@ -112,7 +112,8 @@
 </template>
 
 <script>
-	import nonNullCheck from '../../../utils/nonNullCheck.js';
+	import getStartAndEnd from '../../../utils/getTime.js';
+import nonNullCheck from '../../../utils/nonNullCheck.js';
 	import resetData from '../../../utils/common.js';
 	export default {
 		name: "visit",
@@ -173,9 +174,10 @@
 		},
 		watch: {
 			datetimerange(newval) {
-				this.formData.visit_time = this.datetimerange[0]
-				this.formData.leave_time = this.datetimerange[1]
+					this.formData.visit_time = this.datetimerange[0]
+					this.formData.leave_time = this.datetimerange[1]
 			},
+			
 		},
 		onLoad(params) {
 			if (params.visit) {
@@ -188,6 +190,7 @@
 					this.showBtns = true;
 				}
 			} else {
+				this.datetimerange = getStartAndEnd()
 				this.showBtns = true;
 			}
 		},
@@ -324,6 +327,13 @@
 					})
 					return false;
 				}
+				if (this.formData.visit_time>=this.formData.leave_time){
+					uni.showToast({
+						title: '时间选择范围错误',
+						icon: "none"
+					})
+					return false;
+				}
 				if (!nonNullCheck(this.formData.receptionist) && this.formData.purpose!=50) {
 					uni.showToast({
 						title: '请选择接待人',