wangguoyu 3 mesi fa
parent
commit
9cd3d3b1df

+ 20 - 2
pages/admin/Jiazheng/common/dataChecked.vue

@@ -66,6 +66,10 @@
 			selectedIds: {
 				type: [Array, Number],
 				default: () => []
+			},
+			selectedNames: {
+				type: String,
+				default: ''
 			}
 		},
 		data() {
@@ -93,7 +97,7 @@
 		watch: {
 			// 监听外部传入的selectedIds变化,更新selectedData
 			selectedIds: {
-		
+
 				handler(newVal) {
 					if (this.mode === 'single') {
 						// 单选模式
@@ -104,6 +108,20 @@
 						this.selectedData = this.list.filter(item => newVal.includes(item.id));
 					}
 				}
+			},
+			// 监听外部传入的selectedNames变化,更新selectedData
+			selectedNames: {
+				immediate: true,
+				handler(newVal) {
+					if (!newVal) {
+						this.selectedData = [];
+						return;
+					}
+					// 将字符串解析为名称数组
+					const names = newVal.split(',').map(name => name.trim());
+					// 根据名称从list中找到对应的数据
+					this.selectedData = this.list.filter(item => names.includes(item.name));
+				}
 			}
 		},
 		methods: {
@@ -169,7 +187,7 @@
 				}
 
 				const newObject = {
-					id: this.list.length, 
+					id: this.list.length,
 					name: this.newName
 				};
 				console.log('list', this.list);

+ 12 - 0
pages/admin/Jiazheng/common/jiazhengUpload.vue

@@ -34,8 +34,20 @@
 			changjingType:{
 					type: String,
 					default: ''
+			},
+			img:{
+				type: String,
+				default: ''
 			}
 		},
+		watch: {
+			img: {
+				handler(newVal) {
+				this.imageUrl  =newVal
+				}
+			},
+	
+		},
 		methods: {
 			showActionSheet() {
 				uni.showActionSheet({

+ 6 - 5
pages/admin/Jiazheng/gerenZiliao.vue

@@ -217,12 +217,13 @@
 					this.getShuxiang(),
 					this.getJiguan(),
 				]);
-				this.$emit('finishDom');
+				if (this.status == 'edit') {
+					this.$emit('finishDom','gerenZiliao');
+				}
+
 			},
 			editinfo(data) {
 				this.$nextTick(() => {
-					console.log('data11111', data);
-
 					this.formData.userName = data.userName
 					this.formData.realName = data.realName
 					this.formData.idcard = data.idcard
@@ -239,8 +240,8 @@
 					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.xingzuo = this.dataForId(this.xingzuoList, data.xingzuo) || ''
+					this.formData.shuxiang = this.dataForId(this.shuxiangList, data.xingzuo) || ''
 					this.formData.xingzuoFlag = data.xingzuoFlag
 
 				})

+ 29 - 1
pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -73,6 +73,7 @@
 				status: '',
 				id: '',
 				userId: '',
+				editInfo: {}
 			}
 		},
 		components: {
@@ -145,6 +146,7 @@
 				getJiazhengInfo(req).then(res => {
 					if (res.code == 0) {
 						this.$refs.gerenZiliao.editinfo(res.data)
+						this.editInfo = res.data
 					} else {
 						uni.showToast({
 							icon: 'none',
@@ -156,6 +158,32 @@
 			},
 			changeTab(data) {
 				console.log('data', data);
+				this.current = data
+				if(this.status !='edit'){
+					return false
+				}
+				switch (Number(data)) {
+					case 0:
+						this.$refs.gerenZiliao.editinfo(this.editInfo)
+						break;
+					case 1:
+						this.$refs.qiuzhiXinxi.editinfo(this.editInfo)
+						break;
+					case 2:
+						this.$refs.zhaopianZiliao.editinfo(this.editInfo)
+						break;
+					case 3:
+						this.$refs.banzhengXinxi.editinfo(this.editInfo)
+						break;
+					default:
+						break;
+				}
+
+				if (this.status == 'edit' && this.current == 1) {
+				
+				}
+
+
 			},
 			gerenZiliaoDataHandle(data) {
 				this.allData.userName = data.userName
@@ -215,7 +243,7 @@
 					return item
 				})
 			},
-			zhaopianziliaoDataHandle() {
+			zhaopianziliaoDataHandle(data) {
 				this.allData.icon = data.icon
 				this.allData.idcardUrl1 = data.idcardUrl1
 				this.allData.idcardUrl2 = data.idcardUrl2

+ 37 - 13
pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -2,7 +2,8 @@
 	<view class="jz-content-box">
 		<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="typeList" mode="multiple" :defaultCount="9" @change="selectChangeType" @add="addType" />
+			<dataChecked :list="typeList" mode="multiple" :defaultCount="9" :selectedNames="leixing"
+				@change="selectChangeType" @add="addType" />
 		</view>
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require">*</text>经验</view>
@@ -16,12 +17,13 @@
 		</view>
 		<view class="form-label-radio flex-start-row">
 			<view class="phone-form-label"><text class="form-label-require">*</text>技能</view>
-			<dataChecked :list="skillList" mode="multiple" :defaultCount="9" @change="selectChangeSkill"
-				@add="addSkill" />
+			<dataChecked :list="skillList" mode="multiple" :defaultCount="9" :selectedNames="jineng"
+				@change="selectChangeSkill" @add="addSkill" />
 		</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="zhuangtaiList" mode="single" :showAdd="false" @change="selectChangeZhuangtai" />
+			<dataChecked :list="zhuangtaiList" mode="single" :selectedIds='zhuangtai' :showAdd="false"
+				@change="selectChangeZhuangtai" />
 		</view>
 		<view class="form-label-select">
 			<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
@@ -63,9 +65,8 @@
 		},
 		// onLoad 是 uni-app 的页面生命周期钩子,不需要导入
 		created() {
-			this.getLeixing()
-			this.getJineng()
-			this.getZhuangtai()
+
+			this.initRequests()
 		},
 		props: {
 			status: {
@@ -94,6 +95,27 @@
 			};
 		},
 		methods: {
+			async initRequests() {
+				await Promise.all([
+					this.getLeixing(),
+					this.getJineng(),
+					this.getZhuangtai()
+				]);
+			},
+			editinfo(data) {
+				this.$nextTick(() => {
+					console.log('data11111', data);
+					this.leixing = data.leixing
+					this.jingyan = data.jingyan
+					this.jineng = data.jineng
+					this.zhuangtai = data.zhuangtai
+					this.jibiexinzi = data.jibiexinzi
+					this.qiwangxinzi = data.qiwangxinzi
+					this.jingli = data.jingli
+
+				})
+			},
+
 			// 点击完成按钮的时候触发,
 			xinziJibieChange(e) {
 				//通过e.detail.value获取值,获取的是自定义数据的下标
@@ -111,18 +133,18 @@
 			jingyanCancel() {
 				this.jingyanIndex = 0
 			},
-			getLeixing() {
-				getJiazhengLeixing({}).then(res => {
+			getJineng() {
+				getJiazhengJineng({}).then(res => {
 					this.skillList = this.dataConversionObject(res.data)
-					console.log('this.skillList', this.skillList);
+
 				}).catch(error => {
 					console.error('获取技能类型失败:', error);
 				});
 			},
-			getJineng() {
-				getJiazhengJineng({}).then(res => {
+			getLeixing() {
+				getJiazhengLeixing({}).then(res => {
 					this.typeList = this.dataConversionObject(res.data)
-					console.log('this.typeList', this.typeList);
+
 				}).catch(error => {
 					console.error('获取技能类型失败:', error);
 				});
@@ -238,7 +260,9 @@
 				}
 			},
 			editSave() {
+
 				let ispass = this.yanzheng()
+				console.log('this.formData', this.formData);
 				if (ispass) {
 					this.$emit('editSave', this.formData);
 				}

+ 17 - 3
pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -1,7 +1,7 @@
 <template>
 	<view class="jz-content-box">
 		<view class="upload-img-box">
-			<jiazhengUpload @getFileUrl="getTouxiang" bottomText="上传头像和生活照"></jiazhengUpload>
+			<jiazhengUpload @getFileUrl="getTouxiang" :img='icon' bottomText="上传头像和生活照"></jiazhengUpload>
 		</view>
 		<view class="form-label-switch">
 			<view class="phone-form-label"><text class="form-label-require"></text>身份证照片</view>
@@ -9,10 +9,10 @@
 		</view>
 		<view class="ziliao-upload-box">
 			<view class="upload-item-box">
-				<jiazhengUpload @getFileUrl="getSfzTouxiang" bottomText="上传身份证头像面"></jiazhengUpload>
+				<jiazhengUpload @getFileUrl="getSfzTouxiang" :img='idcardUrl1' bottomText="上传身份证头像面"></jiazhengUpload>
 			</view>
 			<view class="upload-item-box">
-				<jiazhengUpload @getFileUrl="getSfzGuohui" bottomText="上传身份证国徽面"></jiazhengUpload>
+				<jiazhengUpload @getFileUrl="getSfzGuohui" :img='idcardUrl2' bottomText="上传身份证国徽面"></jiazhengUpload>
 			</view>
 		</view>
 		<view class="form-label-switch form-top-margin">
@@ -125,6 +125,20 @@
 			jiazhengUpload
 		},
 		methods: {
+			editinfo(data) {
+				console.log('data',data);
+				this.$nextTick(() => {
+				this.icon = data.icon
+				this.idcardUrl1 = data.idcardUrl1
+				this.idcardUrl2 = data.idcardUrl2
+				this.shenghuizhaoList = data.shenghuoUrls ==''?'': data.shenghuoUrls.split(",")
+				this.zigezhaoList = data.zhengshuUrls ==''?'': data.shenghuoUrls.split(",")
+				this.tijianDate = data.tijianDate
+				this.jiankangDate = data.jiankangDate
+				this.tijianUrl = data.tijianUrl
+			
+				})
+			},
 			getTouxiang(data) {
 				this.icon = data
 				console.log('getTouxiang', data);