Commit 80696286 by sunchao

新增经济合同查询接口

parent dccc7b9b
...@@ -52,7 +52,9 @@ ...@@ -52,7 +52,9 @@
<div class="toastWrapper toast" *ngIf="isShow"> <div class="toastWrapper toast" *ngIf="isShow">
</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 class="title"> <div class="title">
{{curTitle}} {{curTitle}}
</div> </div>
......
...@@ -95,7 +95,7 @@ ...@@ -95,7 +95,7 @@
position: fixed; position: fixed;
bottom: 0; bottom: 0;
width: 100%; width: 100%;
height: 70%; height: 75%;
left: 0; left: 0;
right: 0; right: 0;
margin: 0 auto; margin: 0 auto;
......
...@@ -33,6 +33,7 @@ export class PersonalStatementComponent implements OnInit { ...@@ -33,6 +33,7 @@ export class PersonalStatementComponent implements OnInit {
approvalIdentity:any; approvalIdentity:any;
approveStatus:any; approveStatus:any;
agreeBtnShow:boolean = false; agreeBtnShow:boolean = false;
timeCount:number = 5;
constructor(private myService: MyService, constructor(private myService: MyService,
private activatedRoute: ActivatedRoute, private activatedRoute: ActivatedRoute,
public lifeCommonService: LifeCommonService, public lifeCommonService: LifeCommonService,
...@@ -175,6 +176,14 @@ export class PersonalStatementComponent implements OnInit { ...@@ -175,6 +176,14 @@ export class PersonalStatementComponent implements OnInit {
contractItem.confirmStatus = 0; contractItem.confirmStatus = 0;
}else{ }else{
this.isShow = true; this.isShow = true;
setTimeout(() => {
let scrollTop = this.toastContent.nativeElement.scrollTop;
if(scrollTop==0){
setTimeout(() => {
this.agreeBtnShow = true;
}, 5000);
}
}, 500);
this.curContract = contractItem.termNote; this.curContract = contractItem.termNote;
this.curTitle = contractItem.termName; this.curTitle = contractItem.termName;
this.curContractId = contractItem.id; this.curContractId = contractItem.id;
...@@ -260,16 +269,16 @@ export class PersonalStatementComponent implements OnInit { ...@@ -260,16 +269,16 @@ export class PersonalStatementComponent implements OnInit {
}) })
} }
onScroll(event){ // onScroll(event){
let scrollTop = this.toastContent.nativeElement.scrollTop; // let scrollTop = this.toastContent.nativeElement.scrollTop;
let clientHeight = this.toastContent.nativeElement.clientHeight; // let clientHeight = this.toastContent.nativeElement.clientHeight;
let scrollHeight = this.toastContent.nativeElement.scrollHeight ; // let scrollHeight = this.toastContent.nativeElement.scrollHeight ;
if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) { // if(scrollHeight > clientHeight && scrollTop + clientHeight === scrollHeight) {
setTimeout(() => { // setTimeout(() => {
this.agreeBtnShow = true; // this.agreeBtnShow = true;
}, 10000); // }, 5000);
} // }
} // }
viewNext(){ viewNext(){
if(this.type == 'personal_statement'){ if(this.type == 'personal_statement'){
...@@ -283,4 +292,19 @@ export class PersonalStatementComponent implements OnInit { ...@@ -283,4 +292,19 @@ export class PersonalStatementComponent implements OnInit {
goBack(){ goBack(){
history.go(-1) history.go(-1)
} }
startCount(){
// if(!this.timer){
// this.count = TIME_COUNT;
// this.timer = setInterval(()=>{
// if(this.count > 0 && this.count <= TIME_COUNT){
// this.count--;
// }else{
// clearInterval(this.timer);
// this.timer = null;
// }
// },1000)
// }
}
} }
...@@ -8,6 +8,17 @@ ...@@ -8,6 +8,17 @@
</li> </li>
</ul> </ul>
<div style="padding: 10px 0px 0px 0px;"> <div style="padding: 10px 0px 0px 0px;">
<div class="contentList" *ngIf="selectedId==0">
<ul>
<li>
<a href="{{practitionerInfo?.contractOssPath}}" download="{{practitionerInfo?.contractOssPath}}" target="_blank">
<div><i class="iconfont icon-pdf"></i></div>
<div title="{{practitionerInfo?.name}}">{{practitionerInfo?.name}}的经纪合同</div>
<div style="position: absolute;right: 5px;top: 6px;"><i class="iconfont icon-xiazai"></i></div>
</a>
</li>
</ul>
</div>
<ydlife-thanks *ngIf="selectedId==1" [isShowClose]="isShowClose"></ydlife-thanks> <ydlife-thanks *ngIf="selectedId==1" [isShowClose]="isShowClose"></ydlife-thanks>
<div class="contentList" *ngIf="selectedId==2"> <div class="contentList" *ngIf="selectedId==2">
<ul> <ul>
......
...@@ -8,21 +8,28 @@ import { MyService } from "../my.service"; ...@@ -8,21 +8,28 @@ import { MyService } from "../my.service";
}) })
export class MyApplicationComponent implements OnInit { export class MyApplicationComponent implements OnInit {
titleList:Array<any>; titleList:Array<any>;
selectedId:number = 1; selectedId:number = 0;
isShowClose:boolean = false; isShowClose:boolean = false;
fileUploadItemList: Array<any>; fileUploadItemList: Array<any>;
practitionerId:number;
practitionerInfo:any;
constructor(private myService: MyService) { } constructor(private myService: MyService) { }
ngOnInit() { ngOnInit() {
this.practitionerId =JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
this.titleList = [ this.titleList = [
{ id: 0, name: '经纪合同' }, { id: 0, name: '经纪合同' },
{ id: 1, name: '欢迎信' }, { id: 1, name: '欢迎信' },
{ id: 2, name: '公司制度' } { id: 2, name: '公司制度' }
] ]
this.queryPractitionerInfo();
} }
selectTab(id) { selectTab(id) {
this.selectedId = id; this.selectedId = id;
if(this.selectedId == 0){
this.queryPractitionerInfo();
}
if(this.selectedId==2){ if(this.selectedId==2){
this.fileUpload(3, 0, 19, 'yd_download_file_type', 81); this.fileUpload(3, 0, 19, 'yd_download_file_type', 81);
...@@ -37,4 +44,13 @@ export class MyApplicationComponent implements OnInit { ...@@ -37,4 +44,13 @@ export class MyApplicationComponent implements OnInit {
} }
}); });
} }
//获取经纪合同
queryPractitionerInfo(){
this.myService.queryPractitionerInfo({practitionerId:this.practitionerId}).subscribe((res)=>{
if(res['success']){
this.practitionerInfo = res['data']['practitioner'];
}
})
}
} }
...@@ -545,8 +545,15 @@ export class MyService { ...@@ -545,8 +545,15 @@ export class MyService {
*/ */
customerComment(comment) { customerComment(comment) {
const url = this.API + '/customerComment'; const url = this.API + '/customerComment';
return this.http return this.http
.post(url, JSON.stringify(comment)); .post(url, JSON.stringify(comment));
} }
queryPractitionerInfo(param){
const url = this.ydapi + '/practitionerHiring/queryPractitionerInfo';
return this.http
.post(url, JSON.stringify(param));
}
} }
...@@ -5,12 +5,11 @@ ...@@ -5,12 +5,11 @@
// background:#f7f7f2; // background:#f7f7f2;
background: #fff; background: #fff;
.tab { .tab {
display: flex; display: flex;
list-style: none; list-style: none;
margin: 10px 0px; margin: 10px 0px;
padding-left: 1%; justify-content: space-around;
li { li {
margin-right: 10px;
line-height: 30px; line-height: 30px;
height: 30px; height: 30px;
width: 25%; width: 25%;
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
if (document.readyState == "complete") { if (document.readyState == "complete") {
setTimeout(() => { setTimeout(() => {
loading.style.display = 'none'; loading.style.display = 'none';
}, 4000) }, 3000)
} }
} }
......
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