Merge branch 'master' into dev

src/app/domain/employBasicQuery.ts

@@ -15,7 +15,8 @@ export class EmployBasicQuery {
         public  cityName?:string,
         public  cityName?:string,
         public  residentAddress?:string,
         public  residentAddress?:string,
         public  wechatId?:number,
         public  wechatId?:number,
-        public  email?:string
+        public  email?:string,
+        public politicalOutlook?:string
     ) {
     ) {
 
 
     }
     }

src/app/my/application-process/employee-basic-info/employee-basic-info.component.html

@@ -40,7 +40,6 @@
             出生日期
             出生日期
             </ListItem>
             </ListItem>
           </List>
           </List>
-    
       <div class="contentItem">
       <div class="contentItem">
         <span>性别</span>
         <span>性别</span>
         <select class="form-control" [(ngModel)]="editEmployBasicInfo.gender" 
         <select class="form-control" [(ngModel)]="editEmployBasicInfo.gender" 
@@ -49,7 +48,15 @@
           <option value='1'>男</option>
           <option value='1'>男</option>
           <option value="2">女</option>
           <option value="2">女</option>
         </select>
         </select>
-        
+      </div>
+      <div class="contentItem">
+        <span>政治面貌</span>
+        <select class="form-control" [(ngModel)]="editEmployBasicInfo.politicalOutlook"
+        [disabled]="approveStatus!=null && approveStatus!='-1'">
+          <option [value]="listItem.codeName" *ngFor="let listItem of list">
+            {{listItem.codeName}}
+          </option>
+        </select>
       </div>
       </div>
       <div class="contentItem">
       <div class="contentItem">
         <span>户籍</span>
         <span>户籍</span>

src/app/my/application-process/employee-basic-info/employee-basic-info.component.ts

@@ -23,6 +23,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
   maxDate:any = new Date();
   maxDate:any = new Date();
   //通过0，拒绝-1，已填完-2
   //通过0，拒绝-1，已填完-2
   approveStatus:any;
   approveStatus:any;
+  list:Array<any>;
   constructor(private activatedRoute: ActivatedRoute,
   constructor(private activatedRoute: ActivatedRoute,
     private router: Router,public lifeCommonService:LifeCommonService,
     private router: Router,public lifeCommonService:LifeCommonService,
     public myService:MyService) { }
     public myService:MyService) { }
@@ -36,6 +37,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
     this.provCityQry();
     this.provCityQry();
     this.editEmployBasicInfo = new EmployBasicQuery(this.hiringBasicInfoId,null,this.editEmployBasicInfo.mobileNo,null,null,null,null,null,null,null,null,null,null,null,null)
     this.editEmployBasicInfo = new EmployBasicQuery(this.hiringBasicInfoId,null,this.editEmployBasicInfo.mobileNo,null,null,null,null,null,null,null,null,null,null,null,null)
     this.queryWholeInfo(this.hiringBasicInfoId);
     this.queryWholeInfo(this.hiringBasicInfoId);
+    this.queryMdCode();
   }
   }
 
 
   erpInitialize(){
   erpInitialize(){
@@ -165,6 +167,10 @@ export class EmployeeBasicInfoComponent implements OnInit {
       this.openPopInfo('请选择您的户籍！')
       this.openPopInfo('请选择您的户籍！')
       return;
       return;
     }
     }
+    if(!this.editEmployBasicInfo.politicalOutlook){
+      this.openPopInfo('请选择您的政治面貌！')
+      return;
+    }
     if(!this.editEmployBasicInfo.residentAddress){
     if(!this.editEmployBasicInfo.residentAddress){
       this.openPopInfo('请输入您的居住地址！')
       this.openPopInfo('请输入您的居住地址！')
       return;
       return;
@@ -266,5 +272,11 @@ export class EmployeeBasicInfoComponent implements OnInit {
     this.router.navigate(['/work_experience'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
     this.router.navigate(['/work_experience'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
   }
   }
 
 
+  queryMdCode(){
+    this.myService.queryMdCode({codeType: "PoliticalOutlook"}).subscribe((res)=>{
+      console.log(res)
+      this.list = res['data']['list'];
+    })
+  }
   
   
 }
 }

src/app/my/my.service.ts

@@ -954,4 +954,12 @@ export class MyService {
     const url = this.ydapi + "/practitioner/queryCanSee";
     const url = this.ydapi + "/practitioner/queryCanSee";
     return this.http.post(url,JSON.stringify(params))
     return this.http.post(url,JSON.stringify(params))
   }
   }
+
+  //政治面貌
+  queryMdCode(param){
+    const url = this.API + "/metadata/queryMdCode";
+    return this.http.post(url, JSON.stringify(param)).pipe(res => {
+      return res;
+    });
+  }
 }
 }