填写审批结果我知道了跳转&勾选曾经报聘后报聘单位必选

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

@@ -140,6 +140,15 @@ export class PersonalStatementComponent implements OnInit {
         })
         })
       }
       }
     }
     }
+    for(let m=0;m<this.dropOptionsInfoListParam.length;m++){
+      if(this.dropOptionsInfoList[m]['dropOptionCode'] == 'NO_REGISTER_SAME_TRADE' && this.dropOptionsInfoList[m]['status'] == '1'){
+        if(!this.everWork){
+          this.openPopInfo('勾选曾经报聘后，您曾经报聘过的保险机构名称不可为空！');
+          return;
+        }
+      }
+    }
+    
     const param = {
     const param = {
       hiringBasicInfoId:this.hiringBasicInfoId,
       hiringBasicInfoId:this.hiringBasicInfoId,
       personalStatementList:this.dropOptionsInfoListParam
       personalStatementList:this.dropOptionsInfoListParam

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

@@ -55,9 +55,6 @@ export class ApprovalCommentsComponent implements OnInit {
       if(res['success']){
       if(res['success']){
         this.openPopInfo('保存成功！');
         this.openPopInfo('保存成功！');
         sessionStorage.setItem('viewApprovalInfo','1')
         sessionStorage.setItem('viewApprovalInfo','1')
-        setTimeout(() => {
-          this.router.navigate(['/approval_result_list'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
-        }, 2000);
       }else{
       }else{
         this.openPopInfo(res['message']);
         this.openPopInfo(res['message']);
       }
       }
@@ -76,5 +73,11 @@ export class ApprovalCommentsComponent implements OnInit {
   // 关闭弹窗
   // 关闭弹窗
   getPopInfo() {
   getPopInfo() {
     this.isNeedAlert = false;
     this.isNeedAlert = false;
+    if(this.approvingStatus == 1){
+      this.router.navigate(['/approval_result_list'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
+    }else{
+      this.router.navigate(['/approval_list']);
+    }
+   
   }
   }
 }
 }