wangguoyu 1 hónapja
szülő
commit
90ab3bfad0

+ 98 - 92
pages/admin/Jiazheng/banzhengXinxi.vue

@@ -1,104 +1,107 @@
 <template>
 	<view class="jz-content-box">
-		<view class="content-body-box">
-			<view v-if="status =='add'" class="bzsm-tip-box form-top-margin">
-				<view class="title-btn-box">
-					<view class="phone-line-title">说明</view>
-					<view @click="resetFun" class="reset-btn">重置</view>
-				</view>
-				<view class="tip-content-box">1.如果不需要办理证书,可直接点击保存按钮。</view>
-				<view class="tip-content-box">2.点击重置按钮,只重置办证信息,其他信息不改变。</view>
-			</view>
-			<!-- 报证机构(picker 实现下拉选择) -->
-			<view class="form-label-select form-top-margin">
-				<view class="phone-form-label"><text class="form-label-require">*</text>报证机构</view>
-				<picker :disabled="(status =='edit'&&localStatus=='')" mode="selector" :range="jigouNames"
-					@change="jigouChange" class="select-picker-box">
-					<view class="form-radio-select"
-						:class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
-						<view>{{ formData.baozhengJigouName || '请选择报证机构' }}</view>
-						<icon></icon>
-					</view>
-				</picker>
-			</view>
-			<!-- 职业名称(picker 实现下拉选择) -->
-			<view class="form-label-select">
-				<view class="phone-form-label"><text class="form-label-require">*</text>职业名称</view>
-				<picker mode="selector" :disabled="isJgFlag" :style="isJgFlag?'color:#999':''" :range="zhiyeNames"
-					range-key="name" @change="zhiyeChange" class="select-picker-box">
-					<view class="form-radio-select">
-						<view>{{ formData.zhiyeName || '请选择职业名称' }}</view>
-						<icon></icon>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="content-body-box">
+				<view v-if="status =='add'" class="bzsm-tip-box form-top-margin">
+					<view class="title-btn-box">
+						<view class="phone-line-title">说明</view>
+						<view @click="resetFun" class="reset-btn">重置</view>
 					</view>
-				</picker>
-			</view>
-			<!-- 职业等级(picker 实现下拉选择) -->
-			<view class="form-label-select">
-				<view class="phone-form-label"><text class="form-label-require">*</text>职业等级</view>
-				<picker mode="selector" :disabled="isZyFlag" :style="isZyFlag?'color:#999':''" :range="zhiyeLevels"
-					@change="levelChange" class="select-picker-box">
-					<view class="form-radio-select">
-						<view>{{ formData.zhiyeLevelName || '请选择等级' }}</view>
-						<icon></icon>
-					</view>
-				</picker>
-			</view>
+					<view class="tip-content-box">1.如果不需要办理证书,可直接点击保存按钮。</view>
+					<view class="tip-content-box">2.点击重置按钮,只重置办证信息,其他信息不改变。</view>
+				</view>
+				<!-- 报证机构(picker 实现下拉选择) -->
+				<view class="form-label-select form-top-margin">
+					<view class="phone-form-label"><text class="form-label-require">*</text>报证机构</view>
+					<picker :disabled="(status =='edit'&&localStatus=='')" mode="selector" :range="jigouNames"
+						@change="jigouChange" class="select-picker-box">
+						<view class="form-radio-select"
+							:class="{'form-radio-disabled': (status =='edit'&&localStatus=='')}">
+							<view>{{ formData.baozhengJigouName || '请选择报证机构' }}</view>
+							<icon></icon>
+						</view>
+					</picker>
+				</view>
+				<!-- 职业名称(picker 实现下拉选择) -->
+				<view class="form-label-select">
+					<view class="phone-form-label"><text class="form-label-require">*</text>职业名称</view>
+					<picker mode="selector" :disabled="isJgFlag" :style="isJgFlag?'color:#999':''" :range="zhiyeNames"
+						range-key="name" @change="zhiyeChange" class="select-picker-box">
+						<view class="form-radio-select">
+							<view>{{ formData.zhiyeName || '请选择职业名称' }}</view>
+							<icon></icon>
+						</view>
+					</picker>
+				</view>
+				<!-- 职业等级(picker 实现下拉选择) -->
+				<view class="form-label-select">
+					<view class="phone-form-label"><text class="form-label-require">*</text>职业等级</view>
+					<picker mode="selector" :disabled="isZyFlag" :style="isZyFlag?'color:#999':''" :range="zhiyeLevels"
+						@change="levelChange" class="select-picker-box">
+						<view class="form-radio-select">
+							<view>{{ formData.zhiyeLevelName || '请选择等级' }}</view>
+							<icon></icon>
+						</view>
+					</picker>
+				</view>
 
-			<view v-if="formData.banzhengInfoFlag" 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="formData.canxunshijian" type="date"
-					@change="canxunShijianChange">
-					<view class="form-radio-select">
-						<view>{{formData.canxunshijian}}</view>
-						<icon></icon>
-					</view>
-				</uni-datetime-picker>
-			</view>
+				<view v-if="formData.banzhengInfoFlag" 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="formData.canxunshijian" type="date"
+						@change="canxunShijianChange">
+						<view class="form-radio-select">
+							<view>{{formData.canxunshijian}}</view>
+							<icon></icon>
+						</view>
+					</uni-datetime-picker>
+				</view>
 
-			<view v-if="formData.banzhengInfoFlag" class="form-label-input">
-				<view class="phone-form-label"><text class="form-label-require">*</text>实操成绩</view>
-				<input v-model="formData.shicaochengji" placeholder="请填写实操成绩" />
-			</view>
-			<view v-if="formData.banzhengInfoFlag" class="form-label-input">
-				<view class="phone-form-label"><text class="form-label-require">*</text>总课时</view>
-				<input v-model="formData.zongkeshi" placeholder="请填写总课时" />
-			</view>
-			<view v-if="formData.needFlag" class="form-label-select">
-				<view class="phone-form-label"><text class="form-label-require"></text>需要考试</view>
-				<radio-group @change="kaoshiChange">
-					<label class="radio-label">
-						<radio :value="'true'" :checked="formData.needKaoshi == 'true'" color="#3fd2a1"
-							style="transform:scale(0.65)" />
-						<text>是</text>
-					</label>
-					<label class="radio-label">
-						<radio :value="'false'" :checked="formData.needKaoshi == 'false'" color="#3fd2a1"
-							style="transform:scale(0.65)" />
-						<text>否</text>
-					</label>
-				</radio-group>
-			</view>
-			<view class="page-btn-box">
-				<button type="default" v-if="piliang !=1" @click="goBack" class="phone-white-btn">返回</button>
-				<button type="default" v-if="piliang ==1" @click="piliangBaocun" class="phone-green-btn">保存</button>
-				<button type="default" v-if="piliang !=1" @click="addSaveForm" class="phone-green-btn">添加</button>
-			</view>
-			<view v-if="piliangArray.length>0" v-for="(item,index) in piliangArray" :key="index"
-				class="bzsm-tip-box form-top-margin">
-				<view class="title-btn-box">
-					<view class="phone-line-title">{{item.jgName}}</view>
-					<view class="reset-btn" @click="piliangDelete(item,index)">删除</view>
+				<view v-if="formData.banzhengInfoFlag" class="form-label-input">
+					<view class="phone-form-label"><text class="form-label-require">*</text>实操成绩</view>
+					<input v-model="formData.shicaochengji" placeholder="请填写实操成绩" />
+				</view>
+				<view v-if="formData.banzhengInfoFlag" class="form-label-input">
+					<view class="phone-form-label"><text class="form-label-require">*</text>总课时</view>
+					<input v-model="formData.zongkeshi" placeholder="请填写总课时" />
 				</view>
-				<view class="tip-content-box">{{item.zyName}} {{item.zyLevelName}}</view>
-				<!-- 				<view class="tip-content-box">职业名称:{{item.zyName}}</view>
+				<view v-if="formData.needFlag" class="form-label-select">
+					<view class="phone-form-label"><text class="form-label-require"></text>需要考试</view>
+					<radio-group @change="kaoshiChange">
+						<label class="radio-label">
+							<radio :value="'true'" :checked="formData.needKaoshi == 'true'" color="#3fd2a1"
+								style="transform:scale(0.65)" />
+							<text>是</text>
+						</label>
+						<label class="radio-label">
+							<radio :value="'false'" :checked="formData.needKaoshi == 'false'" color="#3fd2a1"
+								style="transform:scale(0.65)" />
+							<text>否</text>
+						</label>
+					</radio-group>
+				</view>
+				<view v-if="isZijiazheng !='true'" class="page-btn-box">
+					<button type="default" v-if="piliang !=1&&isZijiazheng !='true'" @click="goBack" class="phone-white-btn">返回</button>
+					<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="piliangBaocun" class="phone-green-btn">保存</button>
+					<button type="default" v-if="piliang !=1&&isZijiazheng !='true'" @click="addSaveForm" class="phone-green-btn">添加</button>
+				</view>
+				<view v-if="piliangArray.length>0" v-for="(item,index) in piliangArray" :key="index"
+					class="bzsm-tip-box form-top-margin">
+					<view class="title-btn-box">
+						<view class="phone-line-title">{{item.jgName}}</view>
+						<view class="reset-btn" @click="piliangDelete(item,index)">删除</view>
+					</view>
+					<view class="tip-content-box">{{item.zyName}} {{item.zyLevelName}}</view>
+					<!-- 				<view class="tip-content-box">职业名称:{{item.zyName}}</view>
 				<view class="tip-content-box">职业等级:{{item.zyLevelName}}</view> -->
-			</view>
+				</view>
 
 
-		</view>
-		<view class="page-btn-box content-footer-box">
-			<button type="default" v-if="piliang ==1" @click="goBack" class="phone-white-btn">返回</button>
-			<button type="default" v-if="piliang ==1" @click="addSaveFormPiliang" class="phone-green-btn">添加</button>
+			</view>
+			<view v-if="isZijiazheng !='true'" class="page-btn-box content-footer-box">
+				<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="goBack" class="phone-white-btn">返回</button>
+				<button type="default" v-if="piliang ==1&&isZijiazheng !='true'" @click="addSaveFormPiliang"
+					class="phone-green-btn">添加</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -151,6 +154,9 @@
 		props: {
 			status: {
 				type: String,
+			},
+			isZijiazheng: {
+				type: String,
 			}
 
 		},

+ 34 - 32
pages/admin/Jiazheng/banzhengXinxiList.vue

@@ -1,37 +1,39 @@
 <template>
 	<view class="bzxx-list-page">
-		<view class="bz-new-btn-box" v-if="list.length>0">
-			<button type="default" class="phone-white-btn" @click="addBanzheng">添加</button>
-			<button type="default" class="phone-green-btn" @click="addBanzhengPiliang">批量添加</button>
-		</view>
-		<view class="bzxx-wrap-box" v-if="list.length>0">
-			<view v-for="(item,index) in list" :key="index" class="bzxx-card-box">
-				<view class="name-btn-box">
-					<view class="jg-name">报证机构:{{item.jgName}}</view>
-					<view class="name-btn editer-btn" @click="goEdit(item,index)">编辑</view>
-					<view class="name-btn delete-btn" @click="deleteFun(item,index)">删除</view>
-				</view>
-				<view class="bzxx-zy-row">
-					<icon class="zy-icon"></icon>职业名称:<text>{{item.zyName}}</text>
-				</view>
-				<view class="bzxx-zy-row">
-					<icon class="zydj-icon"></icon>职业等级:<text>{{item.zyLevelName}}</text>
-				</view>
-				<view class="bzxx-time-row">
-					<icon class="time-icon"></icon><text>申报时间:{{item.createTime}}</text>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view  class="bz-new-btn-box" v-if="list.length>0">
+				<button type="default" class="phone-white-btn" @click="addBanzheng">添加</button>
+				<button type="default" class="phone-green-btn" @click="addBanzhengPiliang">批量添加</button>
+			</view>
+			<view class="bzxx-wrap-box" v-if="list.length>0">
+				<view v-for="(item,index) in list" :key="index" class="bzxx-card-box">
+					<view class="name-btn-box">
+						<view class="jg-name">报证机构:{{item.jgName}}</view>
+						<view class="name-btn editer-btn" @click="goEdit(item,index)">编辑</view>
+						<view class="name-btn delete-btn" @click="deleteFun(item,index)">删除</view>
+					</view>
+					<view class="bzxx-zy-row">
+						<icon class="zy-icon"></icon>职业名称:<text>{{item.zyName}}</text>
+					</view>
+					<view class="bzxx-zy-row">
+						<icon class="zydj-icon"></icon>职业等级:<text>{{item.zyLevelName}}</text>
+					</view>
+					<view class="bzxx-time-row">
+						<icon class="time-icon"></icon><text>申报时间:{{item.createTime}}</text>
+					</view>
 				</view>
 			</view>
-		</view>
-		<view v-if="list.length>0 && status!='edit'" class="bzxx-btn-box">
-			<button type="default" v-if="status!='edit'" @click="saveBanzheng" class="phone-green-btn">保存</button>
-		</view>
-		<view v-if="list.length==0" class="bzxx-add-btn-box">
-			<view @click="addBanzheng" class="bzxx-add-btn"><text>+</text>添加办证信息</view>
-			<view @click="addBanzhengPiliang" class="bzxx-add-btn"><text>+</text>批量添加办证信息</view>
+			<view v-if="list.length>0 && status!='edit'" class="bzxx-btn-box">
+				<button type="default" v-if="status!='edit'&&isZijiazheng !='true'" @click="saveBanzheng" class="phone-green-btn">保存</button>
+			</view>
+			<view v-if="list.length==0" class="bzxx-add-btn-box">
+				<view @click="addBanzheng" class="bzxx-add-btn"><text>+</text>添加办证信息</view>
+				<view @click="addBanzhengPiliang" class="bzxx-add-btn"><text>+</text>批量添加办证信息</view>
 
-		</view>
-		<view v-if="status =='add'" class="page-btn-box">
-			<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
+			</view>
+			<view v-if="status =='add'&&isZijiazheng !='true'" class="page-btn-box">
+				<button type="default" @click="saveBanzheng" class="phone-green-btn">保存</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -70,7 +72,7 @@
 		methods: {
 			addBanzheng() {
 				this.$emit('addBanzheng');
-			},	
+			},
 			addBanzhengPiliang() {
 				this.$emit('addBanzhengPiliang');
 			},
@@ -78,8 +80,8 @@
 				this.$emit('saveBanzheng');
 			},
 			goEdit(item, index) {
-				
-				console.log('item',item);
+
+				console.log('item', item);
 				if (item.statusBanzheng != '未办证' && this.status == 'edit') {
 					toast("非未办证状态,禁止修改")
 					return false

+ 132 - 120
pages/admin/Jiazheng/gerenZiliao.vue

@@ -1,137 +1,143 @@
 <template>
 	<view class="jz-content-box">
-		<view class="upload-img-box">
-			<jiazhengUpload @getFileUrl="getFileUrl" changjingType="shenfenzheng"></jiazhengUpload>
-		</view>
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
-			<uni-easyinput :disabled="!statusFlag && status=='edit'" type="number" v-model="formData.userName" placeholder="请输入手机号" maxlength="11" />
-		</view>
-
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>姓名</view>
-			<uni-easyinput :disabled="!statusFlag && status=='edit'" v-model="formData.realName" placeholder="请输入姓名" />
-		</view>
-		<view class="form-label-input">
-			<view class="phone-form-label">
-				<text class="form-label-require">*</text>
-				<text v-if="formData.idtype ==1">身份证号</text>
-				<text v-if="formData.idtype ==2">护照号</text>
-				<icon @click="idCardChange" class="change-icon">切换</icon>
+		<!-- 涂层 子家政公司使用 -->
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="upload-img-box">
+				<jiazhengUpload @getFileUrl="getFileUrl" changjingType="shenfenzheng"></jiazhengUpload>
+			</view>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require">*</text>手机号</view>
+				<uni-easyinput :disabled="!statusFlag && status=='edit'" type="number" v-model="formData.userName"
+					placeholder="请输入手机号" maxlength="11" />
 			</view>
-			<uni-easyinput :disabled="!statusFlag && status=='edit'" @blur="idCardBlur" v-model="formData.idcard" placeholder="请输入身份证号或护照号" maxlength="18" />
-		</view>
 
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
-			<uni-datetime-picker type="line" v-model="formData.birthday">
-				<view class="form-radio-select">
-					<view>{{formData.birthday}}</view>
-					<icon></icon>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require">*</text>姓名</view>
+				<uni-easyinput :disabled="!statusFlag && status=='edit'" v-model="formData.realName"
+					placeholder="请输入姓名" />
+			</view>
+			<view class="form-label-input">
+				<view class="phone-form-label">
+					<text class="form-label-require">*</text>
+					<text v-if="formData.idtype ==1">身份证号</text>
+					<text v-if="formData.idtype ==2">护照号</text>
+					<icon @click="idCardChange" class="change-icon">切换</icon>
 				</view>
-			</uni-datetime-picker>
-		</view>
+				<uni-easyinput :disabled="!statusFlag && status=='edit'" @blur="idCardBlur" v-model="formData.idcard"
+					placeholder="请输入身份证号或护照号" maxlength="18" />
+			</view>
 
-		<view class="form-label-select">
-			<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" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>
-						{{formData.jiguanShengName === formData.jiguanShiName ? formData.jiguanShengName  : `${formData.jiguanShengName} ${formData.jiguanShiName}`}}
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require">*</text>生日</view>
+				<uni-datetime-picker type="line" v-model="formData.birthday">
+					<view class="form-radio-select">
+						<view>{{formData.birthday}}</view>
+						<icon></icon>
 					</view>
-					<icon></icon>
+				</uni-datetime-picker>
+			</view>
+
+			<view class="form-label-select">
+				<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" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>
+							{{formData.jiguanShengName === formData.jiguanShiName ? formData.jiguanShengName  : `${formData.jiguanShengName} ${formData.jiguanShiName}`}}
+						</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</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="请输入身份证地址" />
+			</view>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require">*</text>民族</view>
+				<picker :range="minzuList" mode='selector' :value="formData.minzuIndex" range-key="name"
+					@change="minzuChange" @cancel="minzuCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ formData.minzu.name }}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			<view class="form-label-radio">
+				<view class="phone-form-label"><text class="form-label-require">*</text>性别</view>
+				<view class="form-radio-group">
+					<view class="form-radio-item" :class="{genderActive: formData.gender==1}" @click="genderSelect(1)">
+						男</view>
+					<view class="form-radio-item" :class="{genderActive: formData.gender==2}" @click="genderSelect(2)">
+						女</view>
 				</view>
-			</picker>
-		</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="请输入身份证地址" />
-		</view>
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require">*</text>民族</view>
-			<picker :range="minzuList" mode='selector' :value="formData.minzuIndex" range-key="name"
-				@change="minzuChange" @cancel="minzuCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.minzu.name }}</view>
+			</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" :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 class="form-label-require"></text>婚姻 </view>
+				<dataChecked :list="hunyinList" mode="single" :selectedIds='formData.hunyin.id' :showAdd="false"
+					@change="selectChangeHunyinList" />
+			</view>
+
+
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require"></text>通讯地址</view>
+				<view @click="openMap" class="input-text-row">
+					<view v-if="formData.jingdu&&formData.weidu">{{formData.juzhuDizhi}}</view>
+					<view v-if="formData.jingdu ==''&&formData.weidu ==''">{{formData.juzhuDizhi}} <text
+							v-if="formData.juzhuDizhi" style="color: #3fd2a1;">(无经纬度)</text></view>
 					<icon></icon>
 				</view>
-			</picker>
-		</view>
-		<view class="form-label-radio">
-			<view class="phone-form-label"><text class="form-label-require">*</text>性别</view>
-			<view class="form-radio-group">
-				<view class="form-radio-item" :class="{genderActive: formData.gender==1}" @click="genderSelect(1)">
-					男</view>
-				<view class="form-radio-item" :class="{genderActive: formData.gender==2}" @click="genderSelect(2)">
-					女</view>
 			</view>
-		</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" :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 class="form-label-require"></text>婚姻 </view>
-			<dataChecked :list="hunyinList" mode="single" :selectedIds='formData.hunyin.id' :showAdd="false"
-				@change="selectChangeHunyinList" />
-		</view>
-
 
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require"></text>通讯地址</view>
-			<view @click="openMap" class="input-text-row">
-				<view v-if="formData.jingdu&&formData.weidu">{{formData.juzhuDizhi}}</view>
-				<view v-if="formData.jingdu ==''&&formData.weidu ==''">{{formData.juzhuDizhi}} <text
-						v-if="formData.juzhuDizhi" style="color: #3fd2a1;">(无经纬度)</text></view>
-				<icon></icon>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>星座</view>
+				<picker :range="xingzuoList" mode='selector' :value="formData.xingzuoIndex" range-key="name"
+					@change="xingzuoChange" @cancel="xingzuoCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ formData.xingzuo.name  }}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>属相</view>
+				<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
+					@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ formData.shuxiang.name  }}</view>
+						<icon></icon>
+					</view>
+				</picker>
 			</view>
-		</view>
 
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>星座</view>
-			<picker :range="xingzuoList" mode='selector' :value="formData.xingzuoIndex" range-key="name"
-				@change="xingzuoChange" @cancel="xingzuoCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.xingzuo.name  }}</view>
-					<icon></icon>
-				</view>
-			</picker>
-		</view>
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>属相</view>
-			<picker :range="shuxiangList" mode='selector' :value="formData.shuxiangIndex" range-key="name"
-				@change="shuxiangChange" @cancel="shuxiangCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ formData.shuxiang.name  }}</view>
-					<icon></icon>
+			<view class="form-label-switch">
+				<view class="phone-form-label"> <text class="form-label-require"></text>星座属相展示到简历 </view>
+				<view>展示
+					<switch @change="switchXingzuoChange" :checked="formData.xingzuoFlag" color="#3fd2a1"
+						style="transform:scale(0.7)" />
 				</view>
-			</picker>
-		</view>
-
-		<view class="form-label-switch">
-			<view class="phone-form-label"> <text class="form-label-require"></text>星座属相展示到简历 </view>
-			<view>展示
-				<switch @change="switchXingzuoChange" :checked="formData.xingzuoFlag" color="#3fd2a1"
-					style="transform:scale(0.7)" />
 			</view>
-		</view>
 
-		<view class="agree-section-box form-top-margin">
-			<checkbox-group @change="handleAgree">
-				<label class="checkbox">
-					<checkbox :checked="formData.agree" color="#3fd2a1" style="transform:scale(0.65)" />
-					<text>已征得本人同意,将其个人资料信息录入平台</text>
-				</label>
-			</checkbox-group>
-			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
-			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
+			<view  class="agree-section-box form-top-margin">
+				<checkbox-group @change="handleAgree">
+					<label class="checkbox">
+						<checkbox :checked="formData.agree" color="#3fd2a1" style="transform:scale(0.65)" />
+						<text>已征得本人同意,将其个人资料信息录入平台</text>
+					</label>
+				</checkbox-group>
+				<button type="default" v-if="status =='add'&&isZijiazheng !='true'" @click="goNext" class="phone-green-btn">下一步</button>
+				<button type="default" v-if="status =='edit' &&isZijiazheng !='true'" @click="editSave" class="phone-green-btn">保存</button>
+			</view>
+			<uni-popup ref="popupMap" background-color="#fff" :is-mask-click="false" :mask-click="false">
+				<customMap style="100vh" @xuanzeAdress="xuanzeAdress" @currentWeizhi="currentWeizhi" @close="mapClose">
+				</customMap>
+			</uni-popup>
 		</view>
-		<uni-popup ref="popupMap" background-color="#fff" :is-mask-click="false" :mask-click="false">
-			<customMap style="100vh" @xuanzeAdress="xuanzeAdress" @currentWeizhi="currentWeizhi" @close="mapClose">
-			</customMap>
-		</uni-popup>
 	</view>
 </template>
 
@@ -139,7 +145,9 @@
 	import dataChecked from './common/dataChecked.vue';
 	import jiazhengUpload from "./common/jiazhengUpload.vue"
 	import customMap from "@/components/customMap/customMap.vue"
-		import {toast} from "@/utils/common";
+	import {
+		toast
+	} from "@/utils/common";
 	import {
 		getJiazhengXueli,
 		getJiazhengHunyin,
@@ -162,7 +170,11 @@
 			},
 			statusFlag: {
 				type: Boolean,
+			},
+			isZijiazheng: {
+				type: String,
 			}
+			
 		},
 		data() {
 			return {
@@ -223,8 +235,8 @@
 			}
 		},
 		created() {
-			
-			console.log('statusFlag',this.statusFlag);
+
+			console.log('statusFlag', this.statusFlag);
 			uni.showLoading({
 				title: '加载中'
 			});
@@ -640,7 +652,7 @@
 				}
 			},
 			genderSelect(data) {
-				if(!this.statusFlag && this.status =='edit '){
+				if (!this.statusFlag && this.status == 'edit ') {
 					toast("非未办证状态,禁止修改")
 					return false
 				}

+ 12 - 7
pages/admin/Jiazheng/index.vue

@@ -5,8 +5,8 @@
 			<text class="nav-bar-title">家政人员</text>
 			<uni-icons class="nav-bar-right-icon bar-ml10" type="search" size="20" @click="toggle('top')"></uni-icons>
 		</view>
-		<view class="jiazheng-search-box">
-			<view @click.stop="clickAlltype" class="select-item-box">
+		<view v-if="isZijiazhengFlag !='true'" class="jiazheng-search-box">
+			<view  @click.stop="clickAlltype" class="select-item-box">
 				<text class="select-text">{{data.zyName}}</text>
 				<icon :class="allJtClass" />
 			</view>
@@ -33,7 +33,7 @@
 			<dataChecked :list="allType" mode="single" :defaultCount="99" :showAdd="false"
 				@change="selectChangeSkill" />
 		</view>
-		<view class="jz-new-btn-box">
+		<view v-if="isZijiazhengFlag !='true'" class="jz-new-btn-box">
 			<button type="default" class="phone-green-btn" @click="addJiazhengRenyuan">新增人员</button>
 		</view>
 		<view>
@@ -44,7 +44,7 @@
 
 					<uni-list-item v-for="item in data.list" class="jz-list-item-box">
 						<template v-slot:body>
-							<view class="card-head-row">
+							<view v-if="isZijiazhengFlag !='true'" class="card-head-row">
 								<view class="head-name">{{item.realName}}</view>
 								<button type="default" class="phone-green-btn bz-bind-btn"
 									@click.stop="kechengBind(item)">课程绑定</button>
@@ -135,6 +135,7 @@
 		}
 	})
 	let isOpen = ref(false)
+	let isZijiazhengFlag = ref('false')
 	let defauleImg = ref('@/static/images/my/user-default-img.png')
 	const allJtClass = 'select-jt-default';
 	let updataJtClass = ref('');
@@ -272,7 +273,8 @@
 		let pageInfo = {
 			status: 'edit',
 			id: data.id,
-			userId: data.userId
+			userId: data.userId,
+			isZijiazheng:isZijiazhengFlag.value
 		}
 		uni.redirectTo({
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo?pageInfo=` + JSON.stringify(pageInfo)
@@ -401,7 +403,7 @@
 				// }
 				// 处理 zyNames 字段
 				if (typeof newItem.zyNames !== 'string') {
-					newItem.zyNames = []; 
+					newItem.zyNames = [];
 				} else {
 					newItem.zyNames = newItem.zyNames.trim() == '' ? [] : newItem.zyNames.split(',');
 				}
@@ -458,7 +460,10 @@
 			}
 		});
 	}
-	onLoad(() => {
+	onLoad((options) => {
+		if (options && options.isZijiazheng =='true') {
+			isZijiazhengFlag.value = 'true'
+		}
 		getMore()
 		getLeixing()
 		getCurrentWeizhi()

+ 4 - 2
pages/admin/Jiazheng/jiazhengUserInfo.vue

@@ -102,6 +102,7 @@
 			this.pageInfo.id = data.id
 			this.pageInfo.userId = data.userId
 			this.pageInfo.from = data.from
+			this.pageInfo.isZijiazheng = data.isZijiazheng
 			this.getJianliInfo()
 		},
 		methods: {
@@ -158,7 +159,8 @@
 				let pageInfo = {
 					status: 'edit',
 					id: this.pageInfo.id,
-					userId: this.pageInfo.userId
+					userId: this.pageInfo.userId,
+					isZijiazheng:this.pageInfo.isZijiazheng
 				}
 				uni.redirectTo({
 					url: "/pages/admin/Jiazheng/jiazhengUserManager?pageInfo=" + JSON.stringify(pageInfo)
@@ -171,7 +173,7 @@
 					})
 				} else {
 					uni.redirectTo({
-						url: "/pages/admin/Jiazheng/index"
+						url: "/pages/admin/Jiazheng/index?isZijiazheng="+this.pageInfo.isZijiazheng
 					})
 				}
 

+ 8 - 6
pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -6,18 +6,18 @@
 		</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' :statusFlag="statusFlag" @idCardBlur="idCardBlur"
+		<gerenZiliao ref="gerenZiliao" :status='status' :isZijiazheng='isZijiazheng' :statusFlag="statusFlag" @idCardBlur="idCardBlur"
 			@finishDom='finishDom' @editSave="editSaveGerenziliao" @goNext="gerenziliaoNext" v-show="current ==0">
 		</gerenZiliao>
-		<qiuzhiXinxi ref="qiuzhiXinxi" :status='status' @editSave="editSaveQiuzhixinxi" @goNext="goNextQiuzhixinxi"
+		<qiuzhiXinxi ref="qiuzhiXinxi" :isZijiazheng='isZijiazheng' :status='status' @editSave="editSaveQiuzhixinxi" @goNext="goNextQiuzhixinxi"
 			v-show="current ==1">
 		</qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @editSave="editSaveZhaopianziliao" 
+		<zhaopianZiliao ref="zhaopianZiliao" :isZijiazheng='isZijiazheng' :status='status' @editSave="editSaveZhaopianziliao" 
 			@goNext="goNextZhaopianZiliao" v-show="current ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" :status='status' @goBack="goBack" @addEdit='addEdit' @addSave="addSave" @addSavePiliang="addSavePiliang"
+		<banzhengXinxi ref="banzhengXinxi" :isZijiazheng='isZijiazheng' :status='status' @goBack="goBack" @addEdit='addEdit' @addSave="addSave" @addSavePiliang="addSavePiliang"
 			@editSave="editSave" v-show="banzhengXinxiFlag">
 		</banzhengXinxi>
-		<banzhengXinxiList :status='status' :list="editInfo.kaozhengList"
+		<banzhengXinxiList :isZijiazheng='isZijiazheng' :status='status' :list="editInfo.kaozhengList"
 			v-show="current ==3&&!banzhengXinxiFlag&&!banzhengXinxiFlagPiliang" @saveBanzheng="saveBanzheng"
 			@editBanzheng="editBanzheng" @addBanzheng="addBanzheng" @addBanzhengPiliang="addBanzhengPiliang"
 			@deleteBanzheng="deleteBanzheng" ref="banzhengXinxiList">
@@ -102,6 +102,7 @@
 				deleteId: '',
 				from: '',
 				statusFlag: null,
+				isZijiazheng:"false"
 			}
 		},
 		components: {
@@ -130,6 +131,7 @@
 			let pageInfo = JSON.parse(options.pageInfo)
 			this.status = pageInfo.status
 			this.from = pageInfo.from
+			this.isZijiazheng = pageInfo.isZijiazheng
 			this.dataHandle(pageInfo)
 		},
 		methods: {
@@ -706,7 +708,7 @@
 					})
 				} else {
 					uni.navigateTo({
-						url: `/pages/admin/Jiazheng/index`
+						url: "/pages/admin/Jiazheng/index?isZijiazheng="+this.isZijiazheng
 					})
 				}
 

+ 50 - 45
pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -5,48 +5,50 @@
 			<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>
-			<picker :range="jingyanList" mode='selector' :value="jingyanIndex" range-key="name" @change="jingyanChange"
-				@cancel="jingyanCancel" class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{ jingyan }}</view>
-					<icon></icon>
-				</view>
-			</picker>
-		</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" :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" :selectedIds='zhuangtai' :showAdd="false"
-				@change="selectChangeZhuangtai" />
-		</view>
-		<view class="form-label-select">
-			<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
-			<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel"
-				class="select-picker-box">
-				<view class="form-radio-select">
-					<view>{{jibiexinzi}}</view>
-					<icon></icon>
-				</view>
-			</picker>
-		</view>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>经验</view>
+				<picker :range="jingyanList" mode='selector' :value="jingyanIndex" range-key="name"
+					@change="jingyanChange" @cancel="jingyanCancel" class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{ jingyan }}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</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" :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" :selectedIds='zhuangtai' :showAdd="false"
+					@change="selectChangeZhuangtai" />
+			</view>
+			<view class="form-label-select">
+				<view class="phone-form-label"><text class="form-label-require"></text>薪资级别</view>
+				<picker :range="xinziJibieList" mode='selector' @change="xinziJibieChange" @cancel="xinziJibieCancel"
+					class="select-picker-box">
+					<view class="form-radio-select">
+						<view>{{jibiexinzi}}</view>
+						<icon></icon>
+					</view>
+				</picker>
+			</view>
 
-		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require"></text>期望薪资</view>
-			<input v-model="qiwangxinzi" placeholder="请输入期望薪资" />
-		</view>
-		<view class="form-label-input flex-start-row">
-			<view class="phone-form-label"><text class="form-label-require"></text>工作经历</view>
-			<textarea v-model="jingli" maxlength="-1" placeholder="请填写工作经历" class="form-textarea-box" />
-		</view>
-		<view class="page-btn-box">
-			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
-			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
+			<view class="form-label-input">
+				<view class="phone-form-label"><text class="form-label-require"></text>期望薪资</view>
+				<input v-model="qiwangxinzi" placeholder="请输入期望薪资" />
+			</view>
+			<view class="form-label-input flex-start-row">
+				<view class="phone-form-label"><text class="form-label-require"></text>工作经历</view>
+				<textarea v-model="jingli" maxlength="-1" placeholder="请填写工作经历" class="form-textarea-box" />
+			</view>
+			<view v-if="isZijiazheng !='true'" class="page-btn-box">
+				<button type="default" v-if="status =='add'&&isZijiazheng !='true'" @click="goNext" class="phone-green-btn">下一步</button>
+				<button type="default" v-if="status =='edit'&&isZijiazheng !='true'" @click="editSave" class="phone-green-btn">保存</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -72,6 +74,9 @@
 		props: {
 			status: {
 				type: String,
+			},
+			isZijiazheng: {
+				type: String,
 			}
 		},
 		data() {
@@ -98,7 +103,7 @@
 		methods: {
 			async initRequests() {
 				await Promise.all([
-				//	this.getLeixing(),
+					//	this.getLeixing(),
 					this.getJineng(),
 					this.getZhuangtai()
 				]);
@@ -106,7 +111,7 @@
 			editinfo(data) {
 				this.$nextTick(() => {
 					console.log('data11111', data);
-				//	this.leixing = data.leixing
+					//	this.leixing = data.leixing
 					this.jingyan = data.jingyan
 					this.jineng = data.jineng
 					this.zhuangtai = data.zhuangtai
@@ -198,7 +203,7 @@
 				console.log('zhuangtaiData', data);
 				if (data.length > 0) {
 					this.zhuangtai = data[0].id
-				}else{
+				} else {
 					this.zhuangtai = ''
 				}
 				console.log('zhuangtai', this.zhuangtai);
@@ -215,7 +220,7 @@
 			},
 			yanzheng() {
 				this.formData = {
-				//	leixing: this.leixing,
+					//	leixing: this.leixing,
 					jingyan: this.jingyan,
 					jineng: this.jineng,
 					zhuangtai: this.zhuangtai,

+ 88 - 81
pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -1,90 +1,93 @@
 <template>
 	<view class="jz-content-box">
-		<view class="upload-img-box">
-			<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>
-			<!-- 	<switch @change="switchSfzChange" color="#3fd2a1" style="transform:scale(0.7)" /> -->
-		</view>
-		<view class="ziliao-upload-box">
-			<view class="upload-item-box">
-				<jiazhengUpload @getFileUrl="getSfzTouxiang" :img='idcardUrl1' bottomText="上传身份证头像面"></jiazhengUpload>
+		<view :class="isZijiazheng=='true'?'mask-view':''">
+			<view class="upload-img-box">
+				<jiazhengUpload @getFileUrl="getTouxiang" :img='icon' bottomText="上传头像"></jiazhengUpload>
 			</view>
-			<view class="upload-item-box">
-				<jiazhengUpload @getFileUrl="getSfzGuohui" :img='idcardUrl2' bottomText="上传身份证国徽面"></jiazhengUpload>
+			<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)" /> -->
 			</view>
-		</view>
-		
-		<view @click="changeZhankai"  :class="zhankaiFlag==1?'zpzl-open-box':'zpzl-close-box'">
-			<view class="gdzl-row">更多资料<icon></icon></view>
-			<view v-show="zhankaiFlag">
-				<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 class="ziliao-upload-box">
+				<view class="upload-item-box">
+					<jiazhengUpload @getFileUrl="getSfzTouxiang" :img='idcardUrl1' bottomText="上传身份证头像面">
+					</jiazhengUpload>
 				</view>
-				<view class="zhaopianZiliao-shenfenzhengImg">
-					<view class="ziliao-upload-box">
-						<view v-for="(item, index) in tijianbaogaoList" :key="index" v-if="tijianbaogaoList.length>0"
-							class="ziliao-image-box">
-							<img class="ziliao-image" :src="item" alt="">
-							<view @click="deleteTijianbaogao(item,index)" class="ziliao-image-close"></view>
-						</view>
-						<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
-					</view>
+				<view class="upload-item-box">
+					<jiazhengUpload @getFileUrl="getSfzGuohui" :img='idcardUrl2' bottomText="上传身份证国徽面"></jiazhengUpload>
 				</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 @click="changeZhankai" :class="zhankaiFlag==1?'zpzl-open-box':'zpzl-close-box'">
+				<view class="gdzl-row">更多资料<icon></icon>
 				</view>
-				<view class="zhaopianZiliao-shenfenzhengImg">
-					<view class="ziliao-upload-box">
-						<view v-for="(item, index) in shenghuizhaoList" :key="index" v-if="shenghuizhaoList.length>0"
-							class="ziliao-image-box">
-							<img class="ziliao-image" :src="item" alt="">
-							<view @click="deleteShenghuoZhao(item,index)" class="ziliao-image-close"></view>
-						</view>
-						<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
+				<view v-show="zhankaiFlag">
+					<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>
-				<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)" /> -->
-				</view>
-				<view class="zhaopianZiliao-shenfenzhengImg">
-					<view class="ziliao-upload-box">
-						<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0"
-							class="ziliao-image-box">
-							<img class="ziliao-image" :src="item" alt="">
-							<view @click="deleteZigeZhao(item,index)" class="ziliao-image-close"></view>
+					<view class="zhaopianZiliao-shenfenzhengImg">
+						<view class="ziliao-upload-box">
+							<view v-for="(item, index) in tijianbaogaoList" :key="index"
+								v-if="tijianbaogaoList.length>0" class="ziliao-image-box">
+								<img class="ziliao-image" :src="item" alt="">
+								<view @click="deleteTijianbaogao(item,index)" class="ziliao-image-close"></view>
+							</view>
+							<jiazhengUpload changjingType="more" @getFileUrl="getTijianbaogao"></jiazhengUpload>
 						</view>
-						<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
 					</view>
-				</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" type="date" @change="changeTijian">
-						<view class="form-radio-select">
-							<view>{{tijianDate}}</view>
-							<icon></icon>
+
+					<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-for="(item, index) in shenghuizhaoList" :key="index"
+								v-if="shenghuizhaoList.length>0" class="ziliao-image-box">
+								<img class="ziliao-image" :src="item" alt="">
+								<view @click="deleteShenghuoZhao(item,index)" class="ziliao-image-close"></view>
+							</view>
+							<jiazhengUpload changjingType="more" @getFileUrl="getGzShenghuozhao"></jiazhengUpload>
 						</view>
-					</uni-datetime-picker>
-				</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" type="date" @change="changeJiankang">
-						<view class="form-radio-select">
-							<view>{{jiankangDate}}</view>
-							<icon></icon>
+					</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)" /> -->
+					</view>
+					<view class="zhaopianZiliao-shenfenzhengImg">
+						<view class="ziliao-upload-box">
+							<view v-for="(item, index) in zigezhaoList" :key="index" v-if="zigezhaoList.length>0"
+								class="ziliao-image-box">
+								<img class="ziliao-image" :src="item" alt="">
+								<view @click="deleteZigeZhao(item,index)" class="ziliao-image-close"></view>
+							</view>
+							<jiazhengUpload changjingType="more" @getFileUrl="getZigezhao"></jiazhengUpload>
 						</view>
-					</uni-datetime-picker>
+					</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" type="date" @change="changeTijian">
+							<view class="form-radio-select">
+								<view>{{tijianDate}}</view>
+								<icon></icon>
+							</view>
+						</uni-datetime-picker>
+					</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" type="date" @change="changeJiankang">
+							<view class="form-radio-select">
+								<view>{{jiankangDate}}</view>
+								<icon></icon>
+							</view>
+						</uni-datetime-picker>
+					</view>
 				</view>
 			</view>
-		</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>
@@ -101,9 +104,10 @@
 			<button type="default" class="phone-green-btn scbg-btn">+从手机上传体检报告(pdf)</button>
 		</view> -->
 
-		<view class="page-btn-box">
-			<button type="default" v-if="status =='add'" @click="goNext" class="phone-green-btn">下一步</button>
-			<button type="default" v-if="status =='edit'" @click="editSave" class="phone-green-btn">保存</button>
+			<view v-if="isZijiazheng !='true'" class="page-btn-box">
+				<button type="default" v-if="status =='add'&&isZijiazheng !='true'" @click="goNext" class="phone-green-btn">下一步</button>
+				<button type="default" v-if="status =='edit'&&isZijiazheng !='true'" @click="editSave" class="phone-green-btn">保存</button>
+			</view>
 		</view>
 	</view>
 </template>
@@ -130,24 +134,27 @@
 				jiankangDate: '',
 				tijianbaogaoFlag: false,
 				zhengshuUrls: '',
-				accordionVal:'',
-				zhankaiFlag:false
+				accordionVal: '',
+				zhankaiFlag: false
 			}
 		},
 		props: {
 			status: {
 				type: String,
+			},
+			isZijiazheng: {
+				type: String,
 			}
 		},
 		components: {
 			jiazhengUpload
 		},
 		methods: {
-			changeZhankai(){
+			changeZhankai() {
 				this.zhankaiFlag = !this.zhankaiFlag
-				console.log('this.changeZhankai',this.changeZhankai);
+				console.log('this.changeZhankai', this.changeZhankai);
 			},
-			editinfo(data) { 
+			editinfo(data) {
 				console.log('data', data);
 				this.$nextTick(() => {
 					this.icon = data.icon

+ 6 - 2
pages/admin/zijiazheng/index.vue

@@ -12,7 +12,7 @@
 				<view class="zjzgs-title">{{ item.jzName }}</view>
 				<view class="num-item-box">
 					<view>家政人员数量:{{ item.userCount }}</view>
-					<view class="num-btn" v-if="!!item.userCount" @click="checkUser(item)">详情</view>
+					<view class="num-btn"  @click="checkUser(item)">详情</view>
 				</view>
 				<view class="num-item-box">
 					<view>申请办证数量:{{ item.applyCount }}</view>
@@ -58,7 +58,11 @@ import * as httpApi from "@/api/zijiazhenggongsi"
     })
   }
 
-function checkUser(item) {}
+function checkUser(item) {
+	uni.redirectTo({
+		url:'/pages/admin/Jiazheng/index?isZijiazheng=true'
+	})
+}
 function checkApplyCert(item) {
 	uni.redirectTo({
 		url: `/pages/admin/zijiazheng/banzhengshuliang?listIds=${item.applyList.join(',')}`