From ac1c4597e055f2d821498e4fe762e388a25ee774 Mon Sep 17 00:00:00 2001
From: zengh <123456>
Date: Fri, 27 May 2022 20:35:27 +0800
Subject: [PATCH] 服务器配置

---
 pages/registerUser/registerUser.vue |   24 +++++++++++++++---------
 1 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/pages/registerUser/registerUser.vue b/pages/registerUser/registerUser.vue
index 3ac9181..f19e225 100644
--- a/pages/registerUser/registerUser.vue
+++ b/pages/registerUser/registerUser.vue
@@ -14,20 +14,21 @@
 				:required="true">
 				<u-input v-model="form.signals" placeholder="请输入警号" />
 			</u-form-item>
-			<u-form-item label="工作单位" left-icon="home-fill" label-width="200" :required="true">
+			
+			<!-- <u-form-item label="工作单位" left-icon="home-fill" label-width="200" :required="true">
 				<u-radio-group v-model="jobValue">
 					<u-radio v-for="(item, index) in jobList" :key="index" :name="item.name" :disabled="item.disabled">
 						{{item.name}}
 					</u-radio>
 				</u-radio-group>
-			</u-form-item>
+			</u-form-item> -->
 
-			<u-form-item v-show="jobValue == '有'" label="单位名称" prop="jobUnit" label-width="200" left-icon="home"
+			<u-form-item v-show="form.role == '民警'" label="单位名称" prop="jobUnit" label-width="200" left-icon="home"
 				:required="true">
 				<u-input v-model="form.jobUnit" placeholder="请输入单位名称" />
 			</u-form-item>
 
-			<u-form-item v-show="jobValue == '有'" label="工作地点" prop="xq" left-icon="map-fill" label-width="200"
+			<u-form-item v-show="form.role == '民警'" label="工作地点" prop="xq" left-icon="map-fill" label-width="200"
 				:required="true">
 				<u-field :disabled="true" style="width: 100%;" label-width="0" v-model="form.xq" type="textarea"
 					placeholder="请选择工作地点" :fixed="true">
@@ -36,7 +37,7 @@
 				</u-field>
 			</u-form-item>
 
-			<u-form-item label="居住地" prop="address" left-icon="map" label-width="200" :required="true">
+			<u-form-item v-show="form.role != '民警'" label="居住地" prop="address" left-icon="map" label-width="200" :required="true">
 				<u-field :disabled="true" style="width: 100%;" label-width="0" v-model="form.address" type="textarea"
 					placeholder="请选择居住地" :fixed="true">
 					<u-icon @click="placeClick" name="map-fill" slot="right" size="44" label="定位" label-pos="bottom"
@@ -283,7 +284,7 @@
 						trigger: ['change', 'blur'],
 					}],
 					address: [{
-						required: true,
+						required: false,
 						message: '请选择居住地',
 						// 可以单个或者同时写两个触发验证方式 
 						trigger: ['change', 'blur'],
@@ -408,13 +409,18 @@
 				//判断是否必填警号和工作地点
 				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.rules.address[0].required = false;
+				}else{
+					that.rules.address[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()

--
Gitblit v1.9.3