弹框样式调整&报聘职级显示

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

@@ -2,12 +2,12 @@
   <!--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%;padding-bottom: 15px;">
+    <div class="weui-dialog" style="width: 70%;">
       <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}}
       </div>
       </div>
-      <div class="weui-dialog__ft" style="line-height: normal;min-height: auto;margin: 0 auto 10px auto;">
+      <div class="weui-dialog__ft">
         <a href="javascript:;" class="weui-dialog__btn" [ngClass]="footer.className"
         <a href="javascript:;" class="weui-dialog__btn" [ngClass]="footer.className"
           *ngFor="let footer of dialogInfo.footer" (click)="sendInfo()">{{footer.value}}</a>
           *ngFor="let footer of dialogInfo.footer" (click)="sendInfo()">{{footer.value}}</a>
       </div>
       </div>

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

@@ -12,4 +12,5 @@
     <div style="background-color: #1b5b99;" (click)="showAlert(1)">通过</div>
     <div style="background-color: #1b5b99;" (click)="showAlert(1)">通过</div>
   </div>
   </div>
 </div>
 </div>
+<ydlife-toast *ngIf="toastDialog" [toastInfo]="toastInfo"></ydlife-toast>
 <ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert>
 <ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert>
\ No newline at end of file

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

@@ -16,6 +16,9 @@ export class ApprovalCommentsComponent implements OnInit {
   practitionerId:any;
   practitionerId:any;
   isNeedAlert: boolean;
   isNeedAlert: boolean;
   dialogInfo: any;
   dialogInfo: any;
+    //控制弹框
+    toastDialog: boolean;
+    toastInfo: any;
   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) { }
 
 
@@ -54,11 +57,10 @@ export class ApprovalCommentsComponent implements OnInit {
         sessionStorage.setItem('viewApprovalInfo','1')
         sessionStorage.setItem('viewApprovalInfo','1')
         setTimeout(() => {
         setTimeout(() => {
           this.router.navigate(['/approval_result_list'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
           this.router.navigate(['/approval_result_list'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} });
-        }, 3000);
+        }, 2000);
       }else{
       }else{
         this.openPopInfo(res['message']);
         this.openPopInfo(res['message']);
       }
       }
-      
     })
     })
   }
   }
    // 打开弹窗
    // 打开弹窗

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

@@ -525,7 +525,7 @@ export class RecruitingDetailComponent implements OnInit {
         if(e){
         if(e){
           for(const level of this.practitionerLevelInfos){
           for(const level of this.practitionerLevelInfos){
             if(e == level.id){
             if(e == level.id){
-              this.employQuery.mdDropOptionName = level.dropOptionName;
+              this.employQuery.mdDropOptionName = level.dropOptionCode + '-' + level.dropOptionName;
             }
             }
           }
           }
           //如果报聘职级是s2,清空辅导人、体系、体系负责人
           //如果报聘职级是s2,清空辅导人、体系、体系负责人

src/assets/weui/weui.css

@@ -2093,17 +2093,17 @@ a.weui-media-box:active{
   overflow-y:auto;
   overflow-y:auto;
   -webkit-overflow-scrolling:touch;
   -webkit-overflow-scrolling:touch;
   padding:0 24px;
   padding:0 24px;
-  margin-bottom:32px;
   font-size:17px;
   font-size:17px;
   line-height:1.4;
   line-height:1.4;
   word-wrap:break-word;
   word-wrap:break-word;
   -webkit-hyphens:auto;
   -webkit-hyphens:auto;
   hyphens:auto;
   hyphens:auto;
   color:rgba(0, 0, 0, 0.5);
   color:rgba(0, 0, 0, 0.5);
+
 }
 }
 .weui-dialog__bd:first-child{
 .weui-dialog__bd:first-child{
   min-height:40px;
   min-height:40px;
-  padding:32px 24px 0;
+  padding:32px 24px;
   font-weight:700;
   font-weight:700;
   color:rgba(0, 0, 0, 0.9);
   color:rgba(0, 0, 0, 0.9);
   display:-webkit-box;
   display:-webkit-box;

src/styles.scss

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