1

api/jiazheng.js

@@ -179,3 +179,27 @@ export function getJiazhengBanzhengCheckKc(data = {}) {
     timeout: 20000
   })
 }
+
+export function getJiazhengJianli(data = {}) {
+  return request({
+    url: '/app/user/jiazheng/jianli',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}
+
+export function getJiazhengInfo(data = {}) {
+  return request({
+    url: '/app/user/jiazheng/info',
+    headers: {
+      isToken: false
+    },
+    method: 'post',
+    data,
+    timeout: 20000
+  })
+}

pages/Login/components/loginBox.vue

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

pages/admin/Jiazheng/common/dataChecked.vue

@@ -12,11 +12,12 @@
 
 		<!-- 展开/收起按钮 -->
 		<view class="radio-btn-box label-radio-btn-box">
-			<view v-if="showExpandButton" :class="[{ 'radio-btn': true }, showAll ? 'collapsed-btn' : 'expanded-btn']" @click="toggleExpand">
+			<view v-if="showExpandButton" :class="[{ 'radio-btn': true }, showAll ? 'collapsed-btn' : 'expanded-btn']"
+				@click="toggleExpand">
 				{{ showAll ? '收起' : `展开` }}
 			</view>
 		</view>
-		
+
 
 		<!-- 	<view v-if="showExpandButton" class="expand-button" @click="toggleExpand">
 			{{ showAll ? '收起' : `展开剩余${remainingCount}项` }}
@@ -60,6 +61,11 @@
 				type: String,
 				default: 'multiple', // 'single' | 'multiple'
 				validator: (value) => ['single', 'multiple'].includes(value)
+			},
+			// 外部传入的已选id（单选时为单个id，多选时为id数组）
+			selectedIds: {
+				type: [Array, Number],
+				default: () => []
 			}
 		},
 		data() {
@@ -84,6 +90,22 @@
 				return this.showAll || this.list.length < this.defaultCount;
 			}
 		},
+		watch: {
+			// 监听外部传入的selectedIds变化，更新selectedData
+			selectedIds: {
+		
+				handler(newVal) {
+					if (this.mode === 'single') {
+						// 单选模式
+						const selectedItem = this.list.find(item => item.id == newVal);
+						this.selectedData = selectedItem ? [selectedItem] : [];
+					} else {
+						// 多选模式
+						this.selectedData = this.list.filter(item => newVal.includes(item.id));
+					}
+				}
+			}
+		},
 		methods: {
 			isSelected(id) {
 				return this.selectedData.some(item => item.id === id);
@@ -147,7 +169,7 @@
 				}
 
 				const newObject = {
-					id: this.list.length, // 使用时间戳作为临时ID
+					id: this.list.length, 
 					name: this.newName
 				};
 				console.log('list', this.list);
@@ -167,7 +189,6 @@
 </script>
 
 <style scoped>
-
 	.add-block {
 		background: transparent;
 		border: 1px dashed #007aff;

pages/admin/Jiazheng/gerenZiliao.vue

@@ -38,7 +38,7 @@
 			<picker mode="multiSelector" :range="multiArray" :range-key="'label'" :value="multiIndex"
 				@columnchange="bindMultiPickerColumnChange" @change="onPickerConfirm">
 				<view class="picker">
-					{{ formData.jiguanShengName}}-{{formData.jiguanShiName}} 箭头
+					{{ formData.jiguanShengName}} {{formData.jiguanShiName}} 箭头
 				</view>
 			</picker>
 		</view>
@@ -67,11 +67,13 @@
 		</view>
 		<view class="form-label-radio form-top-margin flex-start-row">
 			<view class="phone-form-label"><text class="form-label-require">*</text>学历</view>
-			<dataChecked :list="xueliList" mode="single" :showAdd="false" @change="selectChangeXueliList" />
+			<dataChecked :list="xueliList" :selectedIds='formData.xueli.id' mode="single" :showAdd="false"
+				@change="selectChangeXueliList" />
 		</view>
 		<view class="form-label-radio flex-start-row">
 			<view class="phone-form-label"><text></text>婚姻 </view>
-			<dataChecked :list="hunyinList" mode="single" :showAdd="false" @change="selectChangeHunyinList" />
+			<dataChecked :list="hunyinList" mode="single" :selectedIds='formData.hunyin.id' :showAdd="false"
+				@change="selectChangeHunyinList" />
 		</view>
 
 		<view class="form-label-input form-top-margin flex-start-row">
@@ -150,16 +152,24 @@
 					idcard: '',
 					icon: '',
 					birthday: '',
-					hometown: [],
 					hujiDizhi: '',
 					idtype: '1',
 					gender: '',
 					juzhuDizhi: '',
 					minzu: {},
-					shuxiang: {},
-					xingzuo: {},
-					hunyin: {},
-					xueli: {},
+					shuxiang: {
+
+					},
+					xingzuo: {
+
+					},
+					hunyin: {
+						name: '',
+
+					},
+					xueli: {
+
+					},
 					jiguanObj: {},
 					jiguanShengId: '',
 					jiguanShiId: '',
@@ -172,6 +182,8 @@
 					xingzuoFlag: false
 
 				},
+				selectedIds: [3],
+				ceshidata: '',
 				xueliList: [],
 				hunyinList: [],
 				shuxiangList: [],
@@ -188,16 +200,55 @@
 			}
 		},
 		created() {
-			this.getXueli()
-			this.getHunyin()
-			this.getMinzu()
-			this.getXingzuo()
-			this.getShuxiang()
-			this.getJiguan()
-			console.log('this.statusstatusstatus', this.status);
+
+			this.initRequests()
+
+
 
 		},
 		methods: {
+
+			async initRequests() {
+				await Promise.all([
+					this.getXueli(),
+					this.getHunyin(),
+					this.getMinzu(),
+					this.getXingzuo(),
+					this.getShuxiang(),
+					this.getJiguan(),
+				]);
+				this.$emit('finishDom');
+			},
+			editinfo(data) {
+				this.$nextTick(() => {
+					console.log('data11111', data);
+
+					this.formData.userName = data.userName
+					this.formData.realName = data.realName
+					this.formData.idcard = data.idcard
+					this.formData.idtype = data.idtype
+					this.formData.jiguanObj.jiguanShengId = data.jiguanShengId
+					this.formData.jiguanShengName = data.jiguanShengName
+					this.formData.jiguanObj.jiguanShiId = data.jiguanShiId
+					this.formData.jiguanShiName = data.jiguanShiName
+					this.formData.juzhuDizhi = data.juzhuDizhi
+					this.formData.birthday = data.birthday
+					this.formData.minzu = this.dataForId(this.minzuList, data.minzu)
+					this.formData.gender = data.gender
+					this.formData.xueli = this.dataForId(this.xueliList, data.xueli)
+					this.formData.hunyin = this.dataForId(this.hunyinList, data.hunyin)
+					this.formData.hujiDizhi = data.hujiDizhi
+					this.formData.juzhuDizhi = data.juzhuDizhi
+					this.formData.xingzuo = this.dataForId(this.xingzuoList, data.xingzuo)||''
+					this.formData.shuxiang = this.dataForId(this.shuxiangList, data.xingzuo)||''
+					this.formData.xingzuoFlag = data.xingzuoFlag
+
+				})
+			},
+			dataForId(list, id) {
+				return list.find(item => item.id == id);
+			},
+
 			idCardChange(data) {
 				this.formData.idtype = this.formData.idtype == 1 ? 2 : 1;
 			},

pages/admin/Jiazheng/jiazhengUserInfo.vue

@@ -5,50 +5,46 @@
 			<text class="nav-bar-title">家政人员信息</text>
 		</view>
 		<view>
-			<img src="" alt="" />
-			<view>上户中</view>
+			<img style="width: 100rpx;height: 100rpx;" :src="jianliInfo.icon" alt="" />
+			<view>{{jianliInfo.zhuangtai}}</view>
 			<view>
-				<p>孙正</p>
-				<p>49岁|大连人</p>
-				<p>完善度:100%</p>
+				<p>{{jianliInfo.realName}}</p>
+				<p>{{jianliInfo.nianling}}岁|{{jianliInfo.jiguan}}人</p>
 			</view>
 		</view>
 
 		<view>
-			类型：家政人员，病人护理
+			类型：{{jianliInfo.leixing}}
 		</view>
 		<view>
 			<view>
 				<h1>基本信息</h1>
 				<view>
-					学历:初中
+					学历:{{jianliInfo.xieli}}
 				</view>
 				<view>
-					民族:汉族
+					民族:{{jianliInfo.minzu}}
 				</view>
 				<view>
-					属相:小鸡
+					属相:{{jianliInfo.shuxiang}}
 				</view>
 				<view>
-					星座:天蝎座
+					星座:{{jianliInfo.xingzuo}}
 				</view>
 				<view>
-					性别:男
+					性别:{{jianliInfo.gender}}
 				</view>
 				<view>
-					婚姻状况:未婚
+					婚姻状况:{{jianliInfo.hunyin}}
 				</view>
 				<view>
-					住家情况:居家
+					现住地址:{{jianliInfo.juzhuDizhi}}
 				</view>
 				<view>
-					现住地址:四川省成都市青羊区鼓楼南街117号（世界贸易中心）
+					家政公司:{{jianliInfo.jzName}}
 				</view>
 				<view>
-					所在门店:大连门店
-				</view>
-				<view>
-					2025年01月17日由吉祥母婴的（刘海老师）录入
+				{{jianliInfo.tips}}
 				</view>
 			</view>
 		</view>
@@ -67,11 +63,14 @@
 	import {
 		ref
 	} from "vue";
-
+	import {
+		getJiazhengJianli
+	} from "@/api/jiazheng.js";
 	export default {
 		data() {
 			return {
-				pageInfo:{}
+				pageInfo: {},
+				jianliInfo:{}
 			}
 		},
 		components: {
@@ -82,20 +81,28 @@
 			this.pageInfo.status = data.status
 			this.pageInfo.id = data.id
 			this.pageInfo.userId = data.userId
-			this.dataHandle()
+			this.getJianliInfo()
 		},
 		methods: {
-			dataHandle() {
-
+			getJianliInfo() {
+				let req = {
+					id: this.pageInfo.id
+				}
+				getJiazhengJianli(req).then(res => {
+					console.log('res', res);
+					if(res.code ==0){
+						this.jianliInfo = { ...res.data };
+					}
+				})
 			},
 			goJiazhengManage() {
 				let pageInfo = {
-					status:'edit',
-					id:this.pageInfo.id,
-					userId:this.pageInfo.userId
+					status: 'edit',
+					id: this.pageInfo.id,
+					userId: this.pageInfo.userId
 				}
 				uni.redirectTo({
-					url: "/pages/admin/Jiazheng/jiazhengUserManager?pageInfo="+JSON.stringify(pageInfo)
+					url: "/pages/admin/Jiazheng/jiazhengUserManager?pageInfo=" + JSON.stringify(pageInfo)
 				})
 			},
 			goUpPage() {

pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -6,12 +6,13 @@
 		</view>
 		<v-tabs v-model="current" :tabs="tabs" :scroll="false" @change="changeTab" field="name"
 			class="admin-tab-box"></v-tabs>
-		<gerenZiliao ref="gerenZiliao" :status='status' @editSave="editSaveGerenziliao" @goNext="gerenziliaoNext" v-show="current ==0"></gerenZiliao>
-		<qiuzhiXinxi ref="qiuzhiXinxi" :status='status' @editSave="editSaveQiuzhixinxi" @goUp="goUpQiuzhixinxi" @goNext="goNextQiuzhixinxi"
+		<gerenZiliao ref="gerenZiliao" :status='status' @finishDom='finishDom' @editSave="editSaveGerenziliao"
+			@goNext="gerenziliaoNext" v-show="current ==0"></gerenZiliao>
+		<qiuzhiXinxi ref="qiuzhiXinxi" :status='status' @editSave="editSaveQiuzhixinxi" @goNext="goNextQiuzhixinxi"
 			v-show="current ==1">
 		</qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" :status='status'  @editSave="editSaveZhaopianziliao" @goUp="goUpZhaopianZiliao" @goNext="goNextZhaopianZiliao"
-			v-show="current ==2"></zhaopianZiliao>
+		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @editSave="editSaveZhaopianziliao"
+			@goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
 		<banzhengXinxi ref="banzhengXinxi" :status='status' @addSave="addSave" v-show="current ==3">
 		</banzhengXinxi>
 	</view>
@@ -25,6 +26,9 @@
 	import qiuzhiXinxi from './qiuzhiXinxi.vue';
 	import zhaopianZiliao from './zhaopianZiliao.vue';
 	import gerenZiliao from './gerenZiliao.vue';
+	import {
+		getJiazhengInfo
+	} from "@/api/jiazheng.js";
 	export default {
 		data() {
 			return {
@@ -80,10 +84,10 @@
 		onLoad(options) {
 			let pageInfo = JSON.parse(options.pageInfo)
 			this.status = pageInfo.status
-			this.dataHandle()
+			this.dataHandle(pageInfo)
 		},
 		methods: {
-			dataHandle() {
+			dataHandle(pageInfo) {
 				if (this.status == 'add') {
 					this.tabs = [{
 							id: 1,
@@ -130,12 +134,30 @@
 							disabled: false
 						},
 					]
+
+				}
+			},
+			finishDom() {
+				let req = {
+					id: this.id,
+					userId: this.userId
 				}
+				getJiazhengInfo(req).then(res => {
+					if (res.code == 0) {
+						this.$refs.gerenZiliao.editinfo(res.data)
+					} else {
+						uni.showToast({
+							icon: 'none',
+							title: '获取详情失败'
+						})
+						return false
+					}
+				})
 			},
 			changeTab(data) {
 				console.log('data', data);
 			},
-			gerenZiliaoDataHandle(data){
+			gerenZiliaoDataHandle(data) {
 				this.allData.userName = data.userName
 				this.allData.realName = data.realName
 				this.allData.idcard = data.idcard
@@ -161,10 +183,10 @@
 					return item
 				})
 			},
-			editSaveGerenziliao(data){
+			editSaveGerenziliao(data) {
 				this.gerenZiliaoDataHandle(data)
 			},
-			qiuzhiXinxiDataHandle(data){
+			qiuzhiXinxiDataHandle(data) {
 				this.allData.leixing = data.leixing
 				this.allData.jingyan = data.jingyan
 				this.allData.jineng = data.jineng
@@ -181,10 +203,10 @@
 					return item
 				})
 			},
-			editSaveQiuzhixinxi(data){
+			editSaveQiuzhixinxi(data) {
 				this.qiuzhiXinxiDataHandle(data)
 			},
-			
+
 			goNextZhaopianZiliao(data, num) {
 				this.zhaopianziliaoDataHandle(data)
 				this.current = num + 1
@@ -193,7 +215,7 @@
 					return item
 				})
 			},
-			zhaopianziliaoDataHandle(){
+			zhaopianziliaoDataHandle() {
 				this.allData.icon = data.icon
 				this.allData.idcardUrl1 = data.idcardUrl1
 				this.allData.idcardUrl2 = data.idcardUrl2
@@ -203,7 +225,7 @@
 				this.allData.jiankangDate = data.jiankangDate
 				this.allData.tijianUrl = data.tijianUrl
 			},
-			editSaveZhaopianziliao(data){
+			editSaveZhaopianziliao(data) {
 				this.zhaopianziliaoDataHandle(data)
 			},
 			addSave(data) {
@@ -212,6 +234,9 @@
 			},
 			submitJiazheng() {
 				console.log('this.allData', this.allData);
+			},
+			goUpPage() {
+
 			}
 
 		}