电子签名跳到下一页传hiringBasicInfoId,报聘职级S2时分公司必填

src/app/common/alert/alert.component.html

@@ -2,7 +2,7 @@
   <!--BEGIN dialog1-->
   <!--BEGIN dialog1-->
   <div class="js_dialog" id="iosDialog1">
   <div class="js_dialog" id="iosDialog1">
     <div class="weui-mask"></div>
     <div class="weui-mask"></div>
-    <div class="weui-dialog" style="width: 70%;">
+    <div class="weui-dialog" style="width: 70%;padding-bottom: 15px;">
       <div class="weui-dialog__hd" *ngIf="dialogInfo.title"><strong
       <div class="weui-dialog__hd" *ngIf="dialogInfo.title"><strong
           class="weui-dialog__title">{{dialogInfo.title}}</strong></div>
           class="weui-dialog__title">{{dialogInfo.title}}</strong></div>
       <div class="weui-dialog__bd" [ngStyle]="{'text-align':dialogInfo.content.align}">{{dialogInfo.content.value}}
       <div class="weui-dialog__bd" [ngStyle]="{'text-align':dialogInfo.content.align}">{{dialogInfo.content.value}}

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

@@ -75,7 +75,7 @@ export class SignatureComponent implements OnInit {
     this.myService.saveDigitalSignatures(param).subscribe((res)=>{
     this.myService.saveDigitalSignatures(param).subscribe((res)=>{
       if(res['success']){
       if(res['success']){
         this.queryWholeInfo(this.hiringBasicInfoId);
         this.queryWholeInfo(this.hiringBasicInfoId);
-        this.router.navigate(['/employee_submit']);
+        this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
       }else{
       }else{
         this.openPopInfo(res['message']);
         this.openPopInfo(res['message']);
       }
       }

src/app/my/recruiting-detail/recruiting-detail.component.ts

@@ -479,6 +479,10 @@ export class RecruitingDetailComponent implements OnInit {
         return;
         return;
       }
       }
     }else{
     }else{
+      if(!this.employQuery.branch || !this.employQuery.branchId){
+        this.openPopInfo('报聘职级为S2级别时，请您自己选择分公司！')
+        return;
+      }
       if(this.employQuery.mentorPractitionerId || this.employQuery.mentor){
       if(this.employQuery.mentorPractitionerId || this.employQuery.mentor){
         this.openPopInfo('S2级别不需要选择辅导人！')
         this.openPopInfo('S2级别不需要选择辅导人！')
         return;
         return;
@@ -535,6 +539,8 @@ export class RecruitingDetailComponent implements OnInit {
             this.employQuery.branchId  = 
             this.employQuery.branchId  = 
             this.employQuery.branch = null;
             this.employQuery.branch = null;
             this.defalutMentor = '/';
             this.defalutMentor = '/';
+          }else{
+            this.defalutMentor = '请选择辅导人';
           }
           }
         }else{
         }else{
           this.employQuery.mdDropOptionName = null;
           this.employQuery.mdDropOptionName = null;
@@ -617,10 +623,15 @@ export class RecruitingDetailComponent implements OnInit {
           this.defalutMentor = membership.mentor;
           this.defalutMentor = membership.mentor;
         }else{
         }else{
           if(this.approveStatus == null){
           if(this.approveStatus == null){
+            if(membership.mdDropOptionId != '30'){
               this.defalutMentor = '请选择辅导人';
               this.defalutMentor = '请选择辅导人';
             }else{
             }else{
               this.defalutMentor = '/';
               this.defalutMentor = '/';
             }
             }
+           
+          }else{
+            this.defalutMentor = '/';
+          }
         }
         }
         if(membership.introducer){
         if(membership.introducer){
           this.defalutIntroducer = membership.introducer;
           this.defalutIntroducer = membership.introducer;

src/styles.scss

@@ -70,11 +70,12 @@ input::placeholder {
 }
 }
 
 
 .weui-dialog__btn{
 .weui-dialog__btn{
-  background: red;
+  background: #C81B1E;
   color: #fff;
   color: #fff;
   border-radius: 10px;
   border-radius: 10px;
   padding: 5px 12px;
   padding: 5px 12px;
   font-weight: normal;
   font-weight: normal;
+  padding-bottom: 10px;
 }
 }
 
 
 .borderBottom:after, .borderTop:after {
 .borderBottom:after, .borderTop:after {