Merge remote-tracking branch 'origin/2025北京诚祥' into 2025北京诚祥

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -50,56 +50,54 @@
 					},
 
 				],
-				allData:{
-					 "birthday": "string",
-					  "gender": 0,
-					  "hujiDizhi": "string",
-					  "hunyin": 0,
-					  "icon": "string",
-					  "idcard": "string",
-					  "idcardUrl1": "string",
-					  "idcardUrl2": "string",
-					  "idtype": 0,
-					  "jiankangDate": "string",
-					  "jibiexinzi": "string",
-					  "jiguanShengId": 0,
-					  "jiguanShiId": 0,
-					  "jineng": "string",
-					  "jingli": "string",
-					  "jingyan": "string",
-					  "juzhuDizhi": "string",
-					  "kaozhengList": [
-					    {
-					      "canxunshijian": "string",
-					      "jgId": 0,
-					      "needKaoshi": false,
-					      "needKecheng": false,
-					      "shicaochengji": "string",
-					      "zongkeshi": "string",
-					      "zyId": 0,
-					      "zyLevel": 0
-					    }
-					  ],
-					  "leixing": "string",
-					  "minzu": 0,
-					  "qiwangxinzi": "string",
-					  "realName": "string",
-					  "shenghuoUrls": "string",
-					  "shuxiang": 0,
-					  "tijianDate": "string",
-					  "tijianUrl": "string",
-					  "userId": 0,
-					  "userName": "string",
-					  "xingzuo": 0,
-					  "xingzuoFlag": false,
-					  "xueli": 0,
-					  "zhengshuUrls": "string",
-					  "zhuangtai": 0
+				allData: {
+					"birthday": "string",
+					"gender": 0,
+					"hujiDizhi": "string",
+					"hunyin": 0,
+					"icon": "string",
+					"idcard": "string",
+					"idcardUrl1": "string",
+					"idcardUrl2": "string",
+					"idtype": 0,
+					"jiankangDate": "string",
+					"jibiexinzi": "string",
+					"jiguanShengId": 0,
+					"jiguanShiId": 0,
+					"jineng": "string",
+					"jingli": "string",
+					"jingyan": "string",
+					"juzhuDizhi": "string",
+					"kaozhengList": [{
+						"canxunshijian": "string",
+						"jgId": 0,
+						"needKaoshi": false,
+						"needKecheng": false,
+						"shicaochengji": "string",
+						"zongkeshi": "string",
+						"zyId": 0,
+						"zyLevel": 0
+					}],
+					"leixing": "string",
+					"minzu": 0,
+					"qiwangxinzi": "string",
+					"realName": "string",
+					"shenghuoUrls": "string",
+					"shuxiang": 0,
+					"tijianDate": "string",
+					"tijianUrl": "string",
+					"userId": 0,
+					"userName": "string",
+					"xingzuo": 0,
+					"xingzuoFlag": false,
+					"xueli": 0,
+					"zhengshuUrls": "string",
+					"zhuangtai": 0
 				},
-				gerenziliaoObj:{},
-				qiuzhixinxiObj:{},
-				zhaopianziliaoObj:{},
-				banzhengxinxiObj:{},
+				gerenziliaoObj: {},
+				qiuzhixinxiObj: {},
+				zhaopianziliaoObj: {},
+				banzhengxinxiObj: {},
 			}
 		},
 		components: {
@@ -145,12 +143,19 @@
 				this.current = num - 1
 			},
 			goNextQiuzhixinxi(data, num) {
+				this.qiuzhixinxiObj.leixing = data.leixing
+				this.qiuzhixinxiObj.jingyan = data.jingyan
+				this.qiuzhixinxiObj.jineng = data.jineng
+				this.qiuzhixinxiObj.zhuangtai = data.zhuangtai
+				this.qiuzhixinxiObj.jibiexinzi = data.jibiexinzi
+				this.qiuzhixinxiObj.qiwangxinzi = data.qiwangxinzi
+				this.qiuzhixinxiObj.jingli = data.jingli
 				this.current = num + 1
 				this.tabs = this.tabs.map((item, i) => {
 					if (i == this.current) item.disabled = false
 					return item
 				})
-					console.log('this.tabs', this.tabs);
+				console.log('this.qiuzhixinxiObj', this.qiuzhixinxiObj);
 			},
 			goUpZhaopianZiliao(data, num) {
 				this.current = num - 1

pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -170,6 +170,15 @@
 				// const index = e.detail.value
 				// this.jingyan = this.jingyanList[index]
 			},
+			showAlert(){
+				uni.showToast({
+					title: "请勾选本人同意！",
+					icon: 'none',
+					duration: 2000
+				})
+				return false
+			},
+			
 			
 			goNext() {
 				this.formData = {
@@ -182,16 +191,40 @@
 					jingli:this.jingli,
 					
 				}
-				console.log('this.formData',this.formData);
-				// if(!this.formData.agree){
-				// 	uni.showToast({
-				// 		title: "请勾选本人同意！",
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	})
-				// 	return false
-				// }
-				this.$emit('goNext',{},1);
+				if(!this.formData.leixing){
+					uni.showToast({
+						title: "请选择类型！",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}	
+				if(!this.formData.jingyan){
+					uni.showToast({
+						title: "请选择经验年限！",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
+				if(!this.formData.jineng){
+					uni.showToast({
+						title: "请选择相应技能！",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}	
+				if(!this.formData.zhuangtai){
+					uni.showToast({
+						title: "请选择相应状态！",
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
+				
+				this.$emit('goNext',this.formData,1);
 			},
 			goUp() {
 				// if(!this.formData.agree){