样式调整

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

@@ -8,19 +8,14 @@
     <textarea class="form-control" cols="30" rows="10" [(ngModel)]="rejectNote" placeholder="请填写备注，字数限制为100字" maxlength="100"></textarea>
     <textarea class="form-control" cols="30" rows="10" [(ngModel)]="rejectNote" placeholder="请填写备注，字数限制为100字" maxlength="100"></textarea>
   </div>
   </div>
   <div id="page" style="border-top: 1px #e1e1e1 solid;">
   <div id="page" style="border-top: 1px #e1e1e1 solid;">
-    <div style="background-color: #fff;color: #333;" (click)="showAlert(0)">回退</div>
+    <div style="background-color: #fff;color: #333;" (click)="showAlert(0)">退回</div>
     <div style="background-color: #1b5b99;" (click)="showAlert(1)">通过</div>
     <div style="background-color: #1b5b99;" (click)="showAlert(1)">通过</div>
   </div>
   </div>
   <div *ngIf="backToFlag" class="dialogContainer">
   <div *ngIf="backToFlag" class="dialogContainer">
     <div>
     <div>
       <label for="">请选择退回到哪一环节</label>
       <label for="">请选择退回到哪一环节</label>
       <select class="form-control" [(ngModel)]="stepsSeqBackTo">
       <select class="form-control" [(ngModel)]="stepsSeqBackTo">
-        <option value='null'>报聘人</option>
-        <option value='-2'>辅导人</option>
-        <option value='1'>体系负责人</option>
-        <option value='2'>公司运营主管</option>
-        <option value='3'>寿险总经理</option>
-        <option value='4'>公司总经理</option>
+        <option *ngFor="let item of approvalOptionLists" [value]="item.value" [disabled]="item.disabled">{{item.name}}</option>
       </select>
       </select>
       <div class="confirm">
       <div class="confirm">
         <button class="btn cancel" (click)="backToFlag=false">取消</button>
         <button class="btn cancel" (click)="backToFlag=false">取消</button>

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

@@ -16,6 +16,9 @@
     position: fixed;
     position: fixed;
     bottom: 0;
     bottom: 0;
     left: 0;
     left: 0;
+    bottom: 0;
+    right: 0;
+    margin: 0 auto;
     width: 100%;
     width: 100%;
     height: 100%;
     height: 100%;
     background: rgba(0,0,0,.5);
     background: rgba(0,0,0,.5);
@@ -35,5 +38,6 @@
                 flex: 1;
                 flex: 1;
             }
             }
         }
         }
+    option[disabled]{background-color: #f0f0f0;}
     }
     }
 }
 }
\ No newline at end of file

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

@@ -17,10 +17,18 @@ export class ApprovalCommentsComponent implements OnInit {
   isNeedAlert: boolean;
   isNeedAlert: boolean;
   dialogInfo: any;
   dialogInfo: any;
     //控制弹框
     //控制弹框
-    toastDialog: boolean;
-    toastInfo: any;
-    stepsSeqBackTo:string = 'null';
-    backToFlag:boolean = false;
+  toastDialog: boolean;
+  toastInfo: any;
+  stepsSeqBackTo:string = 'null';
+  backToFlag:boolean = false;
+  approvalOptionLists = [
+    {id:0,value:'null',name:'报聘人',disabled:false},
+    {id:1,value:'-2',name:'辅导人',disabled:false},
+    {id:2,value:'1',name:'体系负责人',disabled:false},
+    {id:3,value:'2',name:'公司运营主管',disabled:false},
+    {id:4,value:'3',name:'寿险总经理',disabled:false},
+    {id:5,value:'4',name:'公司总经理',disabled:false}
+  ]
   constructor(private myService:MyService,private _modal: ModalService, private _toast: ToastService,private activatedRoute: ActivatedRoute,
   constructor(private myService:MyService,private _modal: ModalService, private _toast: ToastService,private activatedRoute: ActivatedRoute,
     private router: Router) { }
     private router: Router) { }
 
 
@@ -28,7 +36,12 @@ export class ApprovalCommentsComponent implements OnInit {
     this.hiringBasicInfoId = this.activatedRoute.snapshot.queryParams.hiringBasicInfoId?this.activatedRoute.snapshot.queryParams.hiringBasicInfoId:null;
     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.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
     this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
     this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
-
+     // 将不符合条件的回退环节disabled掉
+     this.approvalOptionLists.forEach(item=>{
+      if(item.id >= parseInt(sessionStorage.getItem('hiringApproveStepsSeq'),0)){
+        item.disabled=true;
+      }
+    })
   }
   }
 
 
   showAlert(approvingStatus) {
   showAlert(approvingStatus) {
@@ -59,11 +72,10 @@ export class ApprovalCommentsComponent implements OnInit {
       stepsSeqBackTo:this.stepsSeqBackTo
       stepsSeqBackTo:this.stepsSeqBackTo
     }
     }
     if(this.stepsSeqBackTo == 'null'){
     if(this.stepsSeqBackTo == 'null'){
-      this.stepsSeqBackTo = null;
+      param.stepsSeqBackTo = null;
     }
     }
-    if(!this.stepsSeqBackTo || parseInt(this.stepsSeqBackTo,0) >= parseInt(sessionStorage.getItem('hiringApproveStepsSeq'),0)){
-      this.openPopInfo('当前审批环节不可再往前回退！');
-      return;
+    if(!this.stepsSeqBackTo){
+      this.openPopInfo('请选择要退回到哪个环节！');
     }
     }
     this.myService.hiringApprove(param).subscribe((res)=>{
     this.myService.hiringApprove(param).subscribe((res)=>{
       if(res['success']){
       if(res['success']){

src/app/my/my-center-home/my-center-home.component.scss

@@ -497,6 +497,8 @@ ol {
   position: fixed;
   position: fixed;
   left: 0;
   left: 0;
   top: 0;
   top: 0;
+  display: flex;
+  align-items: center;
   .tipsInfoContent {
   .tipsInfoContent {
     position: relative;
     position: relative;
     width: 85%;
     width: 85%;
@@ -504,7 +506,6 @@ ol {
     margin: 0 auto;
     margin: 0 auto;
     background: #fff;
     background: #fff;
     border-radius: 10px;
     border-radius: 10px;
-    margin-top: 50%;
     text-align: center;
     text-align: center;
     color: #1b5b99;
     color: #1b5b99;
     max-width: 500px;
     max-width: 500px;