Skip to content

Y
ydLife
Commit d7542ce1 by sunchao
Options

Merge branch 'dev' into master

parents c0a36a7a c9fb90e9
Showing with 393 additions and 162 deletions
src/app/auth/login/login.component.ts
...@@ -79,7 +79,8 @@ export class LoginComponent implements OnInit, OnDestroy { ...@@ -79,7 +79,8 @@ export class LoginComponent implements OnInit, OnDestroy {
} }
} }
} else { } else {
this.openPopInfo('仅供寿险经纪人登录！'); this.openPopInfo('你好，只有授权的经纪人才可登录，请联系我们的客服4009219290');
// this.openPopInfo(`你好，只有授权的经纪人才可登录，请联系我们的客服 <a href="tel:4009219290">4009219290 </a>`);
return; return;
} }
......
src/app/common/alert/alert.component.html
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
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/application-process/bank-card/bank-card.component.html
...@@ -7,25 +7,25 @@ ...@@ -7,25 +7,25 @@
<div class="contentDetail employ"> <div class="contentDetail employ">
<div class="contentItem"> <div class="contentItem">
<input class="form-control" name="" id="" placeholder="开户行具体到支行" [(ngModel)]="bankAccountOpening" <input class="form-control" name="" id="" placeholder="开户行具体到支行" [(ngModel)]="bankAccountOpening"
(blur)="bs()" [disabled]="approvalIdentity || approveStatus!=null" /> (blur)="bs()" [disabled]="approveStatus!=null && approveStatus!='-1'" />
</div> </div>
<div class="contentItem"> <div class="contentItem">
<input class="form-control" placeholder="银行卡号：例如 6301234345354356" [(ngModel)]="bankAccountId" <input class="form-control" placeholder="银行卡号：例如 6301234345354356" [(ngModel)]="bankAccountId"
(blur)="bs(2)" onkeyup="this.value=this.value.replace(/\D/g,'')" maxlength="19" (blur)="bs(2)" onkeyup="this.value=this.value.replace(/\D/g,'')" maxlength="19"
[disabled]="approvalIdentity || approveStatus!=null"/> [disabled]="approveStatus!=null && approveStatus!='-1'" />
</div> </div>
<div class="contentItem" *ngIf="!approvalIdentity"> <div class="contentItem" *ngIf="approveStatus==null || approveStatus=='-1'">
<input class="form-control" name="" id="" style="text-align: left;padding: 6px 0;" placeholder="再次输入银行卡号以确认" <input class="form-control" name="" id="" style="text-align: left;padding: 6px 0;" placeholder="再次输入银行卡号以确认"
[(ngModel)]="sureBankAccountId" (blur)="bs(3)" onkeyup="this.value=this.value.replace(/\D/g,'')" [(ngModel)]="sureBankAccountId" (blur)="bs(3)" onkeyup="this.value=this.value.replace(/\D/g,'')"
[disabled]="approveStatus!=null" maxlength="19"/> [disabled]="approveStatus!=null && approveStatus!='-1'" maxlength="19"/>
</div> </div>
</div> </div>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/bank-card/bank-card.component.ts
...@@ -17,7 +17,6 @@ export class BankCardComponent implements OnInit { ...@@ -17,7 +17,6 @@ export class BankCardComponent implements OnInit {
sureBankAccountId:string; sureBankAccountId:string;
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -27,7 +26,6 @@ export class BankCardComponent implements OnInit { ...@@ -27,7 +26,6 @@ export class BankCardComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
} }
...@@ -104,7 +102,7 @@ export class BankCardComponent implements OnInit { ...@@ -104,7 +102,7 @@ export class BankCardComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/employee_salary'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/employee_salary'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
......
src/app/my/application-process/employee-basic-info/employee-basic-info.component.html
...@@ -8,12 +8,12 @@ ...@@ -8,12 +8,12 @@
<div class="contentItem"> <div class="contentItem">
<span>姓名</span> <span>姓名</span>
<input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.name" (blur)="bs(2)" <input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.name" (blur)="bs(2)"
[disabled]="approvalIdentity || approveStatus!=null"> [disabled]="approveStatus!=null && approveStatus!='-1'">
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>证件类型</span> <span>证件类型</span>
<select class="form-control" (ngModelChange)="idTypeChange($event);bs(null)" [ngModel]="editEmployBasicInfo.idTypeId" <select class="form-control" (ngModelChange)="idTypeChange($event);bs(null)" [ngModel]="editEmployBasicInfo.idTypeId"
[disabled]="approvalIdentity || approveStatus!=null"> [disabled]="approveStatus!=null && approveStatus!='-1'">
<option value=null>请选择</option> <option value=null>请选择</option>
<option [value]="idType.id" *ngFor="let idType of this.idTypesList"> <option [value]="idType.id" *ngFor="let idType of this.idTypesList">
{{idType.name}} {{idType.name}}
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<div class="contentItem"> <div class="contentItem">
<span>证件号</span> <span>证件号</span>
<input type="text" class="form-control" (blur)="bs(1)" [(ngModel)]="editEmployBasicInfo.idNo" <input type="text" class="form-control" (blur)="bs(1)" [(ngModel)]="editEmployBasicInfo.idNo"
[disabled]="approvalIdentity || approveStatus!=null"> [disabled]="approveStatus!=null && approveStatus!='-1'">
</div> </div>
<List [className]="'date-picker-list'"> <List [className]="'date-picker-list'">
<ListItem <ListItem
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
[maxDate] = "maxDate" [maxDate] = "maxDate"
[(ngModel)]="showPractitionerBirthdate" [(ngModel)]="showPractitionerBirthdate"
(onOk)="onOk($event)" (onOk)="onOk($event)"
[disabled]="editEmployBasicInfo.idTypeId==1 || approvalIdentity || approveStatus!=null" [disabled]="editEmployBasicInfo.idTypeId==1 || (approveStatus!=null && approveStatus!='-1')"
> >
出生日期 出生日期
</ListItem> </ListItem>
...@@ -43,8 +43,8 @@ ...@@ -43,8 +43,8 @@
<div class="contentItem"> <div class="contentItem">
<span>性别</span> <span>性别</span>
<select class="form-control" [(ngModel)]="editEmployBasicInfo.gender" [disabled]="editEmployBasicInfo.idTypeId==1" (blur)="bs(null)" <select class="form-control" [(ngModel)]="editEmployBasicInfo.gender"
[disabled]="approvalIdentity || approveStatus!=null"> [disabled]="editEmployBasicInfo.idTypeId==1 || (approveStatus!=null && approveStatus!='-1')" (blur)="bs(null)">
<option value=null>请选择</option> <option value=null>请选择</option>
<option value='1'>男</option> <option value='1'>男</option>
<option value="2">女</option> <option value="2">女</option>
...@@ -68,20 +68,20 @@ ...@@ -68,20 +68,20 @@
<span>居住地址</span> <span>居住地址</span>
<div> <div>
<input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.residentAddress" (blur)="bs(3)" <input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.residentAddress" (blur)="bs(3)"
[disabled]="approvalIdentity || approveStatus!=null"> [disabled]="approveStatus!=null && approveStatus!='-1'">
</div> </div>
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>E-mail</span> <span>E-mail</span>
<div><input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.email" (blur)="bs(4)" <div><input type="text" class="form-control" [(ngModel)]="editEmployBasicInfo.email" (blur)="bs(4)"
[disabled]="approvalIdentity || approveStatus!=null"></div> [disabled]="approveStatus!=null && approveStatus!='-1'"></div>
</div> </div>
</div> </div>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/employee-basic-info/employee-basic-info.component.ts
...@@ -21,7 +21,6 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -21,7 +21,6 @@ export class EmployeeBasicInfoComponent implements OnInit {
provinces:Array<any>; provinces:Array<any>;
minDate:any = new Date('1900-01-01'); minDate:any = new Date('1900-01-01');
maxDate:any = new Date(); maxDate:any = new Date();
approvalIdentity:any;
//通过0，拒绝-1，已填完-2 //通过0，拒绝-1，已填完-2
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
...@@ -32,7 +31,6 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -32,7 +31,6 @@ export class EmployeeBasicInfoComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.editEmployBasicInfo.mobileNo = this.activatedRoute.snapshot.queryParams.mobileNo?this.activatedRoute.snapshot.queryParams.mobileNo:null; this.editEmployBasicInfo.mobileNo = this.activatedRoute.snapshot.queryParams.mobileNo?this.activatedRoute.snapshot.queryParams.mobileNo:null;
this.erpInitialize(); this.erpInitialize();
this.provCityQry(); this.provCityQry();
...@@ -206,9 +204,11 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -206,9 +204,11 @@ export class EmployeeBasicInfoComponent implements OnInit {
// 选择地址信息 // 选择地址信息
selectedArea(type) { selectedArea(type) {
// this.sendRemoveScrollContent.emit(1); // this.sendRemoveScrollContent.emit(1);
if (type === 1 && !this.approvalIdentity && this.approveStatus==null) { if (type === 1) {
// 户籍地址 if(this.approveStatus==null || this.approveStatus=='-1'){
this.houseFlag = true; // 户籍地址
this.houseFlag = true;
}
} }
} }
...@@ -244,6 +244,7 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -244,6 +244,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
} }
this.approveStatus = res['data']['hiringBasicInfo']['approveStatus']; this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
this.showPractitionerBirthdate= new Date(res['data']['hiringBasicInfo']['practitionerBirthdate']); this.showPractitionerBirthdate= new Date(res['data']['hiringBasicInfo']['practitionerBirthdate']);
// alert(new Date(673887600000))
this.editEmployBasicInfo.practitionerBirthdate = this.currentDateFormat(this.showPractitionerBirthdate, 'yyyy-mm-dd') this.editEmployBasicInfo.practitionerBirthdate = this.currentDateFormat(this.showPractitionerBirthdate, 'yyyy-mm-dd')
if(this.editEmployBasicInfo.cityId || this.editEmployBasicInfo.cityName || this.editEmployBasicInfo.provinceId || this.editEmployBasicInfo.provinceName){ if(this.editEmployBasicInfo.cityId || this.editEmployBasicInfo.cityName || this.editEmployBasicInfo.provinceId || this.editEmployBasicInfo.provinceName){
this.addressInfo = { this.addressInfo = {
...@@ -262,6 +263,8 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -262,6 +263,8 @@ export class EmployeeBasicInfoComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/work_experience'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/work_experience'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
} }
src/app/my/application-process/employee-education/employee-education.component.html
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<div class="contentItem"> <div class="contentItem">
<span>最高学历：如本科、专科、硕士</span> <span>最高学历：如本科、专科、硕士</span>
<select class="form-control" name="" id="" [(ngModel)]="lastGraduateCode" (ngModelChange)="selectEducationLevel($event)" <select class="form-control" name="" id="" [(ngModel)]="lastGraduateCode" (ngModelChange)="selectEducationLevel($event)"
[disabled]="approvalIdentity || approveStatus!=null"> [disabled]="approveStatus!=null && approveStatus!='-1'">
<option value=null>请选择</option> <option value=null>请选择</option>
<option [value]="educationLevel.id" *ngFor="let educationLevel of educationLevelList"> <option [value]="educationLevel.id" *ngFor="let educationLevel of educationLevelList">
{{educationLevel.name}} {{educationLevel.name}}
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>毕业学校</span> <span>毕业学校</span>
<input class="form-control" [(ngModel)]="lastGraduateSchool" [disabled]="approvalIdentity || approveStatus!=null"/> <input class="form-control" [(ngModel)]="lastGraduateSchool" [disabled]="approveStatus!=null && approveStatus!='-1'" />
</div> </div>
<div class="contentItem" style="border:none;"> <div class="contentItem" style="border:none;">
<span>毕业证</span> <span>毕业证</span>
...@@ -33,10 +33,10 @@ ...@@ -33,10 +33,10 @@
<p>（jpg,png 文件大小不大于1mb）</p> <p>（jpg,png 文件大小不大于1mb）</p>
</div> </div>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/employee-education/employee-education.component.ts
...@@ -20,7 +20,6 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -20,7 +20,6 @@ export class EmployeeEducationComponent implements OnInit {
toastInfo: any; toastInfo: any;
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -32,7 +31,6 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -32,7 +31,6 @@ export class EmployeeEducationComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.educationLevelQuery(); this.educationLevelQuery();
this.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
} }
...@@ -93,7 +91,7 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -93,7 +91,7 @@ export class EmployeeEducationComponent implements OnInit {
} }
selectPic(){ selectPic(){
if(!this.approvalIdentity && this.approveStatus==null){ if(this.approveStatus==null || this.approveStatus=='-1'){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -162,7 +160,7 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -162,7 +160,7 @@ export class EmployeeEducationComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/bank_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/bank_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
goBack(){ goBack(){
......
src/app/my/application-process/employee-id-card/employee-id-card.component.html
...@@ -37,10 +37,10 @@ ...@@ -37,10 +37,10 @@
</div> </div>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/employee-id-card/employee-id-card.component.ts
...@@ -21,7 +21,6 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -21,7 +21,6 @@ export class EmployeeIdCardComponent implements OnInit {
toastInfo: any; toastInfo: any;
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -33,7 +32,6 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -33,7 +32,6 @@ export class EmployeeIdCardComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
// setTimeout(() => { // setTimeout(() => {
// this.exampleWidth = this.elementView.nativeElement.offsetWidth; // this.exampleWidth = this.elementView.nativeElement.offsetWidth;
...@@ -72,7 +70,7 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -72,7 +70,7 @@ export class EmployeeIdCardComponent implements OnInit {
} }
selectPic(type){ selectPic(type){
if(!this.approvalIdentity && this.approveStatus==null){ if(this.approveStatus==null || this.approveStatus == '-1'){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -150,7 +148,7 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -150,7 +148,7 @@ export class EmployeeIdCardComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/employee_education'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/employee_education'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
goBack(){ goBack(){
......
src/app/my/application-process/employee-info/employee-info.component.html
...@@ -30,10 +30,10 @@ ...@@ -30,10 +30,10 @@
</div> </div>
</div> </div>
</div> </div>
<footer class="fixed" (click)="next()"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
确认并下一步 确认并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/employee-info/employee-info.component.ts
...@@ -11,7 +11,7 @@ export class EmployeeInfoComponent implements OnInit { ...@@ -11,7 +11,7 @@ export class EmployeeInfoComponent implements OnInit {
hiringBasicInfoId:any; hiringBasicInfoId:any;
membership:any; membership:any;
mobileNo:string; mobileNo:string;
approvalIdentity:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
public myService:MyService) { } public myService:MyService) { }
...@@ -19,7 +19,6 @@ export class EmployeeInfoComponent implements OnInit { ...@@ -19,7 +19,6 @@ export class EmployeeInfoComponent implements OnInit {
ngOnInit() { ngOnInit() {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
this.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
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.mobileNo = this.activatedRoute.snapshot.queryParams.mobileNo?this.activatedRoute.snapshot.queryParams.mobileNo:null; this.mobileNo = this.activatedRoute.snapshot.queryParams.mobileNo?this.activatedRoute.snapshot.queryParams.mobileNo:null;
this.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
...@@ -32,6 +31,7 @@ export class EmployeeInfoComponent implements OnInit { ...@@ -32,6 +31,7 @@ export class EmployeeInfoComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{ this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{
this.membership = res['data']['hiringMemberShip']; this.membership = res['data']['hiringMemberShip'];
this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
}) })
} }
...@@ -40,6 +40,6 @@ export class EmployeeInfoComponent implements OnInit { ...@@ -40,6 +40,6 @@ export class EmployeeInfoComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/employee_basic_info'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/employee_basic_info'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
} }
src/app/my/application-process/employee-salary/employee-salary.component.html
...@@ -16,10 +16,10 @@ ...@@ -16,10 +16,10 @@
<li>如果报聘职阶为S2（业务合伙人）在最近三年内，至少一年同业收入达100万；</li> <li>如果报聘职阶为S2（业务合伙人）在最近三年内，至少一年同业收入达100万；</li>
</ul> </ul>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/employee-salary/employee-salary.component.ts
...@@ -17,7 +17,6 @@ export class EmployeeSalaryComponent implements OnInit { ...@@ -17,7 +17,6 @@ export class EmployeeSalaryComponent implements OnInit {
toastInfo: any; toastInfo: any;
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -27,12 +26,11 @@ export class EmployeeSalaryComponent implements OnInit { ...@@ -27,12 +26,11 @@ export class EmployeeSalaryComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
} }
selectPic(){ selectPic(){
if(!this.approvalIdentity && this.approveStatus==null){ if(this.approveStatus==null || this.approveStatus=='-1'){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -119,7 +117,7 @@ export class EmployeeSalaryComponent implements OnInit { ...@@ -119,7 +117,7 @@ export class EmployeeSalaryComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/personal_statement'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/personal_statement'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
goBack(){ goBack(){
......
src/app/my/application-process/employee-submit/employee-submit.component.html
...@@ -6,3 +6,4 @@ ...@@ -6,3 +6,4 @@
<p>请注意查看！</p> <p>请注意查看！</p>
<img src="assets/images/login_logo.png" alt="logo" style="width: 50%;position: absolute;left: 0;right: 0;margin: 0 auto;bottom: 20px;"> <img src="assets/images/login_logo.png" alt="logo" style="width: 50%;position: absolute;left: 0;right: 0;margin: 0 auto;bottom: 20px;">
</div> </div>
<ydlife-alert *ngIf="isNeedAlert" [dialogInfo]="dialogInfo" (popInfo)="getPopInfo()"></ydlife-alert>
src/app/my/application-process/employee-submit/employee-submit.component.ts
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { ActivatedRoute,Router } from "@angular/router"; import { ActivatedRoute,Router } from "@angular/router";
import { LifeCommonService } from "../../../common/life-common.service"; import { LifeCommonService } from "../../../common/life-common.service";
import { MyService } from '../../my.service';
@Component({ @Component({
selector: 'ydlife-employee-submit', selector: 'ydlife-employee-submit',
templateUrl: './employee-submit.component.html', templateUrl: './employee-submit.component.html',
styleUrls: ['./employee-submit.component.scss'] styleUrls: ['./employee-submit.component.scss']
}) })
export class EmployeeSubmitComponent implements OnInit { export class EmployeeSubmitComponent implements OnInit {
hiringBasicInfoId:any;
approveStatus:any;
isNeedAlert: boolean;
dialogInfo: any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
public lifeCommonService:LifeCommonService) { } public lifeCommonService:LifeCommonService,
private myService:MyService) { }
ngOnInit() { ngOnInit() {
sessionStorage.removeItem('viewApprovalInfo')
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
this.hiringBasicInfoId = this.activatedRoute.snapshot.queryParams.hiringBasicInfoId?this.activatedRoute.snapshot.queryParams.hiringBasicInfoId:null;
this.approveStatus = this.activatedRoute.snapshot.queryParams.status?this.activatedRoute.snapshot.queryParams.status:null;
if(this.approveStatus == null || this.approveStatus == '-1'){
this.hiringSubmit();
}
}
hiringSubmit(){
this.myService.hiringSubmit({hiringBasicInfoId:this.hiringBasicInfoId}).subscribe((res)=>{
if(res['success']){
}else{
this.openPopInfo(res['message'])
}
})
}
// 打开弹窗
openPopInfo(message) {
this.isNeedAlert = true;
this.dialogInfo = {
title: null,
content: { value: message, align: 'center' },
footer: [{ value: '我知道了', routerLink: '', className: 'weui-dialog__btn_primary' }],
};
}
// 关闭弹窗
getPopInfo() {
this.isNeedAlert = false;
} }
} }
src/app/my/application-process/personal-photos/personal-photos.component.html
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
<p>（请勿使用生活照，大小小于1mb）</p> <p>（请勿使用生活照，大小小于1mb）</p>
</div> </div>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/personal-photos/personal-photos.component.ts
...@@ -16,7 +16,6 @@ export class PersonalPhotosComponent implements OnInit { ...@@ -16,7 +16,6 @@ export class PersonalPhotosComponent implements OnInit {
toastInfo: any; toastInfo: any;
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -26,12 +25,11 @@ export class PersonalPhotosComponent implements OnInit { ...@@ -26,12 +25,11 @@ export class PersonalPhotosComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
} }
selectPic(){ selectPic(){
if(!this.approvalIdentity && this.approveStatus==null){ if(this.approveStatus==null || this.approveStatus=='-1'){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -122,7 +120,7 @@ export class PersonalPhotosComponent implements OnInit { ...@@ -122,7 +120,7 @@ export class PersonalPhotosComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/employee_id_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/employee_id_card'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
goBack(){ goBack(){
......
src/app/my/application-process/personal-statement/personal-statement.component.html
...@@ -14,10 +14,10 @@ ...@@ -14,10 +14,10 @@
</ul> </ul>
<textarea placeholder="请输入您曾经报聘过的保险机构名称" #autofocusFlag [(ngModel)]="everWork" *ngIf="everWorkFlag" class="form-control" cols="10" rows="5"></textarea> <textarea placeholder="请输入您曾经报聘过的保险机构名称" #autofocusFlag [(ngModel)]="everWork" *ngIf="everWorkFlag" class="form-control" cols="10" rows="5"></textarea>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
...@@ -34,17 +34,17 @@ ...@@ -34,17 +34,17 @@
[ngClass]="{'selected':contractItem.confirmStatus}"> [ngClass]="{'selected':contractItem.confirmStatus}">
<span>{{contractItem.termName}}</span> <span>{{contractItem.termName}}</span>
<span> <span>
<span style="margin-right: 5px;" *ngIf="contractItem.confirmStatus && approvalIdentity">已阅读</span> <span style="margin-right: 5px;" *ngIf="contractItem.confirmStatus">已阅读</span>
<i class="iconfont icon-gougou" *ngIf="contractItem.confirmStatus"></i> <i class="iconfont icon-gougou" *ngIf="contractItem.confirmStatus"></i>
</span> </span>
</li> </li>
</ul> </ul>
</div> </div>
<footer class="fixed" (click)="next()" [ngClass]="{default:isAllAgree == false}" <footer class="fixed" (click)="next()" [ngClass]="{default:isAllAgree == false}"
*ngIf="!approvalIdentity"> *ngIf="approveStatus==null || approveStatus=='-1'">
我已全部阅读且同意，下一步 我已全部阅读且同意，下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
...@@ -54,7 +54,6 @@ ...@@ -54,7 +54,6 @@
</div> </div>
<!-- <div id="toastContent" *ngIf="isShow" #contract (scroll)="onScroll($event)"> --> <!-- <div id="toastContent" *ngIf="isShow" #contract (scroll)="onScroll($event)"> -->
<div id="toastContent" *ngIf="isShow" #contract > <div id="toastContent" *ngIf="isShow" #contract >
<div class="title"> <div class="title">
{{curTitle}} {{curTitle}}
</div> </div>
......
src/app/my/application-process/personal-statement/personal-statement.component.ts
...@@ -30,7 +30,6 @@ export class PersonalStatementComponent implements OnInit { ...@@ -30,7 +30,6 @@ export class PersonalStatementComponent implements OnInit {
curContractId:number; curContractId:number;
isAllAgree:boolean = false; isAllAgree:boolean = false;
contractTermsConfirmsListParm:Array<any>; contractTermsConfirmsListParm:Array<any>;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
agreeBtnShow:boolean = false; agreeBtnShow:boolean = false;
timeCount:number = 5; timeCount:number = 5;
...@@ -44,14 +43,13 @@ export class PersonalStatementComponent implements OnInit { ...@@ -44,14 +43,13 @@ export class PersonalStatementComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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;
if(this.type=="personal_statement"){ if(this.type=="personal_statement"){
this.dropOptionsQuery(); this.dropOptionsQuery();
}else{ }
if(this.type=="contract"){
this.queryContractTerms(); this.queryContractTerms();
} }
this.queryWholeInfo(this.hiringBasicInfoId);
} }
ngOnChanges(){ ngOnChanges(){
...@@ -62,11 +60,11 @@ export class PersonalStatementComponent implements OnInit { ...@@ -62,11 +60,11 @@ export class PersonalStatementComponent implements OnInit {
if(this.type == 'personal_statement'){ if(this.type == 'personal_statement'){
this.savePersonalStatements(); this.savePersonalStatements();
}else if(this.type == 'contract'){ }else if(this.type == 'contract'){
this.saveContractTermsConfirms();
if(!this.isAllAgree){ if(!this.isAllAgree){
this.openPopInfo('请详细阅读全部条款！') this.openPopInfo('请详细阅读全部条款！')
return; return;
} }
this.saveContractTermsConfirms();
this.router.navigate(['/signature'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} }); this.router.navigate(['/signature'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
} }
...@@ -78,11 +76,13 @@ export class PersonalStatementComponent implements OnInit { ...@@ -78,11 +76,13 @@ export class PersonalStatementComponent implements OnInit {
this.dropOptionsInfoList.forEach((item)=>{ this.dropOptionsInfoList.forEach((item)=>{
item.status = 0; item.status = 0;
item.userInput = null; item.userInput = null;
}) });
this.queryWholeInfo(this.hiringBasicInfoId);
}else{ }else{
this.openPopInfo(res['message']); this.openPopInfo(res['message']);
} }
}) })
} }
// 打开弹窗 // 打开弹窗
...@@ -97,7 +97,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -97,7 +97,7 @@ export class PersonalStatementComponent implements OnInit {
//选择个人声明 //选择个人声明
selectStatements(personalStatements){ selectStatements(personalStatements){
if(!this.approvalIdentity && this.approveStatus==null){ if(this.approveStatus==null || this.approveStatus == '-1'){
if( personalStatements.status ==1){ if( personalStatements.status ==1){
personalStatements.status = 0; personalStatements.status = 0;
}else{ }else{
...@@ -140,6 +140,15 @@ export class PersonalStatementComponent implements OnInit { ...@@ -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
...@@ -159,9 +168,12 @@ export class PersonalStatementComponent implements OnInit { ...@@ -159,9 +168,12 @@ export class PersonalStatementComponent implements OnInit {
this.contractTermsList = res['data']['contractTermsList']; this.contractTermsList = res['data']['contractTermsList'];
this.contractTermsList.forEach((item)=>{ this.contractTermsList.forEach((item)=>{
item.confirmStatus = 0; item.confirmStatus = 0;
}) });
this.queryWholeInfo(this.hiringBasicInfoId);
}else{
this.openPopInfo(res['message']);
} }
}) });
} }
// 关闭弹窗 // 关闭弹窗
...@@ -170,7 +182,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -170,7 +182,7 @@ export class PersonalStatementComponent implements OnInit {
} }
readContract(contractItem){ readContract(contractItem){
if(!this.approvalIdentity && this.approveStatus==null){ if(this.approveStatus==null || this.approveStatus == '-1'){
this.agreeBtnShow = false; this.agreeBtnShow = false;
if( contractItem.confirmStatus ==1){ if( contractItem.confirmStatus ==1){
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
...@@ -178,10 +190,10 @@ export class PersonalStatementComponent implements OnInit { ...@@ -178,10 +190,10 @@ export class PersonalStatementComponent implements OnInit {
this.isShow = true; this.isShow = true;
setTimeout(() => { setTimeout(() => {
let scrollTop = this.toastContent.nativeElement.scrollTop; let scrollTop = this.toastContent.nativeElement.scrollTop;
if(scrollTop==0){ if(scrollTop>=0){
setTimeout(() => { // setTimeout(() => {
this.agreeBtnShow = true; this.agreeBtnShow = true;
}, 1000); // }, 1000);
} }
}, 500); }, 500);
this.curContract = contractItem.termNote; this.curContract = contractItem.termNote;
...@@ -232,8 +244,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -232,8 +244,7 @@ export class PersonalStatementComponent implements OnInit {
}) })
} }
async queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
await this.queryContractTerms();
this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe( (res)=>{ this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe( (res)=>{
if(res['success']){ if(res['success']){
this.approveStatus = res['data']['hiringBasicInfo']['approveStatus']; this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
...@@ -282,10 +293,10 @@ export class PersonalStatementComponent implements OnInit { ...@@ -282,10 +293,10 @@ export class PersonalStatementComponent implements OnInit {
viewNext(){ viewNext(){
if(this.type == 'personal_statement'){ if(this.type == 'personal_statement'){
this.router.navigate(['/contract'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/contract'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
if(this.type == 'contract'){ if(this.type == 'contract'){
this.router.navigate(['/signature'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/signature'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
} }
......
src/app/my/application-process/signature/signature.component.html
...@@ -11,18 +11,18 @@ ...@@ -11,18 +11,18 @@
</signature-pad> </signature-pad>
<img [src]="imgStr" alt="签名" *ngIf="isSignatureShow"> <img [src]="imgStr" alt="签名" *ngIf="isSignatureShow">
</div> </div>
<div class="signature_action" *ngIf="!approvalIdentity && approveStatus == null"> <div class="signature_action" *ngIf="approveStatus == null || approveStatus == '-1'">
<img src="assets/images/clear.png" alt="清除" (click)="clearSignature();"/> <img src="assets/images/clear.png" alt="清除" (click)="clearSignature();"/>
<img src="assets/images/revoke.png" *ngIf="!isSignatureShow" alt="上一步" (click)="revokeSignature()"/> <img src="assets/images/revoke.png" *ngIf="!isSignatureShow" alt="上一步" (click)="revokeSignature()"/>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
我自愿签订经纪人合同书 我自愿签订经纪人合同书
</footer> </footer>
<div id="page" *ngIf="approvalIdentity && viewApprovalInfo==0"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
<footer class="fixed" *ngIf="approvalIdentity && viewApprovalInfo!=0" (click)="returnResult()"> <footer class="fixed" *ngIf="viewApprovalInfo==1" (click)="returnResult()">
返回审批结果 返回审批结果
</footer> </footer>
</div> </div>
......
src/app/my/application-process/signature/signature.component.ts
...@@ -18,7 +18,6 @@ export class SignatureComponent implements OnInit { ...@@ -18,7 +18,6 @@ export class SignatureComponent implements OnInit {
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
isSignatureShow:boolean; isSignatureShow:boolean;
approvalIdentity:any;
viewApprovalInfo:any; viewApprovalInfo:any;
approveStatus:any; approveStatus:any;
@ViewChild(SignaturePad) signaturePad : SignaturePad; @ViewChild(SignaturePad) signaturePad : SignaturePad;
...@@ -31,7 +30,6 @@ export class SignatureComponent implements OnInit { ...@@ -31,7 +30,6 @@ export class SignatureComponent implements OnInit {
} }
ngOnInit() { ngOnInit() {
this.approvalIdentity = this.activatedRoute.snapshot.queryParams.approvalIdentity?this.activatedRoute.snapshot.queryParams.approvalIdentity:null;
this.signaturePadOptions = { this.signaturePadOptions = {
minWidth: 0.5, minWidth: 0.5,
maxWidth: 3, maxWidth: 3,
...@@ -53,7 +51,7 @@ export class SignatureComponent implements OnInit { ...@@ -53,7 +51,7 @@ export class SignatureComponent implements OnInit {
if(this.isSignatureShow == false){ if(this.isSignatureShow == false){
this.saveDigitalSignatures(); this.saveDigitalSignatures();
}else{ }else{
this.router.navigate(['/employee_submit']); this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
} }
} }
...@@ -77,7 +75,7 @@ export class SignatureComponent implements OnInit { ...@@ -77,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']);
} }
...@@ -130,14 +128,16 @@ export class SignatureComponent implements OnInit { ...@@ -130,14 +128,16 @@ export class SignatureComponent implements OnInit {
this.isSignatureShow = false; this.isSignatureShow = false;
this.signaturePad.clear(); this.signaturePad.clear();
}else{ }else{
if(!this.approvalIdentity){ this.signaturePad.clear();
this.signaturePad.clear();
}
} }
} }
viewNext(){ viewNext(){
this.router.navigate(['/approval_comments'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); if(this.viewApprovalInfo==0){
this.router.navigate(['/approval_comments'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
}else{
this.router.navigate(['/employee_submit'],{queryParams:{ hiringBasicInfoId:this.hiringBasicInfoId,status:this.approveStatus}});
}
} }
goBack(){ goBack(){
...@@ -145,7 +145,7 @@ export class SignatureComponent implements OnInit { ...@@ -145,7 +145,7 @@ export class SignatureComponent implements OnInit {
} }
returnResult(){ returnResult(){
this.router.navigate([`/approval_result_list`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:true}}) this.router.navigate([`/approval_result_list`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId}})
} }
} }
src/app/my/application-process/work-experience/work-experience.component.html
...@@ -3,15 +3,15 @@ ...@@ -3,15 +3,15 @@
<div><span class="line"></span>工作经历</div> <div><span class="line"></span>工作经历</div>
<span class="page_mark"> 2/8</span> <span class="page_mark"> 2/8</span>
</div> </div>
<div class="content" *ngIf="!approvalIdentity || approveStatus==null"> <div class="content" *ngIf="approveStatus==null || approveStatus=='-1'">
<div class="contentDetail employ"> <div class="contentDetail employ">
<div class="contentItem"> <div class="contentItem">
<span>工作单位</span> <span>工作单位</span>
<input type="text" class="form-control" [(ngModel)]="addExperience.workingCompany"/> <input type="text" class="form-control" [(ngModel)]="addExperience.workingCompany" [disabled]="approveStatus!=null && approveStatus!='-1'"/>
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>职位</span> <span>职位</span>
<input type="text" class="form-control" [(ngModel)]="addExperience.position"/> <input type="text" class="form-control" [(ngModel)]="addExperience.position" [disabled]="approveStatus!=null && approveStatus!='-1'"/>
</div> </div>
<List [className]="'date-picker-list'"> <List [className]="'date-picker-list'">
<ListItem <ListItem
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
[minDate] ="minDate" [minDate] ="minDate"
[(ngModel)]="showworkingStart" [(ngModel)]="showworkingStart"
(onOk)="onOk($event,'start')" (onOk)="onOk($event,'start')"
(onDismiss) = "onDismiss($event,'start')"
[disabled]="approveStatus!=null && approveStatus!='-1'"
> >
任职起始时间 任职起始时间
</ListItem> </ListItem>
...@@ -32,9 +34,10 @@ ...@@ -32,9 +34,10 @@
[extra]="currentDateFormat(showworkingEnd, 'yyyy-mm-dd')" [extra]="currentDateFormat(showworkingEnd, 'yyyy-mm-dd')"
[arrow]="'horizontal'" [arrow]="'horizontal'"
[mode]="'date'" [mode]="'date'"
[minDate] ="showworkingStart"
[(ngModel)]="showworkingEnd" [(ngModel)]="showworkingEnd"
(onOk)="onOk($event,'end')" (onOk)="onOk($event,'end')"
(onDismiss) = "onDismiss($event,'end')"
[disabled]="approveStatus!=null && approveStatus!='-1'"
> >
任职结束时间 任职结束时间
</ListItem> </ListItem>
...@@ -42,7 +45,7 @@ ...@@ -42,7 +45,7 @@
</div> </div>
</div> </div>
<div class="add_wrapper" *ngIf="!approvalIdentity || approveStatus==null"> <div class="add_wrapper" *ngIf="approveStatus==null || approveStatus=='-1'">
<i class="iconfont icon-jiahao" (click)="addExperienceList()"></i> <i class="iconfont icon-jiahao" (click)="addExperienceList()"></i>
<span>确认并添加</span> <span>确认并添加</span>
</div> </div>
...@@ -64,14 +67,14 @@ ...@@ -64,14 +67,14 @@
</li> </li>
<li> <li>
<span>任职结束时间</span> <span>任职结束时间</span>
<span>{{experienceItem.workingEnd}}</span> <span>{{experienceItem.workingEnd?experienceItem.workingEnd:'至今'}}</span>
</li> </li>
</ul> </ul>
</div> </div>
<footer class="fixed" (click)="next()" *ngIf="!approvalIdentity"> <footer class="fixed" (click)="next()" *ngIf="approveStatus==null || approveStatus=='-1'">
保存并下一步 保存并下一步
</footer> </footer>
<div id="page" *ngIf="approvalIdentity"> <div id="page" *ngIf="approveStatus!=null && approveStatus !='-1'">
<div (click)="goBack()">上一页</div> <div (click)="goBack()">上一页</div>
<div (click)="viewNext()">下一页</div> <div (click)="viewNext()">下一页</div>
</div> </div>
......
src/app/my/application-process/work-experience/work-experience.component.ts
...@@ -23,7 +23,6 @@ export class WorkExperienceComponent implements OnInit { ...@@ -23,7 +23,6 @@ export class WorkExperienceComponent implements OnInit {
toastInfo: any; toastInfo: any;
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any;
approveStatus:any; approveStatus:any;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -35,7 +34,6 @@ export class WorkExperienceComponent implements OnInit { ...@@ -35,7 +34,6 @@ export class WorkExperienceComponent implements OnInit {
const title = this.activatedRoute.snapshot.data[0]['title']; const title = this.activatedRoute.snapshot.data[0]['title'];
this.lifeCommonService.setTitle(title); this.lifeCommonService.setTitle(title);
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.addExperience = new ExperienceQuery(null, null, null,null); this.addExperience = new ExperienceQuery(null, null, null,null);
this.queryWholeInfo(this.hiringBasicInfoId) this.queryWholeInfo(this.hiringBasicInfoId)
} }
...@@ -43,7 +41,7 @@ export class WorkExperienceComponent implements OnInit { ...@@ -43,7 +41,7 @@ export class WorkExperienceComponent implements OnInit {
next(){ next(){
if(this.addExperience.workingCompany || this.addExperience.position || this.addExperience.workingStart || this.addExperience.workingEnd){ if(this.addExperience.workingCompany || this.addExperience.position || this.addExperience.workingStart || this.addExperience.workingEnd){
this.experienceList.push(this.addExperience) this.experienceList.push(this.addExperience)
this.showworkingStart=null; this.showworkingStart = null;
this.showworkingEnd = null; this.showworkingEnd = null;
this.addExperience = new ExperienceQuery(null, null, null,null); this.addExperience = new ExperienceQuery(null, null, null,null);
} }
...@@ -68,10 +66,22 @@ export class WorkExperienceComponent implements OnInit { ...@@ -68,10 +66,22 @@ export class WorkExperienceComponent implements OnInit {
} }
addExperienceList() { addExperienceList() {
if(!this.addExperience.workingCompany){
this.openPopInfo('请输入工作单位！')
return;
}
if(!this.addExperience.position){
this.openPopInfo('请输入职位！')
return;
}
if(!this.addExperience.workingStart){
this.openPopInfo('请输入选择任职起始时间！')
return;
}
//先push进去list在清空 //先push进去list在清空
if(this.addExperience.workingCompany || this.addExperience.position || this.addExperience.workingStart || this.addExperience.workingEnd){ if(this.addExperience.workingCompany && this.addExperience.position && this.addExperience.workingStart ){
this.experienceList.push(this.addExperience) this.experienceList.push(this.addExperience)
this.showworkingStart=null; this.showworkingStart = null;
this.showworkingEnd = null; this.showworkingEnd = null;
this.addExperience = new ExperienceQuery(null, null, null,null); this.addExperience = new ExperienceQuery(null, null, null,null);
} }
...@@ -102,6 +112,16 @@ export class WorkExperienceComponent implements OnInit { ...@@ -102,6 +112,16 @@ export class WorkExperienceComponent implements OnInit {
} }
} }
onDismiss(result:Date,type){
if(type=="start"){
this.showworkingStart = null;
}
if(type=="end"){
this.showworkingEnd = null;
}
}
// 打开弹窗 // 打开弹窗
openPopInfo(message) { openPopInfo(message) {
this.isNeedAlert = true; this.isNeedAlert = true;
...@@ -136,7 +156,7 @@ export class WorkExperienceComponent implements OnInit { ...@@ -136,7 +156,7 @@ export class WorkExperienceComponent implements OnInit {
} }
viewNext(){ viewNext(){
this.router.navigate(['/personal_photos'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity} }); this.router.navigate(['/personal_photos'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
} }
goBack(){ goBack(){
......
src/app/my/approval-comments/approval-comments.component.html
...@@ -12,4 +12,5 @@ ...@@ -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 { ...@@ -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) { }
...@@ -52,13 +55,9 @@ export class ApprovalCommentsComponent implements OnInit { ...@@ -52,13 +55,9 @@ 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} });
}, 3000);
}else{ }else{
this.openPopInfo(res['message']); this.openPopInfo(res['message']);
} }
}) })
} }
// 打开弹窗 // 打开弹窗
...@@ -74,5 +73,11 @@ export class ApprovalCommentsComponent implements OnInit { ...@@ -74,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']);
}
} }
} }
src/app/my/approval-result-list/approval-result-list.component.scss
...@@ -92,6 +92,7 @@ ...@@ -92,6 +92,7 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
right: 0;
height: 56px; height: 56px;
line-height: 56px; line-height: 56px;
display: flex; display: flex;
...@@ -101,6 +102,7 @@ ...@@ -101,6 +102,7 @@
color: #fff; color: #fff;
background: #1b5b99; background: #1b5b99;
font-size: 18px; font-size: 18px;
margin: 0 auto;
.icon-fanhui{ .icon-fanhui{
position: absolute; position: absolute;
left: 0; left: 0;
......
src/app/my/approval-result-list/approval-result-list.component.ts
...@@ -57,7 +57,7 @@ export class ApprovalResultListComponent implements OnInit { ...@@ -57,7 +57,7 @@ export class ApprovalResultListComponent implements OnInit {
} }
jumpToDetail(){ jumpToDetail(){
this.router.navigate([`/employee_info`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId,approvalIdentity:this.approvalIdentity}}) this.router.navigate([`/employee_info`],{queryParams:{hiringBasicInfoId:this.hiringBasicInfoId}})
} }
getDefaultHeadImg(str){ getDefaultHeadImg(str){
if(!str){ if(!str){
......
src/app/my/historical-rank/historical-rank.component.html 0 → 100644
<div class="team_sales_detail_wrapper">
<div class="teamHeader">
<div class="teamItem teamInfo">
<img src="assets/images/history_cup.png" >
<div style="letter-spacing: 5px;margin-left: 5%;margin-top: 2%;">往期历史</div>
</div>
</div>
</div>
\ No newline at end of file
src/app/my/historical-rank/historical-rank.component.scss 0 → 100644
.team_sales_detail_wrapper{
background: #fff;
overflow: auto;
height: 100%;
ul li,ol li{
list-style: none;
}
.teamHeader{
background:url('../../../assets/images/team_bg.png') no-repeat;
background-size: 100%;
.teamInfo{
font-size: 26px;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
overflow: hidden;
border-radius: 6px;
color: #fff;
height: 125px;
font-weight: bold;
img{
width: 16%;
margin-left: -8%;
}
}
}
}
\ No newline at end of file
src/app/my/historical-rank/historical-rank.component.spec.ts 0 → 100644
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { HistoricalRankComponent } from './historical-rank.component';
describe('HistoricalRankComponent', () => {
let component: HistoricalRankComponent;
let fixture: ComponentFixture<HistoricalRankComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ HistoricalRankComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(HistoricalRankComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/my/historical-rank/historical-rank.component.ts 0 → 100644
import { Component, OnInit } from '@angular/core';
@Component({
selector: 'ydlife-historical-rank',
templateUrl: './historical-rank.component.html',
styleUrls: ['./historical-rank.component.scss']
})
export class HistoricalRankComponent implements OnInit {
constructor() { }
ngOnInit() {
}
}
src/app/my/my-business-detail/my-business-detail.component.ts
...@@ -432,6 +432,14 @@ export class MyBusinessDetailComponent implements OnInit { ...@@ -432,6 +432,14 @@ export class MyBusinessDetailComponent implements OnInit {
} }
} }
this.ownOpportunityDetailQuery(); this.ownOpportunityDetailQuery();
}else{
this.toastDialog = true;
this.toastInfo = {
status: 1,
msg: res['success'],
timeout: 3000,
align: 'center'
};
} }
}) })
} }
......
src/app/my/my-center-home/my-center-home.component.ts
...@@ -57,7 +57,8 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit { ...@@ -57,7 +57,8 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
this.performanceList = [ this.performanceList = [
{ name: `${this.lifeCommonService.dateFormat(new Date, ('M'))}月`, time: 1 }, { name: `${this.lifeCommonService.dateFormat(new Date, ('M'))}月`, time: 1 },
{ name: `${this.getQuarter(this.lifeCommonService.dateFormat(new Date, ('M')))}`, time: 3 }, { name: `${this.getQuarter(this.lifeCommonService.dateFormat(new Date, ('M')))}`, time: 3 },
{ name: '本年度', time: 2 } { name: '本年度', time: 2 },
// { name:'往期历史' , time: 4 }
] ]
//初始化调本月线上 保费+ 本月线下保费 //初始化调本月线上 保费+ 本月线下保费
this.rank(1, 1, 1) this.rank(1, 1, 1)
...@@ -209,29 +210,34 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit { ...@@ -209,29 +210,34 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
*/ */
rank(time, platform, type) { rank(time, platform, type) {
this.performanceSelectedFlag = time; this.performanceSelectedFlag = time;
const param = { if(time==4){
mobileNo: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['mobileNo'], this.router.navigate(['/historical_rank'])
time: time, }else{
platform: platform, const param = {
type: type mobileNo: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['mobileNo'],
} time: time,
if (time == 1) { platform: platform,
this.leftWidth = '15%'; type: type
} else if (time == 2) {
this.leftWidth = '30%';
} else {
this.leftWidth = '17%';
}
this.myService.rank(param).subscribe((res) => {
if (res['success']) {
if (platform == 1) {
this.onlineInfo = res['data']['practitionerInfo'];
}
if (platform == 2) {
this.offlineInfo = res['data']['practitionerInfo'];
}
} }
}) if (time == 1) {
this.leftWidth = '15%';
} else if (time == 2) {
this.leftWidth = '30%';
} else {
this.leftWidth = '17%';
}
this.myService.rank(param).subscribe((res) => {
if (res['success']) {
if (platform == 1) {
this.onlineInfo = res['data']['practitionerInfo'];
}
if (platform == 2) {
this.offlineInfo = res['data']['practitionerInfo'];
}
}
});
}
} }
//截取字符串 //截取字符串
......
src/app/my/my-routing.module.ts
...@@ -47,6 +47,8 @@ import { ApprovalResultListComponent } from './approval-result-list/approval-res ...@@ -47,6 +47,8 @@ import { ApprovalResultListComponent } from './approval-result-list/approval-res
import { MyApplicationComponent } from './my-application/my-application.component'; import { MyApplicationComponent } from './my-application/my-application.component';
import { SuggestionComponent } from './suggestion/suggestion.component'; import { SuggestionComponent } from './suggestion/suggestion.component';
import { EmployeeSalaryComponent } from './application-process/employee-salary/employee-salary.component'; import { EmployeeSalaryComponent } from './application-process/employee-salary/employee-salary.component';
import { HistoricalRankComponent } from './historical-rank/historical-rank.component';
const myRoutes: Routes = [ const myRoutes: Routes = [
{ path: '', component: MyCenterHomeComponent, canActivate: [AuthGuard], data: [{ title: '银盾保险经纪 - 工作台' }] }, { path: '', component: MyCenterHomeComponent, canActivate: [AuthGuard], data: [{ title: '银盾保险经纪 - 工作台' }] },
{ path: 'material', component: MkMaterialComponent, canActivate: [AuthGuard] }, { path: 'material', component: MkMaterialComponent, canActivate: [AuthGuard] },
...@@ -99,7 +101,8 @@ const myRoutes: Routes = [ ...@@ -99,7 +101,8 @@ const myRoutes: Routes = [
{ path: 'approval_comments',component:ApprovalCommentsComponent,canActivate:[AuthGuard]}, { path: 'approval_comments',component:ApprovalCommentsComponent,canActivate:[AuthGuard]},
{ path: 'approval_result_list',component:ApprovalResultListComponent,data: [{ title: '审批流程' }],canActivate:[AuthGuard]}, { path: 'approval_result_list',component:ApprovalResultListComponent,data: [{ title: '审批流程' }],canActivate:[AuthGuard]},
{ path: 'my_application',component:MyApplicationComponent,data: [{ title: '我的报聘' }],canActivate:[AuthGuard]}, { path: 'my_application',component:MyApplicationComponent,data: [{ title: '我的报聘' }],canActivate:[AuthGuard]},
{ path: 'suggestion',component:SuggestionComponent,data: [{ title: '问题反馈' }],canActivate:[AuthGuard]} { path: 'suggestion',component:SuggestionComponent,data: [{ title: '问题反馈' }],canActivate:[AuthGuard]},
{ path: 'historical_rank', component: HistoricalRankComponent, canActivate: [AuthGuard] }
]; ];
......
src/app/my/my.module.ts
...@@ -57,9 +57,10 @@ import { ApprovalResultListComponent } from './approval-result-list/approval-res ...@@ -57,9 +57,10 @@ import { ApprovalResultListComponent } from './approval-result-list/approval-res
import { MyApplicationComponent } from './my-application/my-application.component'; import { MyApplicationComponent } from './my-application/my-application.component';
import { SuggestionComponent } from './suggestion/suggestion.component'; import { SuggestionComponent } from './suggestion/suggestion.component';
import { EmployeeSalaryComponent } from './application-process/employee-salary/employee-salary.component'; import { EmployeeSalaryComponent } from './application-process/employee-salary/employee-salary.component';
import { HistoricalRankComponent } from './historical-rank/historical-rank.component';
@NgModule({ @NgModule({
declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent, MedicalServiceComponent, InvitationComponent, RegisterComponent, EmployeeInfoComponent, EmployeeBasicInfoComponent, WorkExperienceComponent, PersonalPhotosComponent, EmployeeIdCardComponent, EmployeeEducationComponent, PersonalStatementComponent, SignatureComponent, EmployeeSubmitComponent, BankCardComponent, MemberDetailComponent, ApprovalListComponent, ApprovalCommentsComponent, ApprovalResultListComponent, MyApplicationComponent, SuggestionComponent, EmployeeSalaryComponent], declarations: [MyCenterHomeComponent, MkMaterialComponent, MkMaterialDetailComponent, FileUploadComponent, ImportantAnnouncementComponent, SalesDetailComponent, AnnouncementDetailComponent, MyBusinessComponent, MyBusinessDetailComponent, PickerComponent, MyToastComponent, SalesRankComponent, TeamRankComponent, RecruitingComponent, RecruitingDetailComponent, ThanksComponent, MySettingComponent, MySettingDetailComponent, MyNewsComponent, MyTargetComponent, TeamPanelComponent, SwitchNumberPipe, TeamSalesScoreComponent, ScoreDetailsComponent, BusinessCardComponent, OrderDetailComponent, SalaryComponent, TodoListComponent, AddTaskComponent, MedicalServiceComponent, InvitationComponent, RegisterComponent, EmployeeInfoComponent, EmployeeBasicInfoComponent, WorkExperienceComponent, PersonalPhotosComponent, EmployeeIdCardComponent, EmployeeEducationComponent, PersonalStatementComponent, SignatureComponent, EmployeeSubmitComponent, BankCardComponent, MemberDetailComponent, ApprovalListComponent, ApprovalCommentsComponent, ApprovalResultListComponent, MyApplicationComponent, SuggestionComponent, EmployeeSalaryComponent, HistoricalRankComponent],
imports: [ imports: [
CommonModule, CommonModule,
LifeCommonModule, LifeCommonModule,
......
src/app/my/my.service.ts
...@@ -563,4 +563,10 @@ export class MyService { ...@@ -563,4 +563,10 @@ export class MyService {
.post(url, JSON.stringify(organizationInfo)); .post(url, JSON.stringify(organizationInfo));
} }
//最后一步保存
hiringSubmit(param){
const url = this.ydapi + '/practitionerHiring/hiringSubmit';
return this.http
.post(url, JSON.stringify(param));
}
} }
src/app/my/recruiting-detail/recruiting-detail.component.ts
...@@ -95,9 +95,6 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -95,9 +95,6 @@ export class RecruitingDetailComponent implements OnInit {
} }
//获取基本信息 //获取基本信息
this.recruitListQuery(); this.recruitListQuery();
if(this.hiringBasicInfoId){
this.queryWholeInfo();
}
...@@ -106,7 +103,7 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -106,7 +103,7 @@ export class RecruitingDetailComponent implements OnInit {
selectTab(id) { selectTab(id) {
if (this.clickFlag == true) { if (this.clickFlag == true) {
if(id === 4){ if(id === 4){
if(this.approveStatus == -2 || this.approveStatus == 0){ if(this.approveStatus != null && this.approveStatus != '-1'){
this.openPopInfo(`${this.employQuery.name}已经提交所有报聘信息，不用重复邀请！`) this.openPopInfo(`${this.employQuery.name}已经提交所有报聘信息，不用重复邀请！`)
return; return;
} }
...@@ -428,6 +425,10 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -428,6 +425,10 @@ export class RecruitingDetailComponent implements OnInit {
} }
} }
} }
if(this.hiringBasicInfoId){
this.queryWholeInfo();
}
} }
}) })
} }
...@@ -468,12 +469,20 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -468,12 +469,20 @@ export class RecruitingDetailComponent implements OnInit {
} }
saveMembership(){ saveMembership(){
if(!this.employQuery.mdDropOptionId || this.employQuery.mdDropOptionId == null){
this.openPopInfo('报聘职级不能为空！');
return;
}
if(this.employQuery.mdDropOptionId != 30){ if(this.employQuery.mdDropOptionId != 30){
if(!this.employQuery.mentorPractitionerId || !this.employQuery.mentor){ if(!this.employQuery.mentorPractitionerId || !this.employQuery.mentor){
this.openPopInfo('S2级别以下,辅导人不可以为空!') this.openPopInfo('S2级别以下,辅导人不可以为空!')
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;
...@@ -482,7 +491,7 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -482,7 +491,7 @@ export class RecruitingDetailComponent implements OnInit {
this.employQuery = { this.employQuery = {
...this.employQuery, ...this.employQuery,
hiringBasicInfoId:this.approveStatus=='-1'?null:this.hiringBasicInfoId, hiringBasicInfoId:this.hiringBasicInfoId?this.hiringBasicInfoId:null,
loginId: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'] loginId: JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId']
} }
this.myService.saveMembership(this.employQuery).subscribe((res)=>{ this.myService.saveMembership(this.employQuery).subscribe((res)=>{
...@@ -516,7 +525,7 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -516,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,清空辅导人、体系、体系负责人
...@@ -530,6 +539,8 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -530,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;
...@@ -612,7 +623,12 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -612,7 +623,12 @@ export class RecruitingDetailComponent implements OnInit {
this.defalutMentor = membership.mentor; this.defalutMentor = membership.mentor;
}else{ }else{
if(this.approveStatus == null){ if(this.approveStatus == null){
this.defalutMentor = '请选择辅导人'; if(membership.mdDropOptionId != '30'){
this.defalutMentor = '请选择辅导人';
}else{
this.defalutMentor = '/';
}
}else{ }else{
this.defalutMentor = '/'; this.defalutMentor = '/';
} }
......
src/app/my/sales-detail/sales-detail.component.html
<div class="salesWrapper"> <div class="salesWrapper">
<div class="teamHeader">
<div class="teamItem teamInfo">
<img src="assets/images/history_cup.png" >
<div>
{{performanceTitle}}{{showType==='sales'?'佣金':'保单'}}
</div>
</div>
</div>
<div class="top"> <div class="top">
<ul class="tab"> <ul class="tab">
<li *ngFor="let item of performanceList" (click)="selectRang(item.time)" <li *ngFor="let item of performanceList" (click)="selectRang(item.time,item.name)"
[ngClass]="{selected:searchType==item.time}"> [ngClass]="{selected:searchType==item.time}">
{{item.name}} {{item.name}}
</li> </li>
...@@ -14,9 +22,6 @@ ...@@ -14,9 +22,6 @@
<div class="salesContent"> <div class="salesContent">
<div class="salesItem" *ngFor="let salesDetailItem of salesDetailList" <div class="salesItem" *ngFor="let salesDetailItem of salesDetailList"
(click)="jumpToOrderdetail(salesDetailItem.orderNo,salesDetailItem.platform,salesDetailItem.fortuneId)"> (click)="jumpToOrderdetail(salesDetailItem.orderNo,salesDetailItem.platform,salesDetailItem.fortuneId)">
<div class="icon_bolck" *ngIf="showType==='sales'"><span class="iconfont icon-yongjin"></span></div>
<div class="icon_bolck" *ngIf="showType==='orderform'"><span class="iconfont icon-baodanyangben"
style="font-size: 20px;"></span></div>
<div class="line"> <div class="line">
<div>投保人：{{salesDetailItem.holderName}}</div> <div>投保人：{{salesDetailItem.holderName}}</div>
<span class="iconfont icon-ar-r" style="font-size: 10px;position: relative; right: -2px;"></span> <span class="iconfont icon-ar-r" style="font-size: 10px;position: relative; right: -2px;"></span>
......
src/app/my/sales-detail/sales-detail.component.scss
.salesWrapper{ .salesWrapper{
width: 100%; width: 100%;
height: 100%; height: 100%;
overflow: auto; overflow: hidden;
.teamHeader{
background:url('../../../assets/images/team_bg.png') no-repeat;
background-size: 100%;
.teamInfo{
font-size: 26px;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
overflow: hidden;
border-radius: 6px;
color: #fff;
height: 125px;
font-weight: bold;
img{
width: 16%;
margin-left: -8%;
}
div{
letter-spacing: 5px;
margin-left: 5%;
margin-top: 2%;
}
}
}
.top{ .top{
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
...@@ -37,10 +62,11 @@ ...@@ -37,10 +62,11 @@
} }
.salesContent{ .salesContent{
overflow: auto;
height: 100%;
.salesItem{ .salesItem{
border-bottom: 1px #dcdcdc solid; border-bottom: 1px #dcdcdc solid;
padding: 10px; padding: 10px;
padding-left: 45px;
position: relative; position: relative;
.icon_bolck{ .icon_bolck{
border: 1px #dcdcdc solid; border: 1px #dcdcdc solid;
......
src/app/my/sales-detail/sales-detail.component.ts
...@@ -13,11 +13,13 @@ export class SalesDetailComponent implements OnInit { ...@@ -13,11 +13,13 @@ export class SalesDetailComponent implements OnInit {
performanceList: Array<any>; performanceList: Array<any>;
showType: any; showType: any;
platform: number; platform: number;
performanceTitle:string = '本月';
constructor(private router: Router, private myService: MyService, private activatedRoute: ActivatedRoute, public lifeCommonService: LifeCommonService) { constructor(private router: Router, private myService: MyService, private activatedRoute: ActivatedRoute, public lifeCommonService: LifeCommonService) {
this.performanceList = [ this.performanceList = [
{ time: 1, name: '本月' }, { time: 1, name: '本月' },
{ time: 3, name: '本季' }, { time: 3, name: '本季' },
{ time: 2, name: '本年度' } { time: 2, name: '本年度' },
// { time: 4, name: '历史' }
] ]
} }
...@@ -51,8 +53,9 @@ export class SalesDetailComponent implements OnInit { ...@@ -51,8 +53,9 @@ export class SalesDetailComponent implements OnInit {
selectRang(e) { selectRang(e,name) {
this.searchType = e; this.searchType = e;
this.performanceTitle = name;
this.practitionerPolicyListQuery(this.platform); this.practitionerPolicyListQuery(this.platform);
} }
......
src/assets/weui/weui.css
...@@ -2093,17 +2093,17 @@ a.weui-media-box:active{ ...@@ -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,11 +70,11 @@ input::placeholder { ...@@ -70,11 +70,11 @@ input::placeholder {
} }
.weui-dialog__btn{ .weui-dialog__btn{
background: red; color: #C81B1E;
color: #fff;
border-radius: 10px;
padding: 5px 12px; padding: 5px 12px;
font-weight: normal; font-weight: normal;
height: 40px;
line-height: 40px;
} }
.borderBottom:after, .borderTop:after { .borderBottom:after, .borderTop:after {
...@@ -176,6 +176,7 @@ footer.fixed{ ...@@ -176,6 +176,7 @@ footer.fixed{
line-height: 56px; line-height: 56px;
border-radius: 0; border-radius: 0;
z-index: 0; z-index: 0;
margin: 0 auto;
} }
.page_mark{ .page_mark{
width: 40px; width: 40px;
...@@ -189,6 +190,7 @@ footer.fixed{ ...@@ -189,6 +190,7 @@ footer.fixed{
.contentDetail.employ .am-list-body{ .contentDetail.employ .am-list-body{
margin:5.5px 10px; margin:5.5px 10px;
border-top: none;
.am-list-item{ .am-list-item{
padding-left: 0; padding-left: 0;
.am-list-line{ .am-list-line{
...@@ -225,6 +227,8 @@ footer.fixed{ ...@@ -225,6 +227,8 @@ footer.fixed{
} }
#page{ #page{
min-width: 320px;
max-width: 640px;
position: fixed; position: fixed;
bottom: 0; bottom: 0;
left: 0; left: 0;
...@@ -234,6 +238,8 @@ footer.fixed{ ...@@ -234,6 +238,8 @@ footer.fixed{
width: 100%; width: 100%;
justify-content: space-evenly; justify-content: space-evenly;
border-top: 1px #e1e1e1 solid; border-top: 1px #e1e1e1 solid;
right: 0;
margin: 0 auto;
div{ div{
width: 50%; width: 50%;
text-align: center; text-align: center;
...@@ -271,3 +277,4 @@ footer.fixed{ ...@@ -271,3 +277,4 @@ footer.fixed{
font-size: 22px; font-size: 22px;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment