居家养老注册调整

src/projects/home/apis/person.js

@@ -103,6 +103,14 @@ export function getCompanyStructureByName(companyId, positionName) {
 	})
 }
 
+//养老机构获取管理机构列表
+export function getServiceCompanyIdList() {
+	return request({
+		url: '/mobile/companyInfoApi/serviceCompanyIdList',
+		data: Qs.stringify({}),
+		method: 'post',
+	})
+}
 
 //提交注册
 export function register(params) {

src/projects/home/router/index.js

@@ -268,7 +268,7 @@ const routes = [
 					{
 						path: 'step2',
 						name: 'RegisterPensionStep2',
-						component: () => import('../views/Register/Pension/step2.vue'),
+						component: () => import('../views/Register/Pension/Step2.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
@@ -279,18 +279,29 @@ const routes = [
 					{
 						path: 'step2_4',
 						name: 'RegisterPensionStep2_4',
-						component: () => import('../views/Register/Pension/step2_4.vue'),
+						component: () => import('../views/Register/Pension/Step2_4.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],
 							title: '居家养老场景4选择小区',
 						}
 					},
+					//居家养老场景4选择管理机构
+					{
+						path: 'step3_4',
+						name: 'RegisterPensionStep3_4',
+						component: () => import('../views/Register/Pension/Step3_4.vue'),
+						meta: {
+							requireAuth: false,
+							role: [],
+							title: '居家养老场景4选择管理机构',
+						}
+					},
 					//选择房号
 					{
 						path: 'step3',
 						name: 'RegisterPensionStep3',
-						component: () => import('../views/Register/Pension/step3.vue'),
+						component: () => import('../views/Register/Pension/Step3.vue'),
 						meta: {
 							requireAuth: false,
 							role: [],

src/projects/home/views/Register/Home.vue

@@ -56,6 +56,8 @@
 					companyId: '',
 					companyName: '请选择',
 					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
 					//最终选择的数据
 					selectCompanyStructureList: [],
 					address: '',

src/projects/home/views/Register/Pension/Step1.vue

@@ -33,10 +33,16 @@
 							{{subForm.companyName}}
 						</button>
 					</div>
+					<div v-if="subForm.sceneId==4 && subForm.companyId!==''" class="mui-input-row">
+						<label>服务机构</label>
+						<button @click="goToSelectServeCompany" class="mui-btn mui-btn-block mui-navigate-right" type='button' style="width:50%">
+							{{subForm.serviceCompanyName}}
+						</button>
+					</div>
 				</form>
 			</div>
 			<!-- 状态 -->
-			<div v-show="subForm.companyId!==''" class="vongi-zc vongi-fklist">
+			<div v-show="roleSeleceShow" class="vongi-zc vongi-fklist">
 				<div class="mui-content-padded">
 					<h5>请选择您的身份进行认证</h5>
 				</div>
@@ -93,6 +99,8 @@
 					companyId: '',
 					companyName: '请选择',
 					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
 					//最终选择的数据
 					selectCompanyStructureList: [],
 					address: '',
@@ -142,6 +150,12 @@
 					name: 'RegisterPensionStep2_4'
 				})
 			},
+			//选择服务机构
+			goToSelectServeCompany() {
+				this.$router.push({
+					name: 'RegisterPensionStep3_4'
+				})
+			},
 
 			asynCallBack() {
 
@@ -158,6 +172,28 @@
 
 		},
 		computed: {
+			roleSeleceShow: {
+				// getter
+				get: function() {
+					if (this.subForm.sceneId == 4) {
+						if (this.subForm.serviceCompanyId !== '') {
+							return true;
+						} else {
+							return false;
+						}
+					} else {
+						if (this.subForm.companyId !== '') {
+							return true;
+						} else {
+							return false;
+						}
+					}
+				},
+				// setter
+				set: function(newValue) {
+					console.log(newValue)
+				}
+			},
 			...mapGetters({
 				openId: 'wx_openid',
 				token: 'token',

src/projects/home/views/Register/Pension/Step3_4.vue

@@ -0,0 +1,120 @@
+<template>
+	<div>
+		<common @asynCallBack="asynCallBack" :projectCheck="false"></common>
+		<top-header :pageTitle="pageTitle"></top-header>
+
+		<div class="mui-content vongi-xzdw">
+			<ul class="mui-table-view vongi-xzyljg">
+				<li v-for="(item,index) in companyList" class="mui-table-view-cell mui-media">
+					<a @click="clickCompany(item)" v-text="item.name">
+
+					</a>
+				</li>
+			</ul>
+		</div>
+
+		<loading :visible="isLoading"></loading>
+	</div>
+</template>
+
+<script>
+	import * as API_Person from '@/apis/person'
+	import Common from '$project/components/Common.vue'
+	import Loading from '$project/components/Loading.vue'
+	import TopHeader from '$project/components/TopHeader.vue'
+	import isReachBottom from '$project/utils/isReachBottom'
+	import {
+		mapGetters,
+		mapMutations
+	} from 'vuex'
+	import * as types from '$project/store/mutation-types'
+	export default {
+		name: 'RegisterPensionStep3_4',
+		components: {
+			Common,
+			Loading,
+			TopHeader
+		},
+		data() {
+			return {
+				pageTitle: '选择服务机构',
+
+				subForm: {
+					sceneId: '',
+					sceneName: '',
+					personRoleId: '',
+					roleName: '',
+					name: '',
+					telephone: '',
+					personId: '',
+					companyId: '',
+					companyName: '请选择',
+					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
+					//companyStructureName: '请选择',
+					//最终选择的数据
+					selectCompanyStructureList: [],
+					address: '',
+					idCard: '',
+					faceImageUrl: ''
+				},
+
+				isLoading: false,
+
+				companyList: []
+			}
+		},
+		created() {
+			this.subForm = this.register_form_data;
+		},
+		methods: {
+			//获取公司列表
+			getCompanyList() {
+				this.isLoading = true;
+				API_Person.getServiceCompanyIdList().then(response => {
+					this.isLoading = false;
+					this.companyList = response.list;
+				}).catch(error => {
+					this.isLoading = false;
+					mui.toast(error);
+				})
+			},
+			//公司选择
+			clickCompany(item) {
+				this.subForm.serviceCompanyId = item.id;
+				this.subForm.serviceCompanyName = item.name;
+				this.set_register_form_data(this.subForm);
+				this.$router.push({
+					name: 'RegisterPensionStep1'
+				})
+			},
+
+			asynCallBack() {
+
+			},
+			...mapMutations({
+				set_register_form_data: types.SET_REGISTER_FORM_DATA,
+			})
+		},
+		mounted() {
+			this.getCompanyList();
+		},
+		destroyed() {},
+		computed: {
+			...mapGetters({
+				openId: 'wx_openid',
+				token: 'token',
+				person_data: 'person_data',
+				person_popedom: 'person_popedom',
+				register_form_data: 'register_form_data'
+			})
+		}
+	}
+</script>
+
+<style scoped src="$project/assets/css/xpwyfyy.css"></style>
+<style scoped src="$project/assets/css/sczpfyy.css"></style>
+<style src="$project/assets/css/iconfont.css"></style>
+<style>
+</style>

src/projects/home/views/Register/Pension/Step4.vue

@@ -104,6 +104,8 @@
 					companyId: '',
 					companyName: '请选择',
 					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
 					//最终选择的数据
 					selectCompanyStructureList: [],
 					address: '',

src/projects/home/views/Register/Pension/step2.vue

@@ -62,6 +62,8 @@
 					companyId: '',
 					companyName: '请选择',
 					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
 					//最终选择的数据
 					selectCompanyStructureList: [],
 					address: '',

src/projects/home/views/Register/Pension/step2_4.vue

@@ -97,6 +97,8 @@
 					companyId: '',
 					companyName: '请选择',
 					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
 					//companyStructureName: '请选择',
 					//最终选择的数据
 					selectCompanyStructureList: [],

src/projects/home/views/Register/Pension/step3.vue

@@ -88,6 +88,8 @@
 					companyId: '',
 					companyName: '请选择',
 					companyStructureId: '',
+					serviceCompanyId: '',
+					serviceCompanyName: '请选择',
 					//最终选择的数据
 					selectCompanyStructureList: [],
 					address: '',