Commit ac4a5b05 by sunchao

判断报聘页面信息是否可修改&审批结果页面

parent 7a4d5d3b
...@@ -7,16 +7,18 @@ ...@@ -7,16 +7,18 @@
<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()"/> (blur)="bs()" [disabled]="approvalIdentity || approveStatus!=null" />
</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,'')"/> (blur)="bs(2)" onkeyup="this.value=this.value.replace(/\D/g,'')" maxlength="19"
[disabled]="approvalIdentity || approveStatus!=null"/>
</div> </div>
<div class="contentItem" style="border:none;" *ngIf="!approvalIdentity"> <div class="contentItem" style="border:none;" *ngIf="!approvalIdentity">
<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"/>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -18,6 +18,7 @@ export class BankCardComponent implements OnInit { ...@@ -18,6 +18,7 @@ export class BankCardComponent implements OnInit {
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any; 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) { }
...@@ -91,8 +92,8 @@ export class BankCardComponent implements OnInit { ...@@ -91,8 +92,8 @@ export class BankCardComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{ this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{
console.log(res)
if(res['success']){ if(res['success']){
this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
this.bankAccountId = res['data']['hiringBasicInfo']['bankAccountId']; this.bankAccountId = res['data']['hiringBasicInfo']['bankAccountId'];
this.bankAccountOpening = res['data']['hiringBasicInfo']['bankAccountOpening']; this.bankAccountOpening = res['data']['hiringBasicInfo']['bankAccountOpening'];
this.sureBankAccountId = res['data']['hiringBasicInfo']['bankAccountId']; this.sureBankAccountId = res['data']['hiringBasicInfo']['bankAccountId'];
......
...@@ -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"> [disabled]="approvalIdentity || approveStatus!=null">
</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"> [disabled]="approvalIdentity || approveStatus!=null">
<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"> [disabled]="approvalIdentity || approveStatus!=null">
</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" [disabled]="editEmployBasicInfo.idTypeId==1 || approvalIdentity || approveStatus!=null"
> >
出生日期 出生日期
</ListItem> </ListItem>
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
<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]="editEmployBasicInfo.idTypeId==1" (blur)="bs(null)"
[disabled]="approvalIdentity"> [disabled]="approvalIdentity || approveStatus!=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,13 +68,13 @@ ...@@ -68,13 +68,13 @@
<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"> [disabled]="approvalIdentity || approveStatus!=null">
</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"></div> [disabled]="approvalIdentity || approveStatus!=null"></div>
</div> </div>
</div> </div>
</div> </div>
......
...@@ -22,6 +22,7 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -22,6 +22,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
minDate:any = new Date('1900-01-01'); minDate:any = new Date('1900-01-01');
maxDate:any = new Date(); maxDate:any = new Date();
approvalIdentity:any; 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) { }
...@@ -206,7 +207,7 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -206,7 +207,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
// 选择地址信息 // 选择地址信息
selectedArea(type) { selectedArea(type) {
// this.sendRemoveScrollContent.emit(1); // this.sendRemoveScrollContent.emit(1);
if (type === 1 && !this.approvalIdentity ) { if (type === 1 && !this.approvalIdentity && this.approveStatus==null) {
// 户籍地址 // 户籍地址
this.houseFlag = true; this.houseFlag = true;
} }
...@@ -242,6 +243,7 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -242,6 +243,7 @@ export class EmployeeBasicInfoComponent implements OnInit {
if(!res['data']['hiringBasicInfo']['mobileNo']){ if(!res['data']['hiringBasicInfo']['mobileNo']){
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.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
this.showPractitionerBirthdate= new Date(res['data']['hiringBasicInfo']['practitionerBirthdate']); this.showPractitionerBirthdate= new Date(res['data']['hiringBasicInfo']['practitionerBirthdate']);
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){
...@@ -252,7 +254,6 @@ export class EmployeeBasicInfoComponent implements OnInit { ...@@ -252,7 +254,6 @@ export class EmployeeBasicInfoComponent implements OnInit {
}else{ }else{
this.addressInfo = null; this.addressInfo = null;
} }
} }
}) })
} }
......
...@@ -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"> [disabled]="approvalIdentity || approveStatus!=null">
<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"/> <input class="form-control" [(ngModel)]="lastGraduateSchool" [disabled]="approvalIdentity || approveStatus!=null"/>
</div> </div>
<div class="contentItem" style="border:none;"> <div class="contentItem" style="border:none;">
<span>毕业证</span> <span>毕业证</span>
......
...@@ -21,6 +21,7 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -21,6 +21,7 @@ export class EmployeeEducationComponent implements OnInit {
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any; 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,private changeDetectorRef: ChangeDetectorRef) { public myService:MyService,private changeDetectorRef: ChangeDetectorRef) {
...@@ -92,7 +93,7 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -92,7 +93,7 @@ export class EmployeeEducationComponent implements OnInit {
} }
selectPic(){ selectPic(){
if(!this.approvalIdentity){ if(!this.approvalIdentity && this.approveStatus==null){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -151,6 +152,7 @@ export class EmployeeEducationComponent implements OnInit { ...@@ -151,6 +152,7 @@ export class EmployeeEducationComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
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.lastGraduateGrade = res['data']['hiringBasicInfo']['lastGraduateGrade']; this.lastGraduateGrade = res['data']['hiringBasicInfo']['lastGraduateGrade'];
this.lastGraduateCode = res['data']['hiringBasicInfo']['lastGraduateCode']; this.lastGraduateCode = res['data']['hiringBasicInfo']['lastGraduateCode'];
this.lastGraduateSchool = res['data']['hiringBasicInfo']['lastGraduateSchool']; this.lastGraduateSchool = res['data']['hiringBasicInfo']['lastGraduateSchool'];
......
...@@ -22,6 +22,7 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -22,6 +22,7 @@ export class EmployeeIdCardComponent implements OnInit {
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any; 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,private changeDetectorRef: ChangeDetectorRef) { public myService:MyService,private changeDetectorRef: ChangeDetectorRef) {
...@@ -71,7 +72,7 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -71,7 +72,7 @@ export class EmployeeIdCardComponent implements OnInit {
} }
selectPic(type){ selectPic(type){
if(!this.approvalIdentity){ if(!this.approvalIdentity && this.approveStatus==null){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -135,8 +136,8 @@ export class EmployeeIdCardComponent implements OnInit { ...@@ -135,8 +136,8 @@ export class EmployeeIdCardComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{ this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{
console.log(res)
if(res['success']){ if(res['success']){
this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
if(res['data']['hiringBasicInfo']['idFrontPageOssPath']){ if(res['data']['hiringBasicInfo']['idFrontPageOssPath']){
this.frontVxUrl = res['data']['hiringBasicInfo']['idFrontPageOssPath']; this.frontVxUrl = res['data']['hiringBasicInfo']['idFrontPageOssPath'];
} }
......
...@@ -40,7 +40,7 @@ export class InvitationComponent implements OnInit { ...@@ -40,7 +40,7 @@ export class InvitationComponent implements OnInit {
const imgUrl = this.lifeCustomerInfo.practitionerBasicInfo.headImagePath ? this.lifeCustomerInfo.practitionerBasicInfo.headImagePath : `${environment.ORIGINNAME}/ydLife/assets/images/icons/meng.png`; const imgUrl = this.lifeCustomerInfo.practitionerBasicInfo.headImagePath ? this.lifeCustomerInfo.practitionerBasicInfo.headImagePath : `${environment.ORIGINNAME}/ydLife/assets/images/icons/meng.png`;
this.lifeCommonService.shareStatusPublish(1); this.lifeCommonService.shareStatusPublish(1);
this.lifeCommonService.wxShare( this.lifeCommonService.wxShare(
`${this.lifeCustomerInfo.practitionerBasicInfo.name}`, '邀请函',
'您的好友向你发出了邀请。加入靠谱的团队、一起做靠谱的事。', '您的好友向你发出了邀请。加入靠谱的团队、一起做靠谱的事。',
`https://${window.location.host}/ydLife/invitees?hiringBasicInfoId=${this.hiringBasicInfoId}&invitatorName=${this.invitatorName}`, `https://${window.location.host}/ydLife/invitees?hiringBasicInfoId=${this.hiringBasicInfoId}&invitatorName=${this.invitatorName}`,
imgUrl); imgUrl);
......
...@@ -17,6 +17,7 @@ export class PersonalPhotosComponent implements OnInit { ...@@ -17,6 +17,7 @@ export class PersonalPhotosComponent implements OnInit {
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any; 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,private changeDetectorRef: ChangeDetectorRef) { } public myService:MyService,private changeDetectorRef: ChangeDetectorRef) { }
...@@ -30,7 +31,7 @@ export class PersonalPhotosComponent implements OnInit { ...@@ -30,7 +31,7 @@ export class PersonalPhotosComponent implements OnInit {
} }
selectPic(){ selectPic(){
if(!this.approvalIdentity){ if(!this.approvalIdentity && this.approveStatus==null){
if(this.lifeCommonService.isWeiXin()){ if(this.lifeCommonService.isWeiXin()){
// 5.1 拍照、本地选图 // 5.1 拍照、本地选图
const t = this; const t = this;
...@@ -111,13 +112,12 @@ export class PersonalPhotosComponent implements OnInit { ...@@ -111,13 +112,12 @@ export class PersonalPhotosComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{ this.myService.queryWholeInfo({hiringBasicInfoId:hiringBasicInfoId}).subscribe((res)=>{
if(res['success']){
if(res['success']){ if(res['success']){
this.vxUrl = res['data']['hiringBasicInfo']['personerPictureOssPath'] this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
this.vxUrl = res['data']['hiringBasicInfo']['personerPictureOssPath']
}else{ }else{
this.vxUrl = null; this.vxUrl = null;
} }
}
}) })
} }
......
...@@ -31,6 +31,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -31,6 +31,7 @@ export class PersonalStatementComponent implements OnInit {
isAllAgree:boolean = false; isAllAgree:boolean = false;
contractTermsConfirmsListParm:Array<any>; contractTermsConfirmsListParm:Array<any>;
approvalIdentity:any; approvalIdentity:any;
approveStatus:any;
constructor(private myService: MyService, constructor(private myService: MyService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
public lifeCommonService: LifeCommonService, public lifeCommonService: LifeCommonService,
...@@ -94,7 +95,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -94,7 +95,7 @@ export class PersonalStatementComponent implements OnInit {
//选择个人声明 //选择个人声明
selectStatements(personalStatements){ selectStatements(personalStatements){
if(!this.approvalIdentity){ if(!this.approvalIdentity && this.approveStatus==null){
if( personalStatements.status ==1){ if( personalStatements.status ==1){
personalStatements.status = 0; personalStatements.status = 0;
}else{ }else{
...@@ -168,7 +169,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -168,7 +169,7 @@ export class PersonalStatementComponent implements OnInit {
} }
readContract(contractItem){ readContract(contractItem){
if(!this.approvalIdentity){ if(!this.approvalIdentity && this.approveStatus==null){
if( contractItem.confirmStatus ==1){ if( contractItem.confirmStatus ==1){
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
}else{ }else{
...@@ -221,6 +222,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -221,6 +222,7 @@ export class PersonalStatementComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
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'];
if(this.type=="personal_statement"){ if(this.type=="personal_statement"){
if(res['data']['hiringPersonalStatementsList'].length >0){ if(res['data']['hiringPersonalStatementsList'].length >0){
this.dropOptionsInfoList = res['data']['hiringPersonalStatementsList']; this.dropOptionsInfoList = res['data']['hiringPersonalStatementsList'];
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
</signature-pad> </signature-pad>
<img [src]="imgStr" alt="签名" *ngIf="isSignatureShow"> <img [src]="imgStr" alt="签名" *ngIf="isSignatureShow">
</div> </div>
<div class="signature_action" *ngIf="!approvalIdentity"> <div class="signature_action" *ngIf="!approvalIdentity && approveStatus == null">
<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>
......
...@@ -20,6 +20,7 @@ export class SignatureComponent implements OnInit { ...@@ -20,6 +20,7 @@ export class SignatureComponent implements OnInit {
isSignatureShow:boolean; isSignatureShow:boolean;
approvalIdentity:any; approvalIdentity:any;
viewApprovalInfo:any; viewApprovalInfo:any;
approveStatus:any;
@ViewChild(SignaturePad) signaturePad : SignaturePad; @ViewChild(SignaturePad) signaturePad : SignaturePad;
constructor(private activatedRoute: ActivatedRoute, constructor(private activatedRoute: ActivatedRoute,
private router: Router,public lifeCommonService:LifeCommonService, private router: Router,public lifeCommonService:LifeCommonService,
...@@ -86,6 +87,7 @@ export class SignatureComponent implements OnInit { ...@@ -86,6 +87,7 @@ export class SignatureComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
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'];
if(res['data']['hiringBasicInfo']['personalSignOssPath']){ if(res['data']['hiringBasicInfo']['personalSignOssPath']){
this.imgStr = res['data']['hiringBasicInfo']['personalSignOssPath']; this.imgStr = res['data']['hiringBasicInfo']['personalSignOssPath'];
this.isSignatureShow = true; this.isSignatureShow = true;
......
...@@ -3,7 +3,7 @@ ...@@ -3,7 +3,7 @@
<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"> <div class="content" *ngIf="!approvalIdentity || approveStatus==null">
<div class="contentDetail employ"> <div class="contentDetail employ">
<div class="contentItem"> <div class="contentItem">
<span>工作单位</span> <span>工作单位</span>
...@@ -43,7 +43,7 @@ ...@@ -43,7 +43,7 @@
</div> </div>
</div> </div>
<div class="add_wrapper" *ngIf="!approvalIdentity"> <div class="add_wrapper" *ngIf="!approvalIdentity || approveStatus==null">
<i class="iconfont icon-jiahao" (click)="addExperienceList()"></i> <i class="iconfont icon-jiahao" (click)="addExperienceList()"></i>
<span>确认并添加</span> <span>确认并添加</span>
</div> </div>
......
...@@ -24,6 +24,7 @@ export class WorkExperienceComponent implements OnInit { ...@@ -24,6 +24,7 @@ export class WorkExperienceComponent implements OnInit {
isNeedAlert: boolean; isNeedAlert: boolean;
dialogInfo: any; dialogInfo: any;
approvalIdentity:any; 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) {
...@@ -42,13 +43,15 @@ export class WorkExperienceComponent implements OnInit { ...@@ -42,13 +43,15 @@ 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)
}else{ this.showworkingStart=null;
this.experienceList = []; this.showworkingEnd = null;
this.addExperience = new ExperienceQuery(null, null, null,null);
} }
const experienceParam = { const experienceParam = {
workingExperienceList:this.experienceList, workingExperienceList:this.experienceList,
hiringBasicInfoId:this.hiringBasicInfoId hiringBasicInfoId:this.hiringBasicInfoId
} }
this.myService.saveWorkingExperience(experienceParam).subscribe((res)=>{ this.myService.saveWorkingExperience(experienceParam).subscribe((res)=>{
if(res['success']){ if(res['success']){
this.router.navigate(['/personal_photos'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} }); this.router.navigate(['/personal_photos'],{ queryParams: { hiringBasicInfoId:this.hiringBasicInfoId} });
...@@ -117,6 +120,7 @@ export class WorkExperienceComponent implements OnInit { ...@@ -117,6 +120,7 @@ export class WorkExperienceComponent implements OnInit {
queryWholeInfo(hiringBasicInfoId){ queryWholeInfo(hiringBasicInfoId){
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'];
const experienceList = res['data']['hiringWorkingExperienceList']; const experienceList = res['data']['hiringWorkingExperienceList'];
for(let i=0;i<experienceList.length;i++){ for(let i=0;i<experienceList.length;i++){
this.experienceList.push({workingCompany:experienceList[i].workingCompany, this.experienceList.push({workingCompany:experienceList[i].workingCompany,
......
<p> <div class="wrapper">
approval-result-list works! <div style="font-size: 20px;"> &lt; </div>
</p> <div class="record_wrapper">
<div class="record_content" *ngFor="let recordsItem of recordsList">
<div class="left">
<img [src]="getDefaultHeadImg(recordsItem.headImagePath)" alt="头像">
<div></div>
</div>
<div class="right">
<div style="font-size: 18px;color: #000;font-weight: 700;">{{recordsItem.approveStepName}}</div>
<div>
<span>
{{recordsItem.approvingPractitionerName}} ({{recordsItem.approvingStatus}})
</span>
<span>
{{recordsItem.hiringAt?recordsItem.hiringAt.substr(0,10):null}}
</span>
</div>
<div>
{{recordsItem.rejectNote}}
</div>
<div>
{{recordsItem.interviewAssessment}}
</div>
</div>
</div>
</div>
</div>
.wrapper{
padding: 5px 13px 10px 13px;
.record_wrapper{
.record_content{
display: flex;
justify-content: space-between;
div.left{
width: 30%;
img{
width: 60%;
border-radius: 8px;
}
}
div.right{
width: 70%;
div{
font-size: 14px;
color: #999;
display: flex;
justify-content: space-between;
margin: 5px auto;
}
}
}
}
}
\ No newline at end of file
import { Component, OnInit } from '@angular/core'; import { Component, OnInit } from '@angular/core';
import { MyService } from '../my.service' import { MyService } from '../my.service'
import { ActivatedRoute,Router } from "@angular/router"; import { ActivatedRoute,Router } from "@angular/router";
import { environment } from '../../../environments/environment';
@Component({ @Component({
selector: 'ydlife-approval-result-list', selector: 'ydlife-approval-result-list',
...@@ -36,4 +37,11 @@ export class ApprovalResultListComponent implements OnInit { ...@@ -36,4 +37,11 @@ export class ApprovalResultListComponent implements OnInit {
}) })
} }
getDefaultHeadImg(str){
if(!str){
return `${environment.DOMAINNAME}/assets/img/meng.png`;
}else{
return str
}
}
} }
...@@ -137,11 +137,12 @@ ...@@ -137,11 +137,12 @@
<div class="contentDetail employ"> <div class="contentDetail employ">
<div class="contentItem"> <div class="contentItem">
<span>被邀请人</span> <span>被邀请人</span>
<input type="text" [(ngModel)]="this.employQuery.name" class="form-control" /> <input type="text" [(ngModel)]="this.employQuery.name" class="form-control" [disabled]="approveStatus!=null" />
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>报聘职级</span> <span>报聘职级</span>
<select [(ngModel)]="employQuery.mdDropOptionId" class="form-control" (ngModelChange)="getName(1,employQuery.mdDropOptionId)"> <select [(ngModel)]="employQuery.mdDropOptionId" class="form-control" (ngModelChange)="getName(1,employQuery.mdDropOptionId)"
[disabled]="approveStatus!=null">
<option value=null>请选择</option> <option value=null>请选择</option>
<option [value]='levelInfos.id' *ngFor="let levelInfos of practitionerLevelInfos"> <option [value]='levelInfos.id' *ngFor="let levelInfos of practitionerLevelInfos">
{{levelInfos.dropOptionCode}} {{levelInfos.dropOptionName}} {{levelInfos.dropOptionCode}} {{levelInfos.dropOptionName}}
...@@ -150,7 +151,8 @@ ...@@ -150,7 +151,8 @@
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>辅导人</span> <span>辅导人</span>
<select [(ngModel)]="employQuery.mentorPractitionerId" class="form-control" (ngModelChange)="getName(2,employQuery.mentorPractitionerId);getPractitionerDetails(employQuery.mentorPractitionerId)"> <select [(ngModel)]="employQuery.mentorPractitionerId" class="form-control" (ngModelChange)="getName(2,employQuery.mentorPractitionerId);getPractitionerDetails(employQuery.mentorPractitionerId)"
[disabled]="approveStatus!=null">
<option value=null>请选择</option> <option value=null>请选择</option>
<option [value]='practitionerInfo.id' *ngFor="let practitionerInfo of practitionerList"> <option [value]='practitionerInfo.id' *ngFor="let practitionerInfo of practitionerList">
{{practitionerInfo.name}} {{practitionerInfo.name}}
...@@ -159,7 +161,8 @@ ...@@ -159,7 +161,8 @@
</div> </div>
<div class="contentItem"> <div class="contentItem">
<span>介绍人</span> <span>介绍人</span>
<select [(ngModel)]="employQuery.introducerPractitionerId" class="form-control" (ngModelChange)="getName(3,employQuery.introducerPractitionerId);"> <select [(ngModel)]="employQuery.introducerPractitionerId" class="form-control" (ngModelChange)="getName(3,employQuery.introducerPractitionerId);"
[disabled]="approveStatus!=null">
<option value=null>请选择</option> <option value=null>请选择</option>
<option [value]='practitionerInfo.id' *ngFor="let practitionerInfo of practitionerList"> <option [value]='practitionerInfo.id' *ngFor="let practitionerInfo of practitionerList">
{{practitionerInfo.name}} {{practitionerInfo.name}}
......
...@@ -46,6 +46,8 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -46,6 +46,8 @@ export class RecruitingDetailComponent implements OnInit {
practitionerList:Array<any>; practitionerList:Array<any>;
hiringBasicInfoId:any; hiringBasicInfoId:any;
practitionerName:any; practitionerName:any;
//-2已填完,null未填完,-1拒绝0通过
approveStatus:any;
constructor( constructor(
private activateRoute: ActivatedRoute, private activateRoute: ActivatedRoute,
public lifeCommonService: LifeCommonService, public lifeCommonService: LifeCommonService,
...@@ -459,6 +461,7 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -459,6 +461,7 @@ export class RecruitingDetailComponent implements OnInit {
} }
this.employQuery = { this.employQuery = {
...this.employQuery, ...this.employQuery,
hiringBasicInfoId:this.approveStatus=='-1'?null:this.hiringBasicInfoId,
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)=>{
...@@ -541,6 +544,7 @@ export class RecruitingDetailComponent implements OnInit { ...@@ -541,6 +544,7 @@ export class RecruitingDetailComponent implements OnInit {
this.employQuery = membership; this.employQuery = membership;
this.employQuery.name = this.editRecruiting.name; this.employQuery.name = this.editRecruiting.name;
this.employQuery.practitionerPotentialId = this.potentialId; this.employQuery.practitionerPotentialId = this.potentialId;
this.approveStatus = res['data']['hiringBasicInfo']['approveStatus'];
}else{ }else{
this.toastDialog = true; this.toastDialog = true;
this.toastInfo = { this.toastInfo = {
......
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