浏览代码

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

wangxy 2 月之前
父节点
当前提交
0a82970004

+ 3 - 12
pages/Login/components/loginBox.vue

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

+ 20 - 5
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'

+ 117 - 26
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,80 @@
 	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: 1,
+				//	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 +110,59 @@
 		},
 		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.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.tabs', this.tabs);
+			},
+			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
 			}
 		}

+ 2 - 2
pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -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>