合同同意bug修复

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

@@ -95,7 +95,7 @@
     position: fixed;
     position: fixed;
     bottom: 0;
     bottom: 0;
     width: 100%;
     width: 100%;
-    height: 80%;
+    height: 70%;
     left: 0;
     left: 0;
     right: 0;
     right: 0;
     margin: 0 auto;
     margin: 0 auto;

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

@@ -170,6 +170,7 @@ export class PersonalStatementComponent implements OnInit {
 
 
   readContract(contractItem){
   readContract(contractItem){
     if(!this.approvalIdentity && this.approveStatus==null){
     if(!this.approvalIdentity && this.approveStatus==null){
+      this.agreeBtnShow = false;
       if( contractItem.confirmStatus ==1){
       if( contractItem.confirmStatus ==1){
         contractItem.confirmStatus = 0;
         contractItem.confirmStatus = 0;
       }else{
       }else{
@@ -187,7 +188,7 @@ export class PersonalStatementComponent implements OnInit {
 
 
   //同意合同条款
   //同意合同条款
   agree() {
   agree() {
-    this.agreeBtnShow = false;
+    if(this.agreeBtnShow == true){
       this.isShow = false;
       this.isShow = false;
       for(let i=0;i<this.contractTermsList.length;i++){
       for(let i=0;i<this.contractTermsList.length;i++){
         if(this.curContractId == this.contractTermsList[i]['id']){
         if(this.curContractId == this.contractTermsList[i]['id']){
@@ -199,6 +200,8 @@ export class PersonalStatementComponent implements OnInit {
       })
       })
     }
     }
    
    
+  }
+
   saveContractTermsConfirms(){
   saveContractTermsConfirms(){
     this.contractTermsConfirmsListParm = [];
     this.contractTermsConfirmsListParm = [];
     for(let i=0;i<this.contractTermsList.length;i++){
     for(let i=0;i<this.contractTermsList.length;i++){

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

@@ -51,11 +51,10 @@ export class ApprovalCommentsComponent implements OnInit {
     this.myService.hiringApprove(param).subscribe((res)=>{
     this.myService.hiringApprove(param).subscribe((res)=>{
       this.openPopInfo(res['message']);
       this.openPopInfo(res['message']);
       setTimeout(() => {
       setTimeout(() => {
-        
+        this.router.navigate(['/approval_result_list'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
       }, 3000);
       }, 3000);
     })
     })
   }
   }
-
    // 打开弹窗
    // 打开弹窗
    openPopInfo(message) {
    openPopInfo(message) {
     this.isNeedAlert = true;
     this.isNeedAlert = true;

src/styles.scss

@@ -210,7 +210,7 @@ footer.fixed{
 }
 }
 
 
 .contract h1,.contract h2{
 .contract h1,.contract h2{
-  font-size: 14px;
+  font-size: 15px;
   font-weight: normal;
   font-weight: normal;
 }
 }
 @keyframes slowUp {
 @keyframes slowUp {