wangguoyu před 3 měsíci
rodič
revize
a1373e6ac8

+ 6 - 11
pages/admin/Jiazheng/banzhengXinxi.vue

@@ -83,8 +83,8 @@
 			</radio-group>
 		</view>
 		<view class="page-btn-box">
-			<button type="default" @click="goUp" class="phone-white-btn">上一步</button>
-			<button type="default" @click="submitForm" class="phone-green-btn">完成</button>
+
+			<button type="default" @click="addSaveForm" class="phone-green-btn">保存</button>
 		</view>
 		<!-- 提交按钮 -->
 		<!-- 		<button class="submit-btn" @click="submitForm">提交</button> -->
@@ -243,7 +243,8 @@
 			// 需要课程选择
 			kechengChange(e) {
 				this.formData.needKecheng = e.detail.value.toString();
-				if (this.formData.needKecheng = 'true') {
+				console.log('this.formData.needKecheng',this.formData.needKecheng);
+				if (this.formData.needKecheng == 'true') {
 					if (this.formData.zhiyeId && this.formData.zhiyeLevelId) {
 						this.checkKc()
 					} else {
@@ -264,14 +265,8 @@
 			kaoshiChange(e) {
 				this.formData.needKaoshi = e.detail.value.toString();
 			},
-
-			goUp(){
-				this.$emit('goUp',{},3);
-			},
 			// 提交表单
-			submitForm() {
-				
-				
+			addSaveForm() {
 				// "kaozhengList": [
 				//     {
 				//       "canxunshijian": "string",
@@ -297,7 +292,7 @@
 				}
 				console.log('req',req);
 				
-				
+				this.$emit('addSave',req);
 				// // 表单验证
 				// if (!this.formData.institution) {
 				// 	uni.showToast({

+ 32 - 17
pages/admin/Jiazheng/gerenZiliao.vue

@@ -14,15 +14,20 @@
 		</view>
 
 		<view class="form-label-input">
-			<view class="phone-form-label"><text class="form-label-require">*</text>身份证号</view>
-			<uni-easyinput v-model="formData.idCard" placeholder="请输入身份证号" maxlength="18" />
+			<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>
+				<text @click="idCardChange">切换</text>
+			</view>
+			<uni-easyinput v-model="formData.idcard" placeholder="请输入身份证号或护照号" maxlength="18" />
 		</view>
 
 		<view class="form-label-input">
 			<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">
-				{{formData.birthday}}
+					{{formData.birthday}}
 					<icon></icon>
 				</view>
 			</uni-datetime-picker>
@@ -33,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>
@@ -54,9 +59,9 @@
 		<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 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 class="form-radio-item" :class="{genderActive: formData.gender==2}" @click="genderSelect(2)">
 					女</view>
 			</view>
 		</view>
@@ -102,7 +107,7 @@
 					style="transform:scale(0.7)" />
 			</view>
 		</view>
-		
+
 		<view class="agree-section-box form-top-margin">
 			<checkbox-group @change="handleAgree">
 				<label class="checkbox">
@@ -131,16 +136,22 @@
 			dataChecked,
 			jiazhengUpload
 		},
+		props: {
+			status: {
+				type: String,
+			}
+		},
 		data() {
 			return {
 				formData: {
 					userName: '',
 					realName: '',
-					idCard: '',
+					idcard: '',
 					icon: '',
 					birthday: '',
 					hometown: [],
 					hujiDizhi: '',
+					idtype: '1',
 					gender: '',
 					juzhuDizhi: '',
 					minzu: {},
@@ -149,10 +160,10 @@
 					hunyin: {},
 					xueli: {},
 					jiguanObj: {},
-					jiguanShengId:'',
-					jiguanShiId:'',
-					jiguanShiName:'',
-					jiguanShengName:'',
+					jiguanShengId: '',
+					jiguanShiId: '',
+					jiguanShiName: '',
+					jiguanShengName: '',
 					agree: false,
 					xingzuoIndex: 0,
 					minzuIndex: 0,
@@ -182,9 +193,13 @@
 			this.getXingzuo()
 			this.getShuxiang()
 			this.getJiguan()
+			console.log('this.statusstatusstatus', this.status);
 
 		},
 		methods: {
+			idCardChange(data) {
+				this.formData.idtype = this.formData.idtype == 1 ? 2 : 1;
+			},
 			getJiguan() {
 				getJiazhengJiguan({}).then(res => {
 					//	this.areaTree = res.data
@@ -248,7 +263,7 @@
 				this.formData.jiguanShiName = selectedCity.label
 				this.formData.jiguanShengName = selectedProvince.label
 				this.formData.jiguanObj.jiguanShengId = selectedProvince.value
-				this.formData.jiguanObj.jiguanShiId =selectedCity.value
+				this.formData.jiguanObj.jiguanShiId = selectedCity.value
 				console.log("选中的省份完整数据:", selectedProvince);
 				console.log("选中的城市完整数据:", selectedCity);
 			},
@@ -286,7 +301,7 @@
 						name: '姓名'
 					},
 					{
-						key: 'idCard',
+						key: 'idcard',
 						name: '身份证号'
 					},
 					{
@@ -453,11 +468,11 @@
 			},
 			goNext() {
 				console.log('formData', this.formData);
-			
+
 				if (!this.checkAllFields()) {
 					return false
 				}
-				if(!this.formData.agree){
+				if (!this.formData.agree) {
 					uni.showToast({
 						title: "请勾选本人同意!",
 						icon: 'none',
@@ -465,7 +480,7 @@
 					})
 					return false
 				}
-				this.$emit('goNext',this.formData,0);
+				this.$emit('goNext', this.formData, 0);
 			},
 
 			handleAgree(e) {

+ 9 - 1
pages/admin/Jiazheng/index.vue

@@ -4,7 +4,7 @@
 				<view @click="goUpPage" class="nav-bar-icon"></view>
 				<text class="nav-bar-title">家政人员</text>
 				<view class="nav-bar-icon-box">
-					<text class="nav-bar-right-icon">+</text>
+					<text class="nav-bar-right-icon" @click="addJiazhengRenyuan">+</text>
 					<uni-icons class="nav-bar-right-icon" type="search" size="18" color="#666" @click="toggle('top')"></uni-icons>
 				</view>
 			</view>
@@ -199,6 +199,14 @@
 	const toggle = (data, index) => {
 		popup.value.open('top')
 	}
+	const addJiazhengRenyuan = () => {
+		let pageInfo = {
+			status:'add'
+		}
+		uni.redirectTo({
+			url:"/pages/admin/Jiazheng/jiazhengUserManager?pageInfo="+JSON.stringify(pageInfo) 
+		})
+	}
 	const lookUserInfo = (data, index) => {
 		uni.redirectTo({
 			url: `/pages/admin/Jiazheng/jiazhengUserInfo`

+ 131 - 106
pages/admin/Jiazheng/jiazhengUserManager.vue

@@ -6,12 +6,14 @@
 		</view>
 		<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">
+		<gerenZiliao ref="gerenZiliao" :status='status' @goNext="gerenziliaoNext" v-show="current ==0"></gerenZiliao>
+		<qiuzhiXinxi ref="qiuzhiXinxi" :status='status' @goUp="goUpQiuzhixinxi" @goNext="goNextQiuzhixinxi"
+			v-show="current ==1">
 		</qiuzhiXinxi>
-		<zhaopianZiliao ref="zhaopianZiliao" @goUp="goUpZhaopianZiliao" @goNext="goNextZhaopianZiliao"
+		<zhaopianZiliao ref="zhaopianZiliao" :status='status' @goUp="goUpZhaopianZiliao" @goNext="goNextZhaopianZiliao"
 			v-show="current ==2"></zhaopianZiliao>
-		<banzhengXinxi ref="banzhengXinxi" @goUp="goUpBanzhengXinxi" v-show="current ==3"></banzhengXinxi>
+		<banzhengXinxi ref="banzhengXinxi" :status='status' @addSave="addSave" v-show="current ==3">
+		</banzhengXinxi>
 	</view>
 </template>
 
@@ -26,78 +28,49 @@
 	export default {
 		data() {
 			return {
-				current: 2,
+				current: 3,
 				//	tabs: ['个人资料', '求职信息', '照片资料', '办证信息']
-				tabs: [{
-						id: 1,
-						name: '个人资料',
-						disabled: false
-					},
-					{
-						id: 2,
-						name: '求职信息',
-						disabled: true
-					},
-					{
-						id: 3,
-						name: '照片资料',
-						disabled: true
-					},
-					{
-						id: 4,
-						name: '办证信息',
-						disabled: true
-					},
-
-				],
+				tabs: [],
 				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,
+					"birthday": "",
+					"gender": '',
+					"hujiDizhi": "",
+					"hunyin": '',
+					"icon": "",
+					"idcard": "",
+					"idcardUrl1": "",
+					"idcardUrl2": "",
+					"idtype": '',
+					"jiankangDate": "",
+					"jibiexinzi": "",
+					"jiguanShengId": '',
+					"jiguanShiId": '',
+					"jineng": "",
+					"jingli": "",
+					"jingyan": "",
+					"juzhuDizhi": "",
+					"kaozhengList": [],
+					"leixing": "",
+					"minzu": '',
+					"qiwangxinzi": "",
+					"realName": "",
+					"shenghuoUrls": "",
+					"shuxiang": '',
+					"tijianDate": "",
+					"tijianUrl": "",
+					"userId": '',
+					"userName": "",
+					"xingzuo": '',
 					"xingzuoFlag": false,
-					"xueli": 0,
-					"zhengshuUrls": "string",
-					"zhuangtai": 0
+					"xueli": '',
+					"zhengshuUrls": "",
+					"zhuangtai": ''
 				},
 				gerenziliaoObj: {},
 				qiuzhixinxiObj: {},
 				zhaopianziliaoObj: {},
 				banzhengxinxiObj: {},
+				status: '',
 			}
 		},
 		components: {
@@ -106,70 +79,122 @@
 			gerenZiliao,
 			zhaopianZiliao,
 		},
+		onLoad(options) {
+			let pageInfo = JSON.parse(options.pageInfo)
+			this.status = pageInfo.status
+			this.dataHandle()
+		},
 		methods: {
+			dataHandle() {
+				if (this.status == 'add') {
+					this.tabs = [{
+							id: 1,
+							name: '个人资料',
+							disabled: false
+						},
+						{
+							id: 2,
+							name: '求职信息',
+							disabled: true
+						},
+						{
+							id: 3,
+							name: '照片资料',
+							disabled: true
+						},
+						{
+							id: 4,
+							name: '办证信息',
+							disabled: true
+						},
+					]
+				} else {
+					this.tabs = [{
+							id: 1,
+							name: '个人资料',
+							disabled: false
+						},
+						{
+							id: 2,
+							name: '求职信息',
+							disabled: false
+						},
+						{
+							id: 3,
+							name: '照片资料',
+							disabled: false
+						},
+						{
+							id: 4,
+							name: '办证信息',
+							disabled: false
+						},
+					]
+				}
+			},
 			changeTab(data) {
 				console.log('data', data);
 			},
-			goUpPage() {
-				uni.redirectTo({
-					url: `/pages/admin/Jiazheng/jiazhengUserInfo`
-				})
-			},
 			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.allData.userName = data.userName
+				this.allData.realName = data.realName
+				this.allData.idcard = data.idcard
+				this.allData.idtype = data.idtype
+				this.allData.jiguanShengId = data.jiguanObj.jiguanShengId
+				this.allData.jiguanShiId = data.jiguanObj.jiguanShiId
+				this.allData.juzhuDizhi = data.juzhuDizhi
+				this.allData.birthday = data.birthday
+				this.allData.minzu = data.minzu.id
+				this.allData.gender = data.gender
+				this.allData.xueli = data.xueli.id
+				this.allData.hunyin = data.hunyin.id
+				this.allData.hujiDizhi = data.hujiDizhi
+				this.allData.xingzuo = data.xingzuo.id
+				this.allData.shuxiang = data.shuxiang.id
+				this.allData.xingzuoFlag = data.xingzuoFlag
 				this.current = num + 1
 				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) {
-				this.current = num - 1
 			},
 			goNextQiuzhixinxi(data, num) {
-				this.qiuzhixinxiObj.leixing = data.leixing
-				this.qiuzhixinxiObj.jingyan = data.jingyan
-				this.qiuzhixinxiObj.jineng = data.jineng
-				this.qiuzhixinxiObj.zhuangtai = data.zhuangtai
-				this.qiuzhixinxiObj.jibiexinzi = data.jibiexinzi
-				this.qiuzhixinxiObj.qiwangxinzi = data.qiwangxinzi
-				this.qiuzhixinxiObj.jingli = data.jingli
+				this.allData.leixing = data.leixing
+				this.allData.jingyan = data.jingyan
+				this.allData.jineng = data.jineng
+				this.allData.zhuangtai = data.zhuangtai
+				this.allData.jibiexinzi = data.jibiexinzi
+				this.allData.qiwangxinzi = data.qiwangxinzi
+				this.allData.jingli = data.jingli
 				this.current = num + 1
 				this.tabs = this.tabs.map((item, i) => {
 					if (i == this.current) item.disabled = false
 					return item
 				})
-				console.log('this.qiuzhixinxiObj', this.qiuzhixinxiObj);
-			},
-			goUpZhaopianZiliao(data, num) {
-				this.current = num - 1
 			},
 			goNextZhaopianZiliao(data, num) {
+				this.allData.icon = data.icon
+				this.allData.idcardUrl1 = data.idcardUrl1
+				this.allData.idcardUrl2 = data.idcardUrl2
+				this.allData.shenghuoUrls = data.shenghuoUrls
+				this.allData.zhengshuUrls = data.zhengshuUrls
+				this.allData.tijianDate = data.tijianDate
+				this.allData.jiankangDate = data.jiankangDate
+				this.allData.tijianUrl = data.tijianUrl
 				this.current = num + 1
 				this.tabs = this.tabs.map((item, i) => {
 					if (i == this.current) item.disabled = false
 					return item
 				})
 			},
-			goUpBanzhengXinxi(data, num) {
-				this.current = num - 1
+			addSave(data) {
+				this.allData.kaozhengList.push(data)
+				this.submitJiazheng()
+			},
+			submitJiazheng() {
+				console.log('this.allData', this.allData);
 			}
+
 		}
 	}
 </script>

+ 5 - 12
pages/admin/Jiazheng/qiuzhiXinxi.vue

@@ -41,7 +41,6 @@
 			<input v-model="jingli"  placeholder="请填写工作经历" />
 		</view>
 		<view class="page-btn-box">
-			<button type="default" @click="goUp" class="phone-white-btn">上一步</button>
 			<button type="default"  @click="goNext" class="phone-green-btn">下一步</button>
 		</view>
 	</view>
@@ -66,6 +65,11 @@
 			this.getJineng()
 			this.getZhuangtai()
 		},
+		props: {
+			status: {
+				type: String,
+			}
+		},
 		data() {
 			return {
 				formData:{},
@@ -226,17 +230,6 @@
 				
 				this.$emit('goNext',this.formData,1);
 			},
-			goUp() {
-				// if(!this.formData.agree){
-				// 	uni.showToast({
-				// 		title: "请勾选本人同意!",
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	})
-				// 	return false
-				// }
-				this.$emit('goUp',{},1);
-			},
 		}
 	};
 </script>

+ 5 - 12
pages/admin/Jiazheng/zhaopianZiliao.vue

@@ -87,7 +87,6 @@
 		</view>
 
 		<view class="page-btn-box">
-			<button type="default" @click="goUp" class="phone-white-btn">上一步</button>
 			<button type="default" @click="goNext" class="phone-green-btn">下一步</button>
 		</view>
 	</view>
@@ -116,6 +115,11 @@
 				zhengshuUrls: '',
 			}
 		},
+		props: {
+			status: {
+				type: String,
+			}
+		},
 		components: {
 			jiazhengUpload
 		},
@@ -185,17 +189,6 @@
 				console.log('this.formData', this.formData);
 				this.$emit('goNext', this.formData, 2);
 			},
-			goUp() {
-				// if(!this.formData.agree){
-				// 	uni.showToast({
-				// 		title: "请勾选本人同意!",
-				// 		icon: 'none',
-				// 		duration: 2000
-				// 	})
-				// 	return false
-				// }
-				this.$emit('goUp', {}, 2);
-			},
 
 		},
 		created() {