Merge branch '2025北京诚祥' of https://gogs.mtavip.com/wangguoyu/uniProject into 2025北京诚祥

components/zhuapaiConfirm/useCamera.js

@@ -504,6 +504,7 @@ export function useH5Camera({
 		startH5Camera,
 		stopH5Camera,
 		handlePaiZhao,
-		errorFunComplete
+		errorFunComplete,
+		playVideo
 	}
 }

components/zhuapaiConfirm/zhuapai.vue

@@ -35,6 +35,7 @@
 
 	let zhuapaiFun = null;
 	let stopCamera = null;
+	let playVideoFun = null;
 
 	const DropRef = ref(null);
 	const DropContainerRef = ref(null);
@@ -62,7 +63,8 @@
 	}
 
 	function showVideoBtn() {
-		showVideo.value = true
+		showVideo.value = true;
+		playVideoFun && playVideoFun();
 	}
 
 	function touchmove(event) {
@@ -128,7 +130,8 @@
 		const {
 			startH5Camera,
 			handlePaiZhao,
-			stopH5Camera
+			stopH5Camera,
+			playVideo
 		} = useH5Camera({
 			elVideoId: '#videoZhaPai',
 			elCanvasId: '#canvasZhuaPai',
@@ -140,6 +143,7 @@
 		startH5Camera();
 		zhuapaiFun = handlePaiZhao;
 		stopCamera = stopH5Camera;
+		playVideoFun = playVideo;
 		// #endif
 
 	}

pages/Login/components/loginBox.vue

@@ -113,19 +113,19 @@
 	
 	// 跳转
 	function gotoPage(){
-		// 客户端
-				// #ifdef H5
-				uni.navigateTo({
-					url: `/pages/client/ShouYe/shouye`
-				})
-				// #endif
+    // 客户端
+    // #ifdef H5
+    uni.navigateTo({
+      url: `/pages/client/ShouYe/shouye`
+    })
+    // #endif
 
-				// 管理端
-				// #ifdef APP-PLUS
-				uni.navigateTo({
-					url: `/pages/admin/ShouYe/shouye`
-				})
-				// #endif
+    // 管理端
+    // #ifdef APP-PLUS
+    uni.navigateTo({
+      url: `/pages/admin/ShouYe/shouye`
+    })
+    // #endif
 	}
 </script>
 

pages/admin/Jiazheng/banzhengXinxi.vue

@@ -173,13 +173,23 @@
 					this.zhiyelevelsOpt = res.data
 				})
 			},
+			resetFun(){
+				this.formData.zhiyeName = ''
+				this.formData.zhiyeId = ''
+				this.formData.zhiyeLevelName = ''
+				this.formData.zhiyeLevelId = ''
+				this.formData.canxunShijian = ''
+				this.formData.shicaochengji = ''
+				this.formData.zongkeshi = ''
+			},
 			// 报证机构选择
 			jigouChange(e) {
 				this.formData.baozhengJigouName = this.baozhengJigouOpt[e.detail.value].name;
 				this.formData.baozhengJigouId = this.baozhengJigouOpt[e.detail.value].jgId;
 				this.formData.baozhengJigouType = this.baozhengJigouOpt[e.detail.value].jgType;
 				this.formData.banzhengInfoFlag = this.baozhengJigouOpt[e.detail.value].jgType == 1;
-
+				// 每一次都重置
+				this.resetFun()
 				console.log('this.formData.banzhengInfoFlag', this.formData.banzhengInfoFlag);
 				if (this.formData.banzhengInfoFlag) {
 					this.formData.needFlag = false
@@ -260,8 +270,30 @@
 			},
 			// 提交表单
 			submitForm() {
+				
+				
+				// "kaozhengList": [
+				//     {
+				//       "canxunshijian": "string",
+				//       "jgId": 0,
+				//       "needKaoshi": false,
+				//       "needKecheng": false,
+				//       "shicaochengji": "string",
+				//       "zongkeshi": "string",
+				//       "zyId": 0,
+				//       "zyLevel": 0
+				//     }
+				//   ],
+				
 				let req =  {
-					
+					canxunshijian:this.formData.canxunshijian,
+					jgId:this.formData.baozhengJigouId,
+					needKaoshi:this.formData.needKaoshi,
+					needKecheng:this.formData.needKecheng,
+					shicaochengji:this.formData.shicaochengji,
+					zongkeshi:this.formData.zongkeshi,
+					zyId:this.formData.zhiyeId,
+					zyLevel:this.formData.zhiyeLevelId,
 				}
 				console.log('req',req);
 				

pages/admin/Jiazheng/gerenZiliao.vue

@@ -28,15 +28,15 @@
 			</uni-datetime-picker>
 		</view>
 
-		<!-- <view class="form-label-input">
+		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require">*</text>籍贯</view>
 			<picker mode="multiSelector" :range="multiArray" :range-key="'label'" :value="multiIndex"
 				@columnchange="bindMultiPickerColumnChange" @change="onPickerConfirm">
 				<view class="picker">
-					{{ multiArray[0][multiIndex[0]].label }} - {{ multiArray[1][multiIndex[1]].label }}
+							{{ formData.jiguanShengName}}-{{formData.jiguanShiName}} 箭头
 				</view>
 			</picker>
-		</view> -->
+		</view>
 		<view class="form-label-input">
 			<view class="phone-form-label"><text class="form-label-require">*</text>身份证地址</view>
 			<uni-easyinput v-model="formData.hujiDizhi" placeholder="请输入身份证地址" />
@@ -148,6 +148,11 @@
 					xingzuo: {},
 					hunyin: {},
 					xueli: {},
+					jiguanObj: {},
+					jiguanShengId:'',
+					jiguanShiId:'',
+					jiguanShiName:'',
+					jiguanShengName:'',
 					agree: false,
 					xingzuoIndex: 0,
 					minzuIndex: 0,
@@ -230,7 +235,7 @@
 				}
 
 				// 强制更新视图
-				this.$forceUpdate();
+				//this.$forceUpdate();
 			},
 			// 确认选择时获取完整数据
 			onPickerConfirm() {
@@ -238,7 +243,12 @@
 
 				const selectedProvince = this.multiArray[0][provinceIndex];
 				const selectedCity = this.multiArray[1][cityIndex];
-
+				this.formData.jiguanShengId = selectedProvince.value
+				this.formData.jiguanShiId = selectedCity.value
+				this.formData.jiguanShiName = selectedCity.label
+				this.formData.jiguanShengName = selectedProvince.label
+				this.formData.jiguanObj.jiguanShengId = selectedProvince.value
+				this.formData.jiguanObj.jiguanShiId =selectedCity.value
 				console.log("选中的省份完整数据：", selectedProvince);
 				console.log("选中的城市完整数据：", selectedCity);
 			},
@@ -306,6 +316,11 @@
 						type: 'object'
 					},
 					{
+						key: 'jiguanObj',
+						name: '籍贯',
+						type: 'object'
+					},
+					{
 						key: 'xueli',
 						name: '学历',
 						type: 'object'

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -4,10 +4,13 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<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>	
+		<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="current ==0"></gerenZiliao>
-		<qiuzhiXinxi ref="qiuzhiXinxi" @goUp="goUpQiuzhixinxi" @goNext="goNextQiuzhixinxi" v-show="current ==1"></qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" @goUp="goUpZhaopianZiliao" @goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
+		<qiuzhiXinxi ref="qiuzhiXinxi" @goUp="goUpQiuzhixinxi" @goNext="goNextQiuzhixinxi" v-show="current ==1">
+		</qiuzhiXinxi>
+		<zhaopianZiliao ref="zhaopianZiliao" @goUp="goUpZhaopianZiliao" @goNext="goNextZhaopianZiliao"
+			v-show="current ==2"></zhaopianZiliao>
 		<banzhengXinxi ref="banzhengXinxi" @goUp="goUpBanzhengXinxi" v-show="current ==3"></banzhengXinxi>
 	</view>
 </template>
@@ -23,16 +26,78 @@
 	export default {
 		data() {
 			return {
-				current:3,
-			//	tabs: ['个人资料', '求职信息', '照片资料', '办证信息']
-				tabs: [
-				  { id: 1, name: '个人资料', disabled: false },
-				  { id: 2, name: '求职信息', disabled: true },
-				  { id: 3, name: '照片资料', disabled: true },
-				  { id: 4, name: '办证信息', disabled: true },
-				
+				current: 2,
+				//	tabs: ['个人资料', '求职信息', '照片资料', '办证信息']
+				tabs: [{
+						id: 1,
+						name: '个人资料',
+						disabled: false
+					},
+					{
+						id: 2,
+						name: '求职信息',
+						disabled: true
+					},
+					{
+						id: 3,
+						name: '照片资料',
+						disabled: true
+					},
+					{
+						id: 4,
+						name: '办证信息',
+						disabled: true
+					},
+
 				],
-				
+				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: {},
 			}
 		},
 		components: {
@@ -43,35 +108,66 @@
 		},
 		methods: {
 			changeTab(data) {
-				console.log('data',data);
+				console.log('data', data);
 			},
 			goUpPage() {
 				uni.redirectTo({
 					url: `/pages/admin/Jiazheng/jiazhengUserInfo`
 				})
 			},
-			gerenziliaoNext(data,num) {
-				console.log('data',data);
-				console.log('num',num);
+			gerenziliaoNext(data, num) {
+				console.log('data', data);
+				console.log('num', num);
+				this.gerenziliaoObj.userName = data.userName
+				this.gerenziliaoObj.realName = data.realName
+				this.gerenziliaoObj.idCard = data.idCard
+				this.gerenziliaoObj.jiguanShengId = data.jiguanObj.jiguanShengId
+				this.gerenziliaoObj.jiguanShiId = data.jiguanObj.jiguanShiId
+				this.gerenziliaoObj.juzhuDizhi = data.juzhuDizhi
+				this.gerenziliaoObj.minzu = data.minzu.id
+				this.gerenziliaoObj.gender = data.gender
+				this.gerenziliaoObj.xueli = data.xueli.id
+				this.gerenziliaoObj.hunyin = data.hunyin.id
+				this.gerenziliaoObj.hujiDizhi = data.hujiDizhi
+				this.gerenziliaoObj.xingzuo = data.xingzuo.id
+				this.gerenziliaoObj.shuxiang = data.shuxiang.id
+				this.gerenziliaoObj.xingzuoFlag = data.xingzuoFlag
 				this.current = num + 1
-				this.tabs[this.current].disabled = false
-				console.log('this.tabs',this.tabs);
+				this.tabs = this.tabs.map((item, i) => {
+					if (i == this.current) item.disabled = false
+					return item
+				})
+				console.log('this.gerenziliaoObj', this.gerenziliaoObj);
 			},
-			goUpQiuzhixinxi(data,num){
+			goUpQiuzhixinxi(data, num) {
 				this.current = num - 1
 			},
-			goNextQiuzhixinxi(data,num){
+			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.current].disabled = false
-			},	
-			goUpZhaopianZiliao(data,num){
+				this.tabs = this.tabs.map((item, i) => {
+					if (i == this.current) item.disabled = false
+					return item
+				})
+				console.log('this.qiuzhixinxiObj', this.qiuzhixinxiObj);
+			},
+			goUpZhaopianZiliao(data, num) {
 				this.current = num - 1
 			},
-			goNextZhaopianZiliao(data,num){
+			goNextZhaopianZiliao(data, num) {
 				this.current = num + 1
-				this.tabs[this.current].disabled = false
+				this.tabs = this.tabs.map((item, i) => {
+					if (i == this.current) item.disabled = false
+					return item
+				})
 			},
-			goUpBanzhengXinxi(data,num){
+			goUpBanzhengXinxi(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){

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -5,7 +5,7 @@
 		</view>
 		<view class="form-label-switch">
 			<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>
-		<!-- 	<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
+			<!-- 	<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="ziliao-upload-box">
 			<view class="upload-item-box">
@@ -34,7 +34,7 @@
 		</view>
 		<view class="form-label-switch form-top-margin">
 			<view class="phone-form-label"><text class="form-label-require"></text>资格类照片</view>
-		<!-- 	<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
+			<!-- 	<switch @change="switchZgChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
 		<view class="zhaopianZiliao-shenfenzhengImg">
 			<view class="ziliao-upload-box">
@@ -51,7 +51,7 @@
 		</view>
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>最近体检日期</view>
-			<uni-datetime-picker class="form-radio-picker" v-model="single" type="date" @change="changeTijian">
+			<uni-datetime-picker class="form-radio-picker" type="date" @change="changeTijian">
 				<view class="form-radio-select">
 					<view>{{tijianDate}}</view>
 					<icon></icon>
@@ -61,7 +61,7 @@
 
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>健康证日期</view>
-			<uni-datetime-picker class="form-radio-picker" v-model="single" type="date" @change="changeJiankang">
+			<uni-datetime-picker class="form-radio-picker" type="date" @change="changeJiankang">
 				<view class="form-radio-select">
 					<view>{{jiankangDate}}</view>
 					<icon></icon>
@@ -74,7 +74,8 @@
 			<view class="red-tip">（*如未经同意，体检报告均不展示在简历中;在系统中预约的体检，如有电子报告，会自动关联到简历中） </view>
 			<view>
 				<checkbox-group>
-					<checkbox value="cb" checked="true" color="#3fd2a1" style="transform:scale(0.65)" />
+					<checkbox :checked="tijianbaogaoFlag" @click="changeTijianbaogao" color="#3fd2a1"
+						style="transform:scale(0.65)" />
 					已经同意，上传个人体检报告
 				</checkbox-group>
 			</view>
@@ -111,6 +112,7 @@
 				tijianDate: '',
 				tijianUrl: '',
 				jiankangDate: '',
+				tijianbaogaoFlag: false,
 				zhengshuUrls: '',
 			}
 		},
@@ -154,6 +156,9 @@
 				this.jiankangDate = data
 
 			},
+			changeTijianbaogao(data) {
+				this.tijianbaogaoFlag = !this.tijianbaogaoFlag
+			},
 			switchSfzChange(data) {
 				console.log('data', data);
 			},
@@ -163,29 +168,22 @@
 			switchZgChange(data) {
 				console.log('data', data);
 			},
-			
+
 			goNext() {
 				this.formData = {
-					icon:this.icon,
-					idcardUrl1:this.idcardUrl1,
-					idcardUrl2:this.idcardUrl2,
-					shenghuoUrls:this.shenghuizhaoList.join(','),
-					zhengshuUrls:this.zigezhaoList.join(','),
-					tijianDate:this.tijianDate,
-					jiankangDate:this.jiankangDate,
-					tijianUrl:this.tijianUrl,
-					
+					icon: this.icon,
+					idcardUrl1: this.idcardUrl1,
+					idcardUrl2: this.idcardUrl2,
+					tijianbaogaoFlag: this.tijianbaogaoFlag,
+					shenghuoUrls: this.shenghuizhaoList.join(','),
+					zhengshuUrls: this.zigezhaoList.join(','),
+					tijianDate: this.tijianDate,
+					jiankangDate: this.jiankangDate,
+					tijianUrl: this.tijianUrl,
+
 				}
-				console.log('this.formData',this.formData);
-				// if(!this.formData.agree){
-				// 	uni.showToast({
-				// 		title: "请勾选本人同意！",
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	})
-				// 	return false
-				// }
-				this.$emit('goNext',{},2);
+				console.log('this.formData', this.formData);
+				this.$emit('goNext', this.formData, 2);
 			},
 			goUp() {
 				// if(!this.formData.agree){
@@ -196,7 +194,7 @@
 				// 	})
 				// 	return false
 				// }
-				this.$emit('goUp',{},2);
+				this.$emit('goUp', {}, 2);
 			},
 
 		},

pages/client/Kaoshi/exam.vue

@@ -232,7 +232,7 @@
 		}
 	});
 	
-	
+
 	function handleScoreClose() {
 		handleBack()
 	}
@@ -398,7 +398,7 @@
 
 	function qpZhuapai() {
 		// 重新开启抓拍
-		zhuapaiRef.value && zhuapaiRef.value.showVideoBtn()
+		zhuapaiRef.value && zhuapaiRef.value.showVideoBtn();
 	}
 	// 切屏功能 end
 
@@ -411,9 +411,10 @@
 			title: '抓拍图片异常',
 			icon: 'none'
 		})
-		uni.redirectTo({
+		/* uni.redirectTo({
 			url: '/pages/client/Kaoshi/list'
-		})
+		}) */
+		handleBack()
 	}
 
 	// 摄像头抓拍相关功能 end
@@ -427,15 +428,17 @@
 		// 	title: '摄像头唤起异常',
 		// 	icon: 'none'
 		// })
-		uni.redirectTo({
+		/* uni.redirectTo({
 			url: '/pages/client/Kaoshi/list'
-		})
+		}) */
+		handleBack()
 	}
 
 	function zpConfirmCancel() {
-		uni.redirectTo({
+		/* uni.redirectTo({
 			url: '/pages/client/Kaoshi/list'
-		})
+		}) */
+		handleBack()
 	}
 
 	// 摄像头确认相关功能 end
@@ -645,9 +648,10 @@
 			operId: data.operId,
 			biaoji: JSON.stringify(data.biaoji)
 		}).catch(err => {
-			uni.redirectTo({
+			/* uni.redirectTo({
 				url: '/pages/client/Kaoshi/list'
-			})
+			}) */
+			handleBack()
 		})
 	}
 
@@ -732,6 +736,8 @@
 				title: data.ksName
 			});
 			startCountDown.value = true;
-		})
+		}).catch(err => {
+      handleBack()
+    })
 	}
 </script>

pages/client/Lianxi/exam.vue

@@ -549,6 +549,8 @@
 				title: data.lxName
 			});
 			startCountDown.value = true;
-		})
+		}).catch(err => {
+      handleBack()
+    })
 	}
 </script>