1

pages/admin/Jiazheng/gerenZiliao.vue

@@ -22,8 +22,7 @@
 			<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
 			<uni-datetime-picker type="line" v-model="formData.birthday">
 				<view class="form-radio-select">
-					<view v-if="!formData.birthday">请选择出生日期</view>
-					<view v-else>{{formData.birthday}}</view>
+				{{formData.birthday}}
 					<icon></icon>
 				</view>
 			</uni-datetime-picker>
@@ -47,7 +46,7 @@
 			<picker :range="minzuList" mode='selector' :value="formData.minzuIndex" range-key="name"
 				@change="minzuChange" @cancel="minzuCancel">
 				<view class="form-radio-select">
-					<view>{{ formData.minzu.name || '请选择民族' }}</view>
+					<view>{{ formData.minzu.name }}</view>
 					<icon></icon>
 				</view>
 			</picker>
@@ -437,6 +436,10 @@
 			},
 			goNext() {
 				console.log('formData', this.formData);
+			
+				if (!this.checkAllFields()) {
+					return false
+				}
 				if(!this.formData.agree){
 					uni.showToast({
 						title: "请勾选本人同意！",
@@ -445,9 +448,6 @@
 					})
 					return false
 				}
-				if (!this.checkAllFields()) {
-					return false
-				}
 				this.$emit('goNext',this.formData,0);
 			},
 

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -5,10 +5,10 @@
 			<text class="nav-bar-title">家政人员</text>
 		</view>
 		<v-tabs v-model="current" :tabs="tabs" :scroll="false" @change="changeTab" field="name" class="admin-tab-box"></v-tabs>	
-		<gerenZiliao ref="gerenZiliao" @goNext="gerenziliaoNext" v-show="tabCurrent ==0"></gerenZiliao>
-		<qiuzhiXinxi ref="qiuzhiXinxi" v-show="tabCurrent ==1"></qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" v-show="tabCurrent ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" v-show="tabCurrent ==3"></banzhengXinxi>
+		<gerenZiliao ref="gerenZiliao" @goNext="gerenziliaoNext" v-show="current ==0"></gerenZiliao>
+		<qiuzhiXinxi ref="qiuzhiXinxi" @goUp="goUpQiuzhixinxi" @goNext="goNextQiuzhixinxi" v-show="current ==1"></qiuzhiXinxi>
+		<zhaopianZiliao ref="zhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
+		<banzhengXinxi ref="banzhengXinxi" v-show="current ==3"></banzhengXinxi>
 	</view>
 </template>
 
@@ -54,8 +54,15 @@
 			gerenziliaoNext(data,num) {
 				console.log('data',data);
 				console.log('num',num);
-			//	this.current = num + 1
-			}
+				this.current = num + 1
+				this.tabs[this.current].disabled = false
+			},
+			goUpQiuzhixinxi(data,num){
+				this.current = num - 1
+			},
+			goNextQiuzhixinxi(data,num){
+				
+			},
 		}
 	}
 </script>

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -34,8 +34,8 @@
 			<input v-model="inputValue"  placeholder="请填写工作经历" />
 		</view>
 		<view class="page-btn-box">
-			<button type="default" class="phone-white-btn">上一步</button>
-			<button type="default" class="phone-green-btn">下一步</button>
+			<button type="default" @click="goUp" class="phone-white-btn">上一步</button>
+			<button type="default"  @click="goNext" class="phone-green-btn">下一步</button>
 		</view>
 	</view>
 </template>
@@ -138,7 +138,30 @@
 			},
 			selectChangeZhuangtai(data) {
 				console.log('zhuangtaiData', data);
-			}
+			},
+			
+			goNext() {
+				// if(!this.formData.agree){
+				// 	uni.showToast({
+				// 		title: "请勾选本人同意！",
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	})
+				// 	return false
+				// }
+				this.$emit('goNext',{},0);
+			},
+			goUp() {
+				// if(!this.formData.agree){
+				// 	uni.showToast({
+				// 		title: "请勾选本人同意！",
+				// 		icon: 'none',
+				// 		duration: 2000
+				// 	})
+				// 	return false
+				// }
+				this.$emit('goUp',{},1);
+			},
 		}
 	};
 </script>