证件类型bug修复

pages/application-process/basic-info.vue

@@ -85,7 +85,7 @@
 						</picker>
 						</picker>
 					</view>
 					</view>
 					<view class="contentItem">
 					<view class="contentItem">
-						<text>证件号码</text>
+						<text>证件号码{{this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2}}</text>
 						<view>
 						<view>
 							<input type="text" class="form-control" v-model="applyParam.idNo" placeholder="请输入证件号码"
 							<input type="text" class="form-control" v-model="applyParam.idNo" placeholder="请输入证件号码"
 								auto-blur=true @blur="checkInput(3,applyParam.idNo)"
 								auto-blur=true @blur="checkInput(3,applyParam.idNo)"
@@ -189,7 +189,7 @@
 					this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
 					this.applyParam.mobileNumber = JSON.parse(uni.getStorageSync('cffp_userInfo'))['mobile'];
 				}
 				}
 			}
 			}
-			this.erpInitialize();
+			// this.erpInitialize();
 			// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			// let routes = getCurrentPages(); // 获取当前打开过的页面路由数组
 			// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
 			// let curRoute = routes[routes.length - 1].route // 获取当前页面路由，也就是最后一个打开的页面路由
 			// console.log('当前路由地址',curRoute)
 			// console.log('当前路由地址',curRoute)
@@ -209,12 +209,15 @@
 		},
 		},
 		methods: {
 		methods: {
 			erpInitialize() {
 			erpInitialize() {
+				return new Promise((resolve,reject)=>{
 					api.erpInitialize({}).then((res) => {
 					api.erpInitialize({}).then((res) => {
+						resolve(res['success']);
 						if (res['success']) {
 						if (res['success']) {
 							this.idTypesList = this.idTypesList.concat(res['data']['idTypes']);
 							this.idTypesList = this.idTypesList.concat(res['data']['idTypes']);
 							console.log(this.idTypesList)
 							console.log(this.idTypesList)
 						}
 						}
 					})
 					})
+				})
 			},
 			},
 			queryOrgList() {
 			queryOrgList() {
 				const param = {
 				const param = {
@@ -302,7 +305,8 @@
 
 
 				}
 				}
 			},
 			},
-			queryById(id, userId) {
+			async queryById(id, userId) {
+				await this.erpInitialize();
 				api.queryById({
 				api.queryById({
 					id: id,
 					id: id,
 					userId: userId
 					userId: userId
@@ -371,7 +375,7 @@
 							}
 							}
 						}
 						}
 					}
 					}
-					if (!this.applyParam.idType) {
+					if (!this.applyParam.idType || this.applyParam.idType=='请选择') {
 						uni.showToast({
 						uni.showToast({
 							title: '请选择证件类型',
 							title: '请选择证件类型',
 							duration: 2000,
 							duration: 2000,

pages/application-process/education.vue

@@ -36,7 +36,7 @@
 					 </picker>
 					 </picker>
 			       </view>
 			       </view>
 			       <view class="contentItem">
 			       <view class="contentItem">
-			         <text>毕业学校{{applyParam.approvalStatus}}</text>
+			         <text>毕业学校{{applyParam.approvalStatus}}  {{this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2}}</text>
 			         <input class="form-control" v-model="applyParam.lastGraduateSchool" style="background: #666666;"
 			         <input class="form-control" v-model="applyParam.lastGraduateSchool" style="background: #666666;"
 					 :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
 					 :disabled="this.applyParam.approvalStatus!= 0 && this.applyParam.approvalStatus != 2"/>
 			       </view>
 			       </view>