面试意见

src/app/my/approval-comments/approval-comments.component.html

 <div class="wrapper">
 <div class="wrapper">
   <div>
   <div>
     <div class="title">面试意见</div>
     <div class="title">面试意见</div>
-    <textarea class="form-control" cols="30" rows="10" placeholder="请输入您的面试意见"></textarea>
+    <textarea class="form-control" cols="30" rows="10" placeholder="请输入您的面试意见" [(ngModel)]="interviewAssessment"></textarea>
   </div>
   </div>
   <div>
   <div>
     <div class="title">备注</div>
     <div class="title">备注</div>
     <textarea class="form-control" cols="30" rows="10" [(ngModel)]="rejectNote"></textarea>
     <textarea class="form-control" cols="30" rows="10" [(ngModel)]="rejectNote"></textarea>
   </div>
   </div>
   <div id="page">
   <div id="page">
-    <div (click)="showAlert()">通过</div>
-    <div (click)="showAlert()">拒绝</div>
+    <div (click)="showAlert(1)">通过</div>
+    <div (click)="showAlert(0)">拒绝</div>
   </div>
   </div>
-</div>
+</div>
\ No newline at end of file
+<ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert>
\ No newline at end of file

src/app/my/approval-comments/approval-comments.component.ts

 import { Component, OnInit } from '@angular/core';
 import { Component, OnInit } from '@angular/core';
 import { ModalService, ToastService } from 'ng-zorro-antd-mobile';
 import { ModalService, ToastService } from 'ng-zorro-antd-mobile';
-
+import { ActivatedRoute,Router } from "@angular/router";
+import { MyService} from '../my.service';
 @Component({
 @Component({
   selector: 'ydlife-approval-comments',
   selector: 'ydlife-approval-comments',
   templateUrl: './approval-comments.component.html',
   templateUrl: './approval-comments.component.html',
@@ -8,15 +9,61 @@ import { ModalService, ToastService } from 'ng-zorro-antd-mobile';
 })
 })
 export class ApprovalCommentsComponent implements OnInit {
 export class ApprovalCommentsComponent implements OnInit {
   rejectNote:string;
   rejectNote:string;
-  constructor(private _modal: ModalService, private _toast: ToastService) { }
+  interviewAssessment:string;
+  approvingStatus:number;
+  hiringBasicInfoId:any;
+  approvalIdentity:any;
+  practitionerId:any;
+  isNeedAlert: boolean;
+  dialogInfo: any;
+  constructor(private myService:MyService,private _modal: ModalService, private _toast: ToastService,private activatedRoute: ActivatedRoute,
+    private router: Router) { }
 
 
   ngOnInit() {
   ngOnInit() {
+    this.hiringBasicInfoId = this.activatedRoute.snapshot.queryParams.hiringBasicInfoId?this.activatedRoute.snapshot.queryParams.hiringBasicInfoId:null;
+    this.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
+    this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
+
   }
   }
 
 
-  showAlert() {
-    ModalService.alert('Delete', 'Are you sure ?', [
-      { text: 'Cancel', onPress: () => console.log('cancel') },
-      { text: 'OK', onPress: () => console.log('ok') }
+  showAlert(approvingStatus) {
+    this.approvingStatus = approvingStatus;
+    ModalService.alert('提交', '只能保存一次，确定提交？', [
+      { text: '取消', onPress: () => console.log('取消') },
+      { text: '确定', onPress: () =>  this.hiringApprove()}
     ]);
     ]);
   }
   }
+
+  hiringApprove(){
+    if(!this.interviewAssessment){
+      this.openPopInfo('请输入您的面试意见！');
+      return;
+    }
+    const param = {
+      practitionerId:this.practitionerId,
+      approvalIdentity:this.approvalIdentity,
+      hiringBasicInfoId:this.hiringBasicInfoId,
+      approvingStatus: this.approvingStatus,
+      rejectNote:this.rejectNote,
+      interviewAssessment:this.interviewAssessment
+    }
+    this.myService.hiringApprove(param).subscribe((res)=>{
+      this.openPopInfo(res['message'])
+    })
+  }
+
+   // 打开弹窗
+   openPopInfo(message) {
+    this.isNeedAlert = true;
+    this.dialogInfo = {
+      title: null,
+      content: { value: message, align: 'center' },
+      footer: [{ value: '我知道了', routerLink: '', className: 'weui-dialog__btn_primary' }],
+    };
+  }
+
+  // 关闭弹窗
+  getPopInfo() {
+    this.isNeedAlert = false;
+  }
 }
 }

src/app/my/approval-list/approval-list.component.ts

@@ -26,10 +26,11 @@ export class ApprovalListComponent implements OnInit {
 
 
   selectTab(id) {
   selectTab(id) {
     this.selectedId = id;
     this.selectedId = id;
+    this.listQuery();
   }
   }
 
 
   listQuery(){
   listQuery(){
-    this.myService.listQuery({practitionerId:this.practitionerId}).subscribe((res)=>{
+    this.myService.listQuery({practitionerId:this.practitionerId,approvingStatus:this.selectedId}).subscribe((res)=>{
       console.log(res)
       console.log(res)
       if(res['success']){
       if(res['success']){
         this.approvarList = res['data']['hiringListInfoList'];
         this.approvarList = res['data']['hiringListInfoList'];
@@ -42,6 +43,7 @@ export class ApprovalListComponent implements OnInit {
       sessionStorage.setItem('viewApprovalInfo','1')
       sessionStorage.setItem('viewApprovalInfo','1')
     }else{
     }else{
       sessionStorage.setItem('viewApprovalInfo','0')
       sessionStorage.setItem('viewApprovalInfo','0')
+      
     }
     }
     if(this.selectedId == 0 || type=='view'){
     if(this.selectedId == 0 || type=='view'){
       this.router.navigate([`/employee_basic_info`],{queryParams:{hiringBasicInfoId:item.hiringBasicInfoId,approvalIdentity:item.approvalIdentity}})
       this.router.navigate([`/employee_basic_info`],{queryParams:{hiringBasicInfoId:item.hiringBasicInfoId,approvalIdentity:item.approvalIdentity}})

src/app/my/member-detail/member-detail.component.html

@@ -20,8 +20,8 @@
       <div><span>性别</span><span>{{practitionerDeatil?.gender}}</span></div>
       <div><span>性别</span><span>{{practitionerDeatil?.gender}}</span></div>
       <div><span>年龄</span><span>{{practitionerDeatil?.age}}</span></div>
       <div><span>年龄</span><span>{{practitionerDeatil?.age}}</span></div>
       <div><span>生日</span><span>{{practitionerDeatil?.birthDate}}</span></div>
       <div><span>生日</span><span>{{practitionerDeatil?.birthDate}}</span></div>
-      <div><span>所在省和城市</span><span>{{practitionerDeatil?.province}}-{{practitionerDeatil?.city}}</span></div>
-      <!-- <div><span>学历</span><span>{{practitionerDeatil?.}}</span></div> -->
+      <div><span>所在省和城市</span><span>{{practitionerDeatil?.province}} <span *ngIf="practitionerDeatil?.city">-{{practitionerDeatil?.city}}</span> </span></div>
+      <div><span>学历</span><span>{{practitionerDeatil?.educationLevel}}</span></div>
       <div><span>登记证件</span><span>{{practitionerDeatil?.idType}}</span></div>
       <div><span>登记证件</span><span>{{practitionerDeatil?.idType}}</span></div>
       <div><span>登记证件号</span><span>{{practitionerDeatil?.idNo}}</span></div>
       <div><span>登记证件号</span><span>{{practitionerDeatil?.idNo}}</span></div>
       <div><span>登记日期</span><span>{{practitionerDeatil?.effectiveStartDate}}</span></div>
       <div><span>登记日期</span><span>{{practitionerDeatil?.effectiveStartDate}}</span></div>

src/app/my/member-detail/member-detail.component.scss

@@ -36,9 +36,10 @@
             align-items: center;
             align-items: center;
             border-bottom: 1px #ddd solid;
             border-bottom: 1px #ddd solid;
            span{
            span{
-                width: 50%;
+                width: 35%;
             }
             }
             span:nth-child(2){
             span:nth-child(2){
+                width: 65%;
                 text-align: right;
                 text-align: right;
             }
             }
         }
         }