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

pages/admin/Jiazheng/index.vue

@@ -4,7 +4,8 @@
 			<view @click="goUpPage" class="nav-bar-icon"></view>
 			<text class="nav-bar-title">家政人员</text>
 			<view class="nav-bar-icon-box">
-				<uni-icons class="nav-bar-right-icon" type="plusempty" size="18" color="#666" @click="addJiazhengRenyuan"></uni-icons>
+				<uni-icons class="nav-bar-right-icon" type="plusempty" size="18" color="#666"
+					@click="addJiazhengRenyuan"></uni-icons>
 				<uni-icons class="nav-bar-right-icon" type="search" size="18" color="#666"
 					@click="toggle('top')"></uni-icons>
 			</view>
@@ -41,7 +42,8 @@
 						<template v-slot:body>
 							<view class="card-head-row">
 								<view class="head-name">{{item.realName}}</view>
-								<button type="default" class="phone-green-btn bz-tel-btn" @click.stop="telephone(item)">打电话</button>
+								<button type="default" class="phone-green-btn bz-tel-btn"
+									@click.stop="telephone(item)">打电话</button>
 							</view>
 							<view @click="lookUserInfo(item)" class="card-body-row">
 								<view class="card-img-box">
@@ -50,7 +52,8 @@
 								</view>
 								<view class="body-content-row">
 									<view class="content-text-row">
-										<view> {{item.age}}岁<text v-if="item.jingyan"> ｜ {{item.jingyan}}年经验</text></view>
+										<view> {{item.age}}岁<text v-if="item.jingyan"> ｜ {{item.jingyan}}年经验</text>
+										</view>
 										<view class="text-status">{{item.zhuangtai}}</view>
 									</view>
 									<view class="content-text-row">{{item.jiguan}}</view>
@@ -225,9 +228,19 @@
 
 	function telephone(data) {
 		console.log('data', data);
-		uni.makePhoneCall({
-			phoneNumber: '114' //仅为示例
-		});
+		if (data.userName) {
+			uni.makePhoneCall({
+				phoneNumber: data.userName
+			});
+		} else {
+			uni.showToast({
+				title: `无电话号`,
+				icon: 'none',
+				duration: 2000
+			})
+			return false
+		}
+
 	}
 
 

pages/admin/Jiazheng/jiazhengUserInfo.vue

@@ -13,14 +13,16 @@
 				</view>
 				<view class="head-content-box">
 					<view class="name-row">{{jianliInfo.realName}}</view>
-					<view>{{jianliInfo.jiguan}}人</view>
+					<view>
+						{{jianliInfo.jiguanShengName === jianliInfo.jiguanShiName ? jianliInfo.jiguanShengName  : `${jianliInfo.jiguanShengName} ${jianliInfo.jiguanShiName}`}}人
+					</view>
 					<view>
 						<text>{{jianliInfo.nianling}}岁</text>
 						<text v-if="jianliInfo.jingyan"> | {{jianliInfo.jingyan}}</text>
 					</view>
 				</view>
 			</view>
-		
+
 			<view class="jianli-body-box">
 				<view class="leixing-row">
 					<view class="jbxx-label">类 型：</view>
@@ -28,14 +30,30 @@
 				</view>
 				<view class="body-jbxx-box">
 					<view class="jbxx-title">基本信息</view>
-					<view><view class="jbxx-label">学 历：</view>{{jianliInfo.xieli}}</view>
-					<view><view class="jbxx-label">民 族：</view>{{jianliInfo.minzu}} </view>
-					<view><view class="jbxx-label">属 相：</view>{{jianliInfo.shuxiang}} </view>
-					<view><view class="jbxx-label">星 座：</view>{{jianliInfo.xingzuo}} </view>
-					<view><view class="jbxx-label">性 别：</view>{{jianliInfo.gender}} </view>
-					<view><view class="jbxx-label">婚姻状况：</view>{{jianliInfo.hunyin}} </view>
-					<view><view class="jbxx-label">现住地址：</view>{{jianliInfo.juzhuDizhi}} </view>
-					<view><view class="jbxx-label">家政公司：</view>{{jianliInfo.jzName}} </view>
+					<view>
+						<view class="jbxx-label">学 历：</view>{{jianliInfo.xueli}}
+					</view>
+					<view>
+						<view class="jbxx-label">民 族：</view>{{jianliInfo.minzu}}
+					</view>
+					<view>
+						<view class="jbxx-label">属 相：</view>{{jianliInfo.shuxiang}}
+					</view>
+					<view>
+						<view class="jbxx-label">星 座：</view>{{jianliInfo.xingzuo}}
+					</view>
+					<view>
+						<view class="jbxx-label">性 别：</view>{{jianliInfo.gender}}
+					</view>
+					<view>
+						<view class="jbxx-label">婚姻状况：</view>{{jianliInfo.hunyin}}
+					</view>
+					<view>
+						<view class="jbxx-label">现住地址：</view>{{jianliInfo.juzhuDizhi}}
+					</view>
+					<view>
+						<view class="jbxx-label">家政公司：</view>{{jianliInfo.jzName}}
+					</view>
 					<view class="jbxx-tip">{{jianliInfo.tips}} </view>
 				</view>
 			</view>
@@ -44,7 +62,7 @@
 					<icon class="bottom-icon zl-icon"></icon>
 					<text class="bottom-text">资料编辑</text>
 				</view>
-				<view>
+				<view @click="callPhone">
 					<icon class="bottom-icon tel-icon"></icon>
 					<text class="bottom-text">拨打电话</text>
 				</view>
@@ -63,7 +81,7 @@
 		data() {
 			return {
 				pageInfo: {},
-				jianliInfo:{}
+				jianliInfo: {}
 			}
 		},
 		components: {
@@ -84,11 +102,28 @@
 				}
 				getJiazhengJianli(req).then(res => {
 					console.log('res', res);
-					if(res.code ==0){
-						this.jianliInfo = { ...res.data };
+					if (res.code == 0) {
+						this.jianliInfo = {
+							...res.data
+						};
 					}
 				})
 			},
+			callPhone() {
+				if (this.jianliInfo.userName) {
+					uni.makePhoneCall({
+						phoneNumber: this.jianliInfo.userName
+					});
+				} else {
+					uni.showToast({
+						title: `无电话号`,
+						icon: 'none',
+						duration: 2000
+					})
+					return false
+				}
+
+			},
 			goJiazhengManage() {
 				let pageInfo = {
 					status: 'edit',
@@ -107,4 +142,4 @@
 
 		}
 	}
-</script>
+</script>

pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -16,6 +16,24 @@
 			</view>
 		</view>
 		<view class="form-label-switch form-top-margin">
+			<view class="phone-form-label"><text class="form-label-require"></text>体检报告</view>
+			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
+		</view>
+		<view class="zhaopianZiliao-shenfenzhengImg">
+			<view class="ziliao-upload-box">
+				<view v-if="tijianbaogaoList.length>0">
+					<view v-for="(item, index) in tijianbaogaoList" :key="index">
+						<img style="width: 100rpx;height: 100rpx;" :src="item" alt="">
+						<view @click="deleteTijianbaogao(item,index)">删除</view>
+					</view>
+				</view>
+				<view>
+					<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
+				</view>
+			</view>
+		</view>
+
+		<view class="form-label-switch form-top-margin">
 			<view class="phone-form-label"><text class="form-label-require"></text>工作生活照</view>
 			<!-- <switch @change="switchGzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
 		</view>
@@ -69,7 +87,7 @@
 			</uni-datetime-picker>
 		</view>
 
-		<view class="zpzl-tip-box form-top-margin">
+		<!-- 	<view class="zpzl-tip-box form-top-margin">
 			<view>体检报告文件</view>
 			<view class="red-tip">（*如未经同意，体检报告均不展示在简历中;在系统中预约的体检，如有电子报告，会自动关联到简历中） </view>
 			<view>
@@ -84,7 +102,7 @@
 				可点击下方上传体检报告
 			</view>
 			<button type="default" class="phone-green-btn scbg-btn">＋从手机上传体检报告(pdf)</button>
-		</view>
+		</view> -->
 
 		<view class="page-btn-box">
 			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
@@ -104,6 +122,7 @@
 
 			return {
 				shenghuizhaoList: [],
+				tijianbaogaoList: [],
 				zigezhaoList: [],
 				icon: '',
 				idcardUrl1: '',
@@ -126,17 +145,17 @@
 		},
 		methods: {
 			editinfo(data) {
-				console.log('data',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.tijianUrls = data.tijianUrls
-			
+					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.tijianUrls = data.tijianUrls == '' ? '' : data.tijianUrls.split(",")
+					this.tijianDate = data.tijianDate
+					this.jiankangDate = data.jiankangDate
+
 				})
 			},
 			getTouxiang(data) {
@@ -155,6 +174,10 @@
 				console.log('getGzShenghuozhao', data);
 				this.shenghuizhaoList.push(data);
 			},
+			getTijianbaogao(data) {
+				console.log('getTijianbaogao', data);
+				this.tijianbaogaoList.push(data);
+			},
 			getZigezhao(data) {
 				console.log('getZigezhao', data);
 				this.zigezhaoList.push(data);
@@ -162,6 +185,9 @@
 			deleteZigeZhao(data, index) {
 				this.zigezhaoList.splice(index, 1);
 			},
+			deleteTijianbaogao(data, index) {
+				this.tijianbaogaoList.splice(index, 1);
+			},
 			deleteShenghuoZhao(data, index) {
 				this.shenghuizhaoList.splice(index, 1);
 			},
@@ -194,11 +220,12 @@
 					idcardUrl1: this.idcardUrl1,
 					idcardUrl2: this.idcardUrl2,
 					tijianbaogaoFlag: this.tijianbaogaoFlag,
-					shenghuoUrls: this.shenghuizhaoList.join(','),
-					zhengshuUrls: this.zigezhaoList.join(','),
+					shenghuoUrls:  this.shenghuizhaoList?this.shenghuizhaoList.join(','):'',
+					zhengshuUrls:  this.zigezhaoList?this.zigezhaoList.join(','):'',
+					tijianUrls:  this.tijianbaogaoList?this.tijianbaogaoList.join(','):'',
 					tijianDate: this.tijianDate,
 					jiankangDate: this.jiankangDate,
-					tijianUrls: this.tijianUrls,
+
 
 				}
 				console.log('this.formData', this.formData);
@@ -210,11 +237,11 @@
 					idcardUrl1: this.idcardUrl1,
 					idcardUrl2: this.idcardUrl2,
 					tijianbaogaoFlag: this.tijianbaogaoFlag,
-					shenghuoUrls: this.shenghuizhaoList.length>0?this.shenghuizhaoList.join(','):'',
-					shenghuoUrls: this.zigezhaoList.length>0?this.zigezhaoList.join(','):'',
+					shenghuoUrls: this.shenghuizhaoList.length > 0 ? this.shenghuizhaoList.join(',') : '',
+					zhengshuUrls: this.zigezhaoList.length > 0 ? this.zigezhaoList.join(',') : '',
 					tijianDate: this.tijianDate,
 					jiankangDate: this.jiankangDate,
-					tijianUrls: this.tijianUrls,
+					tijianUrls:  this.tijianbaogaoList?this.tijianbaogaoList.join(','):'',
 
 				}
 				console.log('this.formData', this.formData);