审批结果页面

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

@@ -82,7 +82,7 @@
     保存并下一步
   </footer>
   <div id="page" *ngIf="approvalIdentity">
-    <div routerLink="/approval-list">上一页</div>
+    <div routerLink="/approval_list">上一页</div>
     <div (click)="viewNext()">下一页</div>
   </div>
 </div>

src/app/my/application-process/employee-education/employee-education.component.html

@@ -24,9 +24,9 @@
         <div></div>
       </div>
     </div>
-    <div class="photo_wrapper" *ngIf="!certificationVxUrl">
+    <div class="photo_wrapper" *ngIf="!certificationVxUrl" (click)="selectPic()">
       <img src="assets/images/camera.png" alt="" />
-      <div style="margin-top: 10px;" (click)="selectPic()">点击添加毕业证照片</div>
+      <div style="margin-top: 10px;" >点击添加毕业证照片</div>
     </div>
     <img src="{{certificationVxUrl}}" alt="毕业证照片" (click)="selectPic()" *ngIf="certificationVxUrl">
     <div class="tips">

src/app/my/application-process/employee-id-card/employee-id-card.component.html

@@ -10,10 +10,10 @@
   <div class="content">
     <div class="content_wrapper">
         <div class="photo" 
-        *ngIf="!frontVxUrl">
+        *ngIf="!frontVxUrl" (click)="selectPic('front')">
           <img src="assets/images/front.png" alt="身份证正面">
           <img class="camera" src="assets/images/camera.png" alt="身份证" />
-          <div class="choseBtn" (click)="selectPic('front')">点击添加身份证正面</div>
+          <div class="choseBtn" >点击添加身份证正面</div>
         </div>
         <img class="showImg" src="{{frontVxUrl}}" alt="身份证正面" *ngIf="frontVxUrl" 
         (click)="selectPic('front')">
@@ -23,10 +23,10 @@
         </div>
     </div>
     <div class="content_wrapper" style="margin-top: 25px;">
-        <div class="photo" *ngIf="!backVxUrl" >
+        <div class="photo" *ngIf="!backVxUrl" (click)="selectPic('back')">
           <img src="assets/images/back.png" alt="身份证反面面">
           <img class="camera" src="assets/images/camera.png" alt="身份证" />
-          <div class="choseBtn" (click)="selectPic('back')">点击添加身份证正面</div>
+          <div class="choseBtn" >点击添加身份证正面</div>
         </div>
         <img class="showImg" src="{{backVxUrl}}" alt="身份证反面" *ngIf="backVxUrl" 
         (click)="selectPic('back')">

src/app/my/application-process/personal-photos/personal-photos.component.ts

@@ -67,7 +67,6 @@ export class PersonalPhotosComponent implements OnInit {
         this.openPopInfo('请在微信端操作！')
       }
     }
-    
   }
 
   next(){

src/app/my/application-process/signature/signature.component.html

@@ -18,7 +18,7 @@
   <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
     我自愿签订经纪人合同书
   </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approvalIdentity && viewApprovalInfo==0">
     <div (click)="goBack()">上一页</div>
     <div (click)="viewNext()">下一页</div>
   </div>

src/app/my/application-process/signature/signature.component.ts

@@ -19,6 +19,7 @@ export class SignatureComponent implements OnInit {
   dialogInfo: any;
   isSignatureShow:boolean;
   approvalIdentity:any;
+  viewApprovalInfo:any;
   @ViewChild(SignaturePad) signaturePad : SignaturePad;
   constructor(private activatedRoute: ActivatedRoute,
     private router: Router,public lifeCommonService:LifeCommonService,
@@ -37,13 +38,14 @@ export class SignatureComponent implements OnInit {
       penColor: "#333",
       /* INVERSE BECAUSE IT IS SHOW ONLY IN LANDSCAPE */
       canvasWidth: document.body.clientWidth-26,
-      canvasHeight: 300,
+      canvasHeight: 400,
       // backgroundColor:"rgb(248 248 248)"
     }
     const title = this.activatedRoute.snapshot.data[0]['title'];
     this.lifeCommonService.setTitle(title);
     this.hiringBasicInfoId = this.activatedRoute.snapshot.queryParams.hiringBasicInfoId?this.activatedRoute.snapshot.queryParams.hiringBasicInfoId:null;
     this.queryWholeInfo(this.hiringBasicInfoId)
+    this.viewApprovalInfo = sessionStorage.getItem('viewApprovalInfo');
   }
 
   next(){

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

-<div>
-  审批意见
+<div class="wrapper">
+  <div>
+    <div class="title">面试意见</div>
+    <textarea class="form-control" cols="30" rows="10" placeholder="请输入您的面试意见"></textarea>
+  </div>
+  <div>
+    <div class="title">备注</div>
+    <textarea class="form-control" cols="30" rows="10" [(ngModel)]="rejectNote"></textarea>
+  </div>
+  <div id="page">
+    <div (click)="showAlert()">通过</div>
+    <div (click)="showAlert()">拒绝</div>
+  </div>
 </div>
\ No newline at end of file

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

+.wrapper{
+    padding: 10px 15px;
+    .title{
+        font-size: 15px;
+        font-weight: bold;
+        margin: 10px auto;
+    }
+}
\ No newline at end of file

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

 import { Component, OnInit } from '@angular/core';
+import { ModalService, ToastService } from 'ng-zorro-antd-mobile';
 
 @Component({
   selector: 'ydlife-approval-comments',
@@ -6,10 +7,16 @@ import { Component, OnInit } from '@angular/core';
   styleUrls: ['./approval-comments.component.scss']
 })
 export class ApprovalCommentsComponent implements OnInit {
-
-  constructor() { }
+  rejectNote:string;
+  constructor(private _modal: ModalService, private _toast: ToastService) { }
 
   ngOnInit() {
   }
 
+  showAlert() {
+    ModalService.alert('Delete', 'Are you sure ?', [
+      { text: 'Cancel', onPress: () => console.log('cancel') },
+      { text: 'OK', onPress: () => console.log('ok') }
+    ]);
+  }
 }

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

@@ -10,12 +10,15 @@
   </ul>
   <div class="salesContent">
     <div style="text-align: center;margin: 20px auto;font-size: 20px;" *ngIf="approvarList?.length==0">暂无数据</div>
-    <div class="salesItem" *ngFor="let approvarItem of approvarList" (click)="jumpToDetail(approvarItem)">
-      <div class="icon_bolck" ><span class="iconfont icon-ren4"></span></div>
+    <div class="salesItem" *ngFor="let approvarItem of approvarList" >
+      <div class="icon_bolck"><span class="iconfont icon-ren4"></span></div>
       <div class="line">
         <div>姓名：{{approvarItem.name}}</div>
-        <span class="iconfont icon-ar-r" style="font-size: 10px;position: relative; right: -2px;"></span>
-
+        <span class="iconfont icon-ar-r" style="font-size: 10px;position: relative; right: -2px;"
+        (click)="jumpToDetail(approvarItem)"></span>
+      </div>
+      <div class="line" *ngIf="selectedId==1 || selectedId==2" (click)="jumpToDetail(approvarItem,'view')">
+        查看详情
       </div>
       <div class="line">
         <div> 手机号：{{approvarItem.mobileNo}}</div>

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

@@ -15,7 +15,7 @@ export class ApprovalListComponent implements OnInit {
   constructor(private myService:MyService,private router:Router) { }
 
   ngOnInit() {
-    this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']
+    this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
     this.titleList = [
       { id: 0, name: '待审批' },
       { id: 1, name: '通过' },
@@ -37,8 +37,18 @@ export class ApprovalListComponent implements OnInit {
     })
   }
 
-  jumpToDetail(item){
-    this.router.navigate([`/employee_basic_info`],{queryParams:{hiringBasicInfoId:item.hiringBasicInfoId,approvalIdentity:item.approvalIdentity}})
+  jumpToDetail(item,type?:any){
+    if(type){
+      sessionStorage.setItem('viewApprovalInfo','1')
+    }else{
+      sessionStorage.setItem('viewApprovalInfo','0')
+    }
+    if(this.selectedId == 0 || type=='view'){
+      this.router.navigate([`/employee_basic_info`],{queryParams:{hiringBasicInfoId:item.hiringBasicInfoId,approvalIdentity:item.approvalIdentity}})
+    }else{
+      this.router.navigate([`/approval_result_list`],{queryParams:{hiringBasicInfoId:item.hiringBasicInfoId,approvalIdentity:item.approvalIdentity}})
+
+    }
   }
 
 }

src/app/my/approval-result-list/approval-result-list.component.html

+<p>
+  approval-result-list works!
+</p>

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

+import { async, ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ApprovalResultListComponent } from './approval-result-list.component';
+
+describe('ApprovalResultListComponent', () => {
+  let component: ApprovalResultListComponent;
+  let fixture: ComponentFixture<ApprovalResultListComponent>;
+
+  beforeEach(async(() => {
+    TestBed.configureTestingModule({
+      declarations: [ ApprovalResultListComponent ]
+    })
+    .compileComponents();
+  }));
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ApprovalResultListComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});

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

+import { Component, OnInit } from '@angular/core';
+import { MyService } from '../my.service'
+import { ActivatedRoute,Router } from "@angular/router";
+
+@Component({
+  selector: 'ydlife-approval-result-list',
+  templateUrl: './approval-result-list.component.html',
+  styleUrls: ['./approval-result-list.component.scss']
+})
+export class ApprovalResultListComponent implements OnInit {
+  approvalIdentity:any;
+  hiringBasicInfoId:any;
+  practitionerId:any;
+  recordsList:Array<any>;
+  constructor(private myService:MyService,private activatedRoute: ActivatedRoute) { }
+
+  ngOnInit() {
+    this.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
+    this.hiringBasicInfoId = this.activatedRoute.snapshot.queryParams.hiringBasicInfoId?this.activatedRoute.snapshot.queryParams.hiringBasicInfoId:null;
+    this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
+    this.PractitionerHiringApproveRecords();
+  }
+
+  PractitionerHiringApproveRecords(){
+    const param = {
+      practitionerId:this.practitionerId,
+      hiringBasicInfoId:this.hiringBasicInfoId,
+      approvalIdentity:this.approvalIdentity
+      
+    }
+    this.myService.detailQuery(param).subscribe((res)=>{
+      console.log(res)
+      if(res['success']){
+        this.recordsList = res['data']['hiringApproveRecordsList'];
+      }
+    })
+  }
+  
+}

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

@@ -12,7 +12,7 @@
         <span>姓名</span>
         <span>{{practitionerDeatil?.name}}</span>
       </div>
-      <div><span>手机号</span><span>{{practitionerDeatil?.name}}</span></div>
+      <div><span>手机号</span><span>{{practitionerDeatil?.mobileNo}}</span></div>
       <div><span>级别和职称</span><span>{{practitionerDeatil?.practitionerLevel}}-{{practitionerDeatil?.practitionerTitle}}</span></div>
       <div><span>分公司和体系</span><span>{{practitionerDeatil?.branch}}-{{practitionerDeatil?.system}}</span></div>
       <div><span>辅导人</span><span>{{practitionerDeatil?.mentor}}</span></div>
@@ -21,6 +21,7 @@
       <div><span>年龄</span><span>{{practitionerDeatil?.age}}</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?.idType}}</span></div>
       <div><span>登记证件号</span><span>{{practitionerDeatil?.idNo}}</span></div>
       <div><span>登记日期</span><span>{{practitionerDeatil?.effectiveStartDate}}</span></div>

src/app/my/my-routing.module.ts

@@ -43,6 +43,8 @@ import { BankCardComponent } from './application-process/bank-card/bank-card.com
 import { MemberDetailComponent } from './member-detail/member-detail.component';
 import { ApprovalListComponent } from './approval-list/approval-list.component';
 import { ApprovalCommentsComponent } from './approval-comments/approval-comments.component';
+import { ApprovalResultListComponent } from './approval-result-list/approval-result-list.component';
+
 
 const myRoutes: Routes = [
   { path: '', component: MyCenterHomeComponent, canActivate: [AuthGuard], data: [{ title: '银盾保险经纪 - 工作台' }] },
@@ -92,7 +94,8 @@ const myRoutes: Routes = [
   { path: 'employee_submit',component:EmployeeSubmitComponent,data: [{ title: '已提交' }]},
   { path: 'member_detail/:practitionerId',component:MemberDetailComponent, canActivate: [AuthGuard]},
   { path: 'approval_list',component:ApprovalListComponent, canActivate: [AuthGuard]},
-  { path: 'approval_comments',component:ApprovalCommentsComponent,canActivate:[AuthGuard]}
+  { path: 'approval_comments',component:ApprovalCommentsComponent,canActivate:[AuthGuard]},
+  { path: 'approval_result_list',component:ApprovalResultListComponent,canActivate:[AuthGuard]}
 ];
 
 @NgModule({

src/app/my/my.module.ts

@@ -53,9 +53,10 @@ import { SignaturePadModule } from 'angular2-signaturepad';
 import { MemberDetailComponent } from './member-detail/member-detail.component';
 import { ApprovalListComponent } from './approval-list/approval-list.component';
 import { ApprovalCommentsComponent } from './approval-comments/approval-comments.component';
+import { ApprovalResultListComponent } from './approval-result-list/approval-result-list.component';
 
 @NgModule({
-  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent, MedicalServiceComponent, InvitationComponent, RegisterComponent, EmployeeInfoComponent, EmployeeBasicInfoComponent, WorkExperienceComponent, PersonalPhotosComponent, EmployeeIdCardComponent, EmployeeEducationComponent, PersonalStatementComponent, SignatureComponent, EmployeeSubmitComponent, BankCardComponent, MemberDetailComponent, ApprovalListComponent, ApprovalCommentsComponent],
+  declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent, MedicalServiceComponent, InvitationComponent, RegisterComponent, EmployeeInfoComponent, EmployeeBasicInfoComponent, WorkExperienceComponent, PersonalPhotosComponent, EmployeeIdCardComponent, EmployeeEducationComponent, PersonalStatementComponent, SignatureComponent, EmployeeSubmitComponent, BankCardComponent, MemberDetailComponent, ApprovalListComponent, ApprovalCommentsComponent, ApprovalResultListComponent],
   imports: [
     CommonModule,
     LifeCommonModule,

src/app/my/my.service.ts

@@ -510,4 +510,18 @@ export class MyService {
     return this.http
       .post(url, JSON.stringify(param));
   }
+
+  //审批保存接口
+  hiringApprove(param){
+    const url = this.ydapi + '/practitionerHiring/hiringApprove';
+    return this.http
+      .post(url, JSON.stringify(param));
+  }
+
+  //ydLife审批资料详情
+  detailQuery(param){
+    const url = this.ydapi + '/practitionerHiring/detailQuery';
+    return this.http
+      .post(url, JSON.stringify(param));
+  }
 }