wgl 4 år sedan
förälder
incheckning
98d58dd6af

+ 1 - 1
src/projects/business/views/Master/Company/RegisterExamine.vue

@@ -33,7 +33,7 @@
 									</div>
 								</form>
 							</div>
-							<div class="fyy-bindfyy-btn">
+							<div v-show="recordList.length>0" class="fyy-bindfyy-btn">
 								<form class="mui-input-group">
 									<div class="mui-input-row mui-checkbox mui-left">
 										<label>全选</label>

+ 5 - 6
src/projects/business/views/Master/Home.vue

@@ -7,11 +7,11 @@
 			<div class="vongi-index">
 				<div class="vongi-index-top">
 					<div class="mui-media-object mui-pull-left">
-						<img :src="person_data.faceImageUrl?person_data.faceImageUrl:''">
+						<img :src="person_data?person_data.faceImageUrl:''">
 					</div>
 					<div class="mui-media-body">
-						<h3 v-text="person_data.name?person_data.name:''"></h3>
-						<p class='mui-ellipsis' v-text="person_data.companyName?person_data.companyName:''"></p>
+						<h3 v-text="person_data?person_data.name:''"></h3>
+						<p class='mui-ellipsis' v-text="person_data?person_data.companyName:''"></p>
 					</div>
 					<a class="mui-pull-right" @click="selectRole">切换身份<span class="mui-icon iconfont icon-jiaohuan"></span></a>
 				</div>
@@ -244,12 +244,11 @@
 				return require('$project/assets/img/' + file);
 			},
 			asynCallBack() {
-
+				//获取用户角色列表
+				this.getRoleList();
 			},
 		},
 		mounted() {
-			//获取用户角色列表
-			this.getRoleList();
 			//获取最新二条通知消息
 			this.getLastNotice();
 

+ 1 - 1
src/projects/home/views/Register/Business/Step3.vue

@@ -151,7 +151,7 @@
 				if (lastIndex == this.structureNameList.length) {
 					this.subForm.companyStructureId = lastItem ? lastItem.id : '';
 				}
-				if (!this.subForm.companyStructureId) {
+				if (!this.subForm.companyStructureId && this.structureNameList.length > 0) {
 					mui.toast('请选择' + this.structureNameList[lastIndex]);
 					return false;
 				} else {

+ 1 - 1
src/projects/home/views/Register/Pension/step3.vue

@@ -168,7 +168,7 @@
 					if (lastIndex == this.structureNameList.length) {
 						this.subForm.companyStructureId = lastItem ? lastItem.id : '';
 					}
-					if (!this.subForm.companyStructureId) {
+					if (!this.subForm.companyStructureId && this.structureNameList.length > 0) {
 						mui.toast('请选择' + this.structureNameList[lastIndex]);
 						return false;
 					} else {

+ 1 - 1
src/projects/home/views/Register/Residence/Step3.vue

@@ -149,7 +149,7 @@
 				if (lastIndex == this.structureNameList.length) {
 					this.subForm.companyStructureId = lastItem ? lastItem.id : '';
 				}
-				if (!this.subForm.companyStructureId) {
+				if (!this.subForm.companyStructureId && this.structureNameList.length > 0) {
 					mui.toast('请选择' + this.structureNameList[lastIndex]);
 					return false;
 				} else {