From f1514da0b761fb6c12409ca0c1316d5ecac74fa4 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Thu, 03 Mar 2022 16:45:54 +0800
Subject: [PATCH] 注册验证调整

---
 pages/registerUser/registerUser.vue |   40 ++++++++++++++++++++++++++++++----------
 1 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 3fed9b6..9bd527c 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -257,14 +257,14 @@
 						trigger: ['change', 'blur'],
 					}],
 					jobUnit: [{
-						required: true,
+						required: false,
 						message: '请输入单位名称',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
 					address: [{
-						required: false,
-						message: '请输入居住地',
+						required: true,
+						message: '请选择居住地',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
@@ -275,14 +275,14 @@
 						trigger: ['change', 'blur'],
 					}],
 					signals: [{
-						required: true,
+						required: false,
 						message: '请输入警号',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
 					xq: [{
-						required: true,
-						message: '请选择辖区',
+						required: false,
+						message: '请选择工作地点',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
 					}],
@@ -384,6 +384,26 @@
 					return
 				}
 				var that = this;
+				debugger
+				//判断是否必填警号和工作地点
+				if(that.form.role == "民警"){
+					that.rules.signals[0].required = true;
+				}
+				
+				if(that.jobValue == "有"){
+					that.rules.jobUnit[0].required = true;
+					that.rules.xq[0].required = true;
+				}
+				
+				that.$refs.uForm.validate(valid => {
+					if (valid) {
+						that.registerEvent()
+					}else{
+						return
+					}
+				});
+				
+				
 				uni.request({
 					url: that.$store.state.piAPI + '/zc/inspect',
 					method: 'GET',
@@ -403,8 +423,6 @@
 
 						}
 
-						that.registerEvent()
-
 						// that.$refs.uForm.validate(valid => {
 						// 	if (valid) {
 						// 		var d = that.form;
@@ -422,8 +440,9 @@
 			},
 
 			registerEvent() {
-				var d = this.form;
-				var url = this.$store.state.piAPI + '/zc/inster',
+				var that = this;
+				var d = that.form;
+				var url = that.$store.state.piAPI + '/zc/inster',
 					data = {
 						// deptid: ,
 						password: d.pass,
@@ -464,6 +483,7 @@
 					}
 				});
 
+
 			},
 
 			depl() {

--
Gitblit v1.9.3