拒绝后可编辑

6655c1ca · sunchao · 1b0c9fd3 · 6655c1ca · 6655c1ca · 6655c1ca
Commit 6655c1ca authored Feb 04, 2021 by sunchao
25 changed files
--- a/src/app/my/application-process/bank-card/bank-card.component.html
+++ b/src/app/my/application-process/bank-card/bank-card.component.html
@@ -7,25 +7,25 @@
    <div class="contentDetail employ">
      <div class="contentItem">
        <input class="form-control" name="" id="" placeholder="开户行具体到支行" [(ngModel)]="bankAccountOpening"
-        (blur)="bs()" [disabled]="approvalIdentity || approveStatus!=null" />
+        (blur)="bs()" [disabled]="approveStatus!=null && approveStatus!='-1'" />
      </div>
      <div class="contentItem">
        <input class="form-control" placeholder="银行卡号：例如 6301234345354356" [(ngModel)]="bankAccountId"
        (blur)="bs(2)" onkeyup="this.value=this.value.replace(/\D/g,'')" maxlength="19"
-        [disabled]="approvalIdentity || approveStatus!=null"/>
+        [disabled]="approveStatus!=null && approveStatus!='-1'" />
      </div>
-      <div class="contentItem"  *ngIf="!approvalIdentity">
+      <div class="contentItem"  *ngIf="approveStatus==null || approveStatus=='-1'">
        <input class="form-control" name="" id="" style="text-align: left;padding: 6px 0;" placeholder="再次输入银行卡号以确认"
        [(ngModel)]="sureBankAccountId" (blur)="bs(3)" onkeyup="this.value=this.value.replace(/\D/g,'')" 
-        [disabled]="approveStatus!=null" maxlength="19"/>
+        [disabled]="approveStatus!=null && approveStatus!='-1'" maxlength="19"/>
      </div>
    </div>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/bank-card/bank-card.component.ts
+++ b/src/app/my/application-process/bank-card/bank-card.component.ts
@@ -17,7 +17,6 @@ export class BankCardComponent implements OnInit {
  sureBankAccountId:string;
  isNeedAlert: boolean;
  dialogInfo: any;
-  approvalIdentity:any;
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
@@ -27,7 +26,6 @@ export class BankCardComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.queryWholeInfo(this.hiringBasicInfoId)
  }
@@ -104,7 +102,7 @@ export class BankCardComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/employee_salary'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/employee_salary'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }

--- a/src/app/my/application-process/employee-basic-info/employee-basic-info.component.html
+++ b/src/app/my/application-process/employee-basic-info/employee-basic-info.component.html
@@ -8,12 +8,12 @@
      <div class="contentItem">
        <span>姓名</span>
        <input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.name" (blur)="bs(2)"
-        [disabled]="approvalIdentity || approveStatus!=null">
+        [disabled]="approveStatus!=null && approveStatus!='-1'">
      </div>
      <div class="contentItem">
        <span>证件类型</span>
        <select class="form-control" (ngModelChange)="idTypeChange($event);bs(null)" [ngModel]="editEmployBasicInfo.idTypeId"
-        [disabled]="approvalIdentity || approveStatus!=null">
+        [disabled]="approveStatus!=null && approveStatus!='-1'">
          <option value=null>请选择</option>
          <option [value]="idType.id" *ngFor="let idType of this.idTypesList">
            {{idType.name}}
@@ -23,7 +23,7 @@
      <div class="contentItem">
        <span>证件号</span>
        <input type="text" class="form-control" (blur)="bs(1)" [(ngModel)]="editEmployBasicInfo.idNo"
-        [disabled]="approvalIdentity || approveStatus!=null">
+        [disabled]="approveStatus!=null && approveStatus!='-1'">
      </div>
          <List [className]="'date-picker-list'">
            <ListItem
@@ -35,7 +35,7 @@
              [maxDate] = "maxDate"
              [(ngModel)]="showPractitionerBirthdate"
              (onOk)="onOk($event)"
-              [disabled]="editEmployBasicInfo.idTypeId==1 || approvalIdentity || approveStatus!=null"
+              [disabled]="editEmployBasicInfo.idTypeId==1 || (approveStatus!=null && approveStatus!='-1')"
            >
            出生日期
            </ListItem>
@@ -43,8 +43,8 @@
      <div class="contentItem">
        <span>性别</span>
-        <select class="form-control" [(ngModel)]="editEmployBasicInfo.gender" [disabled]="editEmployBasicInfo.idTypeId==1" (blur)="bs(null)"
+        <select class="form-control" [(ngModel)]="editEmployBasicInfo.gender" 
-        [disabled]="approvalIdentity || approveStatus!=null">
+        [disabled]="editEmployBasicInfo.idTypeId==1 || (approveStatus!=null && approveStatus!='-1')" (blur)="bs(null)">
          <option value=null>请选择</option>
          <option value='1'>男</option>
          <option value="2">女</option>
@@ -68,20 +68,20 @@
        <span>居住地址</span>
        <div>
          <input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.residentAddress" (blur)="bs(3)"
-          [disabled]="approvalIdentity || approveStatus!=null">
+          [disabled]="approveStatus!=null && approveStatus!='-1'">
        </div>
      </div>
      <div class="contentItem">
        <span>E-mail</span>
          <div><input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.email" (blur)="bs(4)"
-            [disabled]="approvalIdentity || approveStatus!=null"></div>
+            [disabled]="approveStatus!=null && approveStatus!='-1'"></div>
      </div>
    </div>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/employee-basic-info/employee-basic-info.component.ts
+++ b/src/app/my/application-process/employee-basic-info/employee-basic-info.component.ts
@@ -21,7 +21,6 @@ export class EmployeeBasicInfoComponent implements OnInit {
  provinces:Array<any>;
  minDate:any = new Date('1900-01-01');
  maxDate:any = new Date();
-  approvalIdentity:any;
  //通过0，拒绝-1，已填完-2
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
@@ -32,7 +31,6 @@ export class EmployeeBasicInfoComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.editEmployBasicInfo.mobileNo = this.activatedRoute.snapshot.queryParams.mobileNo?this.activatedRoute.snapshot.queryParams.mobileNo:null;
    this.erpInitialize();
    this.provCityQry();
@@ -206,9 +204,11 @@ export class EmployeeBasicInfoComponent implements OnInit {
  //   选择地址信息
  selectedArea(type) {
    // this.sendRemoveScrollContent.emit(1);
-    if (type === 1 && !this.approvalIdentity && this.approveStatus==null) {
+    if (type === 1) {
-      // 户籍地址 
+      if(this.approveStatus==null || this.approveStatus=='-1'){
-      this.houseFlag = true;
+        // 户籍地址 
+        this.houseFlag = true;
+      }
    }
  }
@@ -244,6 +244,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
        }
        this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
        this.showPractitionerBirthdate=  new Date(res['data']['hiringBasicInfo']['practitionerBirthdate']);
+        // alert(new Date(673887600000))
        this.editEmployBasicInfo.practitionerBirthdate = this.currentDateFormat(this.showPractitionerBirthdate, 'yyyy-mm-dd')
        if(this.editEmployBasicInfo.cityId || this.editEmployBasicInfo.cityName || this.editEmployBasicInfo.provinceId || this.editEmployBasicInfo.provinceName){
          this.addressInfo = {
@@ -262,6 +263,8 @@ export class EmployeeBasicInfoComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/work_experience'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/work_experience'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }
 }
--- a/src/app/my/application-process/employee-education/employee-education.component.html
+++ b/src/app/my/application-process/employee-education/employee-education.component.html
@@ -8,7 +8,7 @@
      <div class="contentItem">
        <span>最高学历：如本科、专科、硕士</span>
        <select class="form-control" name="" id="" [(ngModel)]="lastGraduateCode" (ngModelChange)="selectEducationLevel($event)"
-        [disabled]="approvalIdentity || approveStatus!=null">
+        [disabled]="approveStatus!=null && approveStatus!='-1'">
          <option value=null>请选择</option>
          <option [value]="educationLevel.id" *ngFor="let educationLevel of educationLevelList">
            {{educationLevel.name}}
@@ -17,7 +17,7 @@
      </div>
      <div class="contentItem">
        <span>毕业学校</span>
-        <input class="form-control" [(ngModel)]="lastGraduateSchool" [disabled]="approvalIdentity || approveStatus!=null"/>
+        <input class="form-control" [(ngModel)]="lastGraduateSchool" [disabled]="approveStatus!=null && approveStatus!='-1'" />
      </div>
      <div class="contentItem" style="border:none;">
        <span>毕业证</span>
@@ -33,10 +33,10 @@
      <p>（jpg,png 文件大小不大于1mb）</p>
    </div>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/employee-education/employee-education.component.ts
+++ b/src/app/my/application-process/employee-education/employee-education.component.ts
@@ -20,7 +20,6 @@ export class EmployeeEducationComponent implements OnInit {
  toastInfo: any;
  isNeedAlert: boolean;
  dialogInfo: any;
-  approvalIdentity:any;
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
@@ -32,7 +31,6 @@ export class EmployeeEducationComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.educationLevelQuery();
    this.queryWholeInfo(this.hiringBasicInfoId)
  }
@@ -93,7 +91,7 @@ export class EmployeeEducationComponent implements OnInit {
  }
  selectPic(){
-    if(!this.approvalIdentity && this.approveStatus==null){
+    if(this.approveStatus==null || this.approveStatus=='-1'){
      if(this.lifeCommonService.isWeiXin()){
        // 5.1 拍照、本地选图
        const t = this;
@@ -162,7 +160,7 @@ export class EmployeeEducationComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/bank_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/bank_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }
  goBack(){

--- a/src/app/my/application-process/employee-id-card/employee-id-card.component.html
+++ b/src/app/my/application-process/employee-id-card/employee-id-card.component.html
@@ -37,10 +37,10 @@
    </div>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/employee-id-card/employee-id-card.component.ts
+++ b/src/app/my/application-process/employee-id-card/employee-id-card.component.ts
@@ -21,7 +21,6 @@ export class EmployeeIdCardComponent implements OnInit {
  toastInfo: any;
  isNeedAlert: boolean;
  dialogInfo: any;
-  approvalIdentity:any;
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
@@ -33,7 +32,6 @@ export class EmployeeIdCardComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.queryWholeInfo(this.hiringBasicInfoId)
    // setTimeout(() => {
    //   this.exampleWidth = this.elementView.nativeElement.offsetWidth;
@@ -72,7 +70,7 @@ export class EmployeeIdCardComponent implements OnInit {
  }
  selectPic(type){
-    if(!this.approvalIdentity && this.approveStatus==null){
+    if(this.approveStatus==null || this.approveStatus == '-1'){
      if(this.lifeCommonService.isWeiXin()){
        // 5.1 拍照、本地选图
        const t = this;
@@ -150,7 +148,7 @@ export class EmployeeIdCardComponent implements OnInit {
    }
    viewNext(){
-      this.router.navigate(['/employee_education'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+      this.router.navigate(['/employee_education'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
    }
    goBack(){

--- a/src/app/my/application-process/employee-info/employee-info.component.html
+++ b/src/app/my/application-process/employee-info/employee-info.component.html
@@ -30,10 +30,10 @@
      </div>
    </div>
  </div>
-  <footer class="fixed" (click)="next()">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    确认并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/employee-info/employee-info.component.ts
+++ b/src/app/my/application-process/employee-info/employee-info.component.ts
@@ -11,7 +11,7 @@ export class EmployeeInfoComponent implements OnInit {
  hiringBasicInfoId:any;
  membership:any;
  mobileNo:string;
-  approvalIdentity:any;
+  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
    public myService:MyService) { }
@@ -19,7 +19,6 @@ export class EmployeeInfoComponent implements OnInit {
  ngOnInit() {
    const title = this.activatedRoute.snapshot.data[0]['title'];
    this.lifeCommonService.setTitle(title);
-    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.mobileNo = this.activatedRoute.snapshot.queryParams.mobileNo?this.activatedRoute.snapshot.queryParams.mobileNo:null;
    this.queryWholeInfo(this.hiringBasicInfoId)
@@ -32,6 +31,7 @@ export class EmployeeInfoComponent implements OnInit {
  queryWholeInfo(hiringBasicInfoId){
    this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{
      this.membership = res['data']['hiringMemberShip'];
+      this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
    })
  }
@@ -40,6 +40,6 @@ export class EmployeeInfoComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/employee_basic_info'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/employee_basic_info'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }
 }
--- a/src/app/my/application-process/employee-salary/employee-salary.component.html
+++ b/src/app/my/application-process/employee-salary/employee-salary.component.html
@@ -16,10 +16,10 @@
      <li>如果报聘职阶为S2（业务合伙人）在最近三年内，至少一年同业收入达100万；</li>
    </ul>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/employee-salary/employee-salary.component.ts
+++ b/src/app/my/application-process/employee-salary/employee-salary.component.ts
@@ -17,7 +17,6 @@ export class EmployeeSalaryComponent implements OnInit {
  toastInfo: any;
  isNeedAlert: boolean;
  dialogInfo: any;
-  approvalIdentity:any;
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
@@ -27,12 +26,11 @@ export class EmployeeSalaryComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.queryWholeInfo(this.hiringBasicInfoId)
  }
  selectPic(){
-    if(!this.approvalIdentity && this.approveStatus==null){
+    if(this.approveStatus==null || this.approveStatus=='-1'){
      if(this.lifeCommonService.isWeiXin()){
        // 5.1 拍照、本地选图
        const t = this;
@@ -119,7 +117,7 @@ export class EmployeeSalaryComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/personal_statement'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/personal_statement'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }
  goBack(){

--- a/src/app/my/application-process/employee-submit/employee-submit.component.html
+++ b/src/app/my/application-process/employee-submit/employee-submit.component.html
@@ -6,3 +6,4 @@
  <p>请注意查看！</p>
  <img src="assets/images/login_logo.png" alt="logo" style="width: 50%;position: absolute;left: 0;right: 0;margin: 0 auto;bottom: 20px;">
 </div>
+<ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert>
--- a/src/app/my/application-process/employee-submit/employee-submit.component.ts
+++ b/src/app/my/application-process/employee-submit/employee-submit.component.ts
 import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute,Router } from "@angular/router";
 import { LifeCommonService } from "../../../common/life-common.service";
+import { MyService } from '../../my.service';
 @Component({
  selector: 'ydlife-employee-submit',
  templateUrl: './employee-submit.component.html',
  styleUrls: ['./employee-submit.component.scss']
 })
 export class EmployeeSubmitComponent implements OnInit {
+  hiringBasicInfoId:any;
+  approveStatus:any;
+  isNeedAlert: boolean;
+  dialogInfo: any;
  constructor(private activatedRoute: ActivatedRoute,
-    public lifeCommonService:LifeCommonService) { }
+    public lifeCommonService:LifeCommonService,
+    private myService:MyService) { }
  ngOnInit() {
+    sessionStorage.removeItem('viewApprovalInfo')
    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.approveStatus = this.activatedRoute.snapshot.queryParams.status?this.activatedRoute.snapshot.queryParams.status:null;
+    if(this.approveStatus == null || this.approveStatus == '-1'){
+      this.hiringSubmit();
+    }
+  }
+  hiringSubmit(){
+    this.myService.hiringSubmit({hiringBasicInfoId:this.hiringBasicInfoId}).subscribe((res)=>{
+      if(res['success']){
+      }else{
+        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;
  }
 }
--- a/src/app/my/application-process/personal-photos/personal-photos.component.html
+++ b/src/app/my/application-process/personal-photos/personal-photos.component.html
@@ -14,10 +14,10 @@
      <p>（请勿使用生活照，大小小于1mb）</p>
    </div>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/personal-photos/personal-photos.component.ts
+++ b/src/app/my/application-process/personal-photos/personal-photos.component.ts
@@ -16,7 +16,6 @@ export class PersonalPhotosComponent implements OnInit {
  toastInfo: any;
  isNeedAlert: boolean;
  dialogInfo: any;
-  approvalIdentity:any;
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
@@ -26,12 +25,11 @@ export class PersonalPhotosComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.queryWholeInfo(this.hiringBasicInfoId)
  }
  selectPic(){
-    if(!this.approvalIdentity && this.approveStatus==null){
+    if(this.approveStatus==null || this.approveStatus=='-1'){
      if(this.lifeCommonService.isWeiXin()){
        // 5.1 拍照、本地选图
        const t = this;
@@ -122,7 +120,7 @@ export class PersonalPhotosComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/employee_id_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/employee_id_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }
  goBack(){

--- a/src/app/my/application-process/personal-statement/personal-statement.component.html
+++ b/src/app/my/application-process/personal-statement/personal-statement.component.html
@@ -14,10 +14,10 @@
    </ul>
    <textarea placeholder="请输入您曾经报聘过的保险机构名称" #autofocusFlag [(ngModel)]="everWork" *ngIf="everWorkFlag" class="form-control" cols="10" rows="5"></textarea>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>
@@ -34,17 +34,17 @@
      [ngClass]="{'selected':contractItem.confirmStatus}">
        <span>{{contractItem.termName}}</span>
        <span>
-          <span style="margin-right: 5px;" *ngIf="contractItem.confirmStatus && approvalIdentity">已阅读</span>
+          <span style="margin-right: 5px;" *ngIf="contractItem.confirmStatus">已阅读</span>
          <i class="iconfont icon-gougou" *ngIf="contractItem.confirmStatus"></i>
        </span>  
      </li>
    </ul>
  </div>
  <footer class="fixed" (click)="next()" [ngClass]="{default:isAllAgree == false}"
-  *ngIf="!approvalIdentity">
+  *ngIf="approveStatus==null || approveStatus=='-1'">
    我已全部阅读且同意，下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>
@@ -54,7 +54,6 @@
 </div>
 <!-- <div id="toastContent" *ngIf="isShow" #contract (scroll)="onScroll($event)"> -->
 <div id="toastContent" *ngIf="isShow" #contract >
  <div class="title">
    {{curTitle}}
  </div>

--- a/src/app/my/application-process/personal-statement/personal-statement.component.ts
+++ b/src/app/my/application-process/personal-statement/personal-statement.component.ts
@@ -30,7 +30,6 @@ export class PersonalStatementComponent implements OnInit {
  curContractId:number;
  isAllAgree:boolean = false;
  contractTermsConfirmsListParm:Array<any>;
-  approvalIdentity:any;
  approveStatus:any;
  agreeBtnShow:boolean = false;
  timeCount:number = 5;
@@ -44,7 +43,6 @@ export class PersonalStatementComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    if(this.type=="personal_statement"){
      this.dropOptionsQuery();
    }
@@ -99,7 +97,7 @@ export class PersonalStatementComponent implements OnInit {
  //选择个人声明
  selectStatements(personalStatements){
-    if(!this.approvalIdentity && this.approveStatus==null){
+    if(this.approveStatus==null || this.approveStatus == '-1'){
      if( personalStatements.status ==1){
        personalStatements.status = 0;
      }else{
@@ -175,7 +173,7 @@ export class PersonalStatementComponent implements OnInit {
  }
  readContract(contractItem){
-    if(!this.approvalIdentity && this.approveStatus==null){
+    if(this.approveStatus==null || this.approveStatus == '-1'){
      this.agreeBtnShow = false;
      if( contractItem.confirmStatus ==1){
        contractItem.confirmStatus = 0;
@@ -286,10 +284,10 @@ export class PersonalStatementComponent implements OnInit {
  viewNext(){
    if(this.type == 'personal_statement'){
-      this.router.navigate(['/contract'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+      this.router.navigate(['/contract'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
    }
    if(this.type == 'contract'){
-      this.router.navigate(['/signature'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+      this.router.navigate(['/signature'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
    }
  }

--- a/src/app/my/application-process/signature/signature.component.html
+++ b/src/app/my/application-process/signature/signature.component.html
@@ -11,18 +11,18 @@
    </signature-pad>
    <img [src]="imgStr" alt="签名" *ngIf="isSignatureShow">
  </div>
-  <div class="signature_action" *ngIf="!approvalIdentity && approveStatus == null">
+  <div class="signature_action" *ngIf="approveStatus == null || approveStatus == '-1'">
    <img src="assets/images/clear.png" alt="清除" (click)="clearSignature();"/>
    <img src="assets/images/revoke.png" *ngIf="!isSignatureShow" alt="上一步" (click)="revokeSignature()"/>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    我自愿签订经纪人合同书
  </footer>
-  <div id="page" *ngIf="approvalIdentity && viewApprovalInfo==0">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>
-  <footer class="fixed" *ngIf="approvalIdentity && viewApprovalInfo!=0" (click)="returnResult()">
+  <footer class="fixed" *ngIf="viewApprovalInfo==1" (click)="returnResult()">
    返回审批结果
  </footer>
 </div>

--- a/src/app/my/application-process/signature/signature.component.ts
+++ b/src/app/my/application-process/signature/signature.component.ts
@@ -18,7 +18,6 @@ export class SignatureComponent implements OnInit {
  isNeedAlert: boolean;
  dialogInfo: any;
  isSignatureShow:boolean;
-  approvalIdentity:any;
  viewApprovalInfo:any;
  approveStatus:any;
  @ViewChild(SignaturePad) signaturePad : SignaturePad;
@@ -31,7 +30,6 @@ export class SignatureComponent implements OnInit {
    }
  ngOnInit() {
-    this.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.signaturePadOptions = {
      minWidth: 0.5,
      maxWidth: 3,
@@ -53,7 +51,7 @@ export class SignatureComponent implements OnInit {
    if(this.isSignatureShow == false){
      this.saveDigitalSignatures();
    }else{
-      this.router.navigate(['/employee_submit']);
+      this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
    }
  }
@@ -130,14 +128,16 @@ export class SignatureComponent implements OnInit {
      this.isSignatureShow = false;
      this.signaturePad.clear();
    }else{
-      if(!this.approvalIdentity){
+      this.signaturePad.clear();
-        this.signaturePad.clear();
-      }
    }
  }
  viewNext(){
-    this.router.navigate(['/approval_comments'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    if(this.viewApprovalInfo==0){
+      this.router.navigate(['/approval_comments'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
+    }else{
+      this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
+    }
  }
  goBack(){
@@ -145,7 +145,7 @@ export class SignatureComponent implements OnInit {
  }
  returnResult(){
-    this.router.navigate([`/approval_result_list`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:true}})
+    this.router.navigate([`/approval_result_list`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId}})
  }
 }
--- a/src/app/my/application-process/work-experience/work-experience.component.html
+++ b/src/app/my/application-process/work-experience/work-experience.component.html
@@ -3,15 +3,15 @@
    <div><span class="line"></span>工作经历</div>
    <span class="page_mark"> 2/8</span>
  </div>
-  <div class="content" *ngIf="!approvalIdentity || approveStatus==null">
+  <div class="content" *ngIf="approveStatus==null || approveStatus=='-1'">
    <div class="contentDetail employ">
      <div class="contentItem">
        <span>工作单位</span>
-        <input type="text" class="form-control" [(ngModel)]="addExperience.workingCompany"/>
+        <input type="text" class="form-control" [(ngModel)]="addExperience.workingCompany" [disabled]="approveStatus!=null && approveStatus!='-1'"/>
      </div>
      <div class="contentItem">
        <span>职位</span>
-        <input type="text" class="form-control" [(ngModel)]="addExperience.position"/>
+        <input type="text" class="form-control" [(ngModel)]="addExperience.position" [disabled]="approveStatus!=null && approveStatus!='-1'"/>
      </div>
      <List [className]="'date-picker-list'">
        <ListItem
@@ -22,6 +22,8 @@
          [minDate] ="minDate"
          [(ngModel)]="showworkingStart"
          (onOk)="onOk($event,'start')"
+          (onDismiss) = "onDismiss($event,'start')"
+          [disabled]="approveStatus!=null && approveStatus!='-1'"
        >
        任职起始时间
        </ListItem>
@@ -32,9 +34,10 @@
          [extra]="currentDateFormat(showworkingEnd, 'yyyy-mm-dd')"
          [arrow]="'horizontal'"
          [mode]="'date'"
-          [minDate] ="showworkingStart"
          [(ngModel)]="showworkingEnd"
          (onOk)="onOk($event,'end')"
+          (onDismiss) = "onDismiss($event,'end')"
+          [disabled]="approveStatus!=null && approveStatus!='-1'"
        >
        任职结束时间
        </ListItem>
@@ -42,7 +45,7 @@
    </div>
  </div>
-  <div class="add_wrapper" *ngIf="!approvalIdentity || approveStatus==null">
+  <div class="add_wrapper" *ngIf="approveStatus==null || approveStatus=='-1'">
    <i class="iconfont icon-jiahao" (click)="addExperienceList()"></i>
    <span>确认并添加</span>
  </div>
@@ -68,10 +71,10 @@
      </li>
    </ul>
  </div>
-  <footer class="fixed" (click)="next()" *ngIf="!approvalIdentity">
+  <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
    保存并下一步
  </footer>
-  <div id="page" *ngIf="approvalIdentity">
+  <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
    <div (click)="goBack()">上一页</div>
    <div (click)="viewNext()">下一页</div>
  </div>

--- a/src/app/my/application-process/work-experience/work-experience.component.ts
+++ b/src/app/my/application-process/work-experience/work-experience.component.ts
@@ -23,7 +23,6 @@ export class WorkExperienceComponent implements OnInit {
  toastInfo: any;
  isNeedAlert: boolean;
  dialogInfo: any;
-  approvalIdentity:any;
  approveStatus:any;
  constructor(private activatedRoute: ActivatedRoute,
    private router: Router,public lifeCommonService:LifeCommonService,
@@ -35,7 +34,6 @@ export class WorkExperienceComponent implements OnInit {
    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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
    this.addExperience = new ExperienceQuery(null, null, null,null);
    this.queryWholeInfo(this.hiringBasicInfoId)
  }
@@ -43,7 +41,7 @@ export class WorkExperienceComponent implements OnInit {
  next(){
    if(this.addExperience.workingCompany || this.addExperience.position || this.addExperience.workingStart || this.addExperience.workingEnd){
      this.experienceList.push(this.addExperience)
-      this.showworkingStart=null;
+      this.showworkingStart = null;
      this.showworkingEnd = null;
      this.addExperience = new ExperienceQuery(null, null, null,null);
    }
@@ -71,7 +69,7 @@ export class WorkExperienceComponent implements OnInit {
    //先push进去list在清空
    if(this.addExperience.workingCompany || this.addExperience.position || this.addExperience.workingStart || this.addExperience.workingEnd){
      this.experienceList.push(this.addExperience)
-      this.showworkingStart=null;
+      this.showworkingStart = null;
      this.showworkingEnd = null;
      this.addExperience = new ExperienceQuery(null, null, null,null);
    }
@@ -97,11 +95,18 @@ export class WorkExperienceComponent implements OnInit {
      this.showworkingStart = result;
    }
    if(type=='end'){
-      alert(result)
      this.addExperience.workingEnd = this.currentDateFormat(result, 'yyyy-mm-dd');
      this.showworkingEnd =result;
-      alert(this.addExperience.workingEnd)
+    }
-      alert(this.showworkingEnd)
+  }
+  onDismiss(result:Date,type){
+    if(type=="start"){
+      this.showworkingStart = null;
+    }
+    if(type=="end"){
+      this.showworkingEnd = null;
    }
  }
@@ -139,7 +144,7 @@ export class WorkExperienceComponent implements OnInit {
  }
  viewNext(){
-    this.router.navigate(['/personal_photos'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    this.router.navigate(['/personal_photos'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
  }
  goBack(){

--- a/src/app/my/approval-result-list/approval-result-list.component.ts
+++ b/src/app/my/approval-result-list/approval-result-list.component.ts
@@ -57,7 +57,7 @@ export class ApprovalResultListComponent implements OnInit {
  }
  jumpToDetail(){
-    this.router.navigate([`/employee_info`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity}})
+    this.router.navigate([`/employee_info`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId}})
  }
  getDefaultHeadImg(str){
    if(!str){

--- a/src/app/my/my.service.ts
+++ b/src/app/my/my.service.ts
@@ -563,4 +563,10 @@ export class MyService {
      .post(url, JSON.stringify(organizationInfo));
    }
+    //最后一步保存
+    hiringSubmit(param){
+      const url = this.ydapi + '/practitionerHiring/hiringSubmit';
+      return this.http
+        .post(url, JSON.stringify(param));
+      }
 }
--- a/src/app/my/recruiting-detail/recruiting-detail.component.ts
+++ b/src/app/my/recruiting-detail/recruiting-detail.component.ts
@@ -95,9 +95,6 @@ export class RecruitingDetailComponent implements OnInit {
    }
    //获取基本信息
    this.recruitListQuery();
-    if(this.hiringBasicInfoId){
-      this.queryWholeInfo();
-    }
@@ -106,7 +103,7 @@ export class RecruitingDetailComponent implements OnInit {
  selectTab(id) {
    if (this.clickFlag == true) {
      if(id === 4){
-        if(this.approveStatus == -2 || this.approveStatus == 0){
+        if(this.approveStatus != null && this.approveStatus != '-1'){
          this.openPopInfo(`${this.employQuery.name}已经提交所有报聘信息，不用重复邀请！`)
          return;
        }
@@ -428,6 +425,10 @@ export class RecruitingDetailComponent implements OnInit {
            }
          }
        }
+        if(this.hiringBasicInfoId){
+          this.queryWholeInfo();
+        }
      }
    })
  }
@@ -486,7 +487,7 @@ export class RecruitingDetailComponent implements OnInit {
    this.employQuery = {
      ...this.employQuery,
-      hiringBasicInfoId:this.approveStatus=='-1'?null:this.hiringBasicInfoId,
+      hiringBasicInfoId:this.hiringBasicInfoId?this.hiringBasicInfoId:null,
      loginId: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']
    }
    this.myService.saveMembership(this.employQuery).subscribe((res)=>{