Skip to content

Y
ydLife
Commit f9addd20 by sunchao
Options

团队成员接口对接&菜单栏调整&首页产品跳转第三方bug修复

parent f4b59caa
Showing with 380 additions and 65 deletions
src/app/domain/plans.ts
......@@ -38,4 +38,6 @@ export class Plans {
isActive?:any;
isThirdPartyPurchase?:any;
thirdPartyPurchaseUrl?:any;
isThirdpartyPurchase?:any;
thirdpartyPurchaseUrl?:any;
}
src/app/my/announcement-detail/announcement-detail.component.html
......@@ -9,9 +9,10 @@
</div>
</div>
<div class="announcementItem">
<div class="announcement_title"><span
class="announcement_type">【{{announcementLists?.announcementTypeName}}】</span><span
[innerHtml]="announcementLists?.title |safeHtml"></span></div>
<div class="announcement_title">
<!-- <span class="announcement_type">【{{announcementLists?.announcementTypeName}}】</span> -->
<span [innerHtml]="announcementLists?.title |safeHtml"></span>
</div>
<div [innerHtml]="announcementLists?.content | safeHtml" class="announcement_content"></div>
<!-- <div class="announcement_at">上海银盾保险经纪有限公司 &nbsp;&nbsp;{{announcementLists?.announcementAt}}</div> -->
</div>
......
src/app/my/file-upload/file-upload.component.html
<div class="fileUploadLists">
<div class="nav" *ngIf="!fileUploadType">
<ul class="left" [ngStyle]="{'width':type == 'fileUpload'?'100%':'120%'}">
<li *ngFor="let categoryItem of categoryList" (click)="switchCategory(categoryItem.id)"
[ngClass]="{'actived':selectedCategoryId===categoryItem.id}">
<li *ngFor="let categoryItem of categoryList" (click)="switchCategory(categoryItem.dropOptionCode)"
[ngClass]="{'actived':selectedCategoryId===categoryItem.dropOptionCode}">
{{categoryItem.dropOptionName}}
</li>
</ul>
......
src/app/my/file-upload/file-upload.component.ts
import { Component, OnInit } from '@angular/core';
import { LifeCommonService } from "../../common/life-common.service";
import { MyService } from "../my.service";
import { ActivatedRoute } from "@angular/router";
......@@ -13,7 +12,7 @@ export class FileUploadComponent implements OnInit {
// 判断是文件下载还是教育培训
type: string;
categoryList: Array<any>;
selectedCategoryId: number;
selectedCategoryId: any;
fileUploadType:any;
constructor(private myService: MyService, private activatedRoute: ActivatedRoute) {
}
......@@ -47,9 +46,17 @@ export class FileUploadComponent implements OnInit {
this.categoryList = res['data']['dropMasterInfoList'][0]['dropOptionsInfoList'];
if (this.categoryList.length > 0) {
if(this.fileUploadType){
this.selectedCategoryId = 81;
if(this.fileUploadType == 'management'){
this.selectedCategoryId = 'salestopic';
}else if(this.fileUploadType == 'introduce'){
this.selectedCategoryId = 'conception';
}else if(this.fileUploadType == 'newRecruits'){
this.selectedCategoryId = 'userPackage';
}else if(this.fileUploadType == 'commissionPolicy'){
this.selectedCategoryId = 'product';
}
}else{
this.selectedCategoryId = this.categoryList[0].id;
this.selectedCategoryId = this.categoryList[0].dropOptionCode;
}
this.switchCategory(this.selectedCategoryId)
}
......
src/app/my/important-announcement/important-announcement.component.html
<div class="nav">
<div class="nav" *ngIf="importantAnnouncementLists?.length >1">
<ul class="left">
<li *ngFor="let categoryItem of importantAnnouncementLists" (click)="switchCategory(categoryItem.id)"
[ngClass]="{'actived':selectedCategoryId===categoryItem.id}">
......@@ -14,7 +14,7 @@
<div class="title">{{this.lifeCommonService.delHtmlTag(announcementInfo.title)}}</div>
<div class="date">
<!-- <span> 上海银盾保险经纪有限公司</span> -->
<span>{{announcementInfo.createdAt}}</span>
<span>{{announcementInfo.announcementAt}}</span>
</div>
</div>
</div>
\ No newline at end of file
src/app/my/important-announcement/important-announcement.component.scss
......@@ -52,7 +52,7 @@
.title{
margin-bottom: 8px;
font-size: 16px;
font-weight: bold;
// font-weight: bold;
overflow: hidden;
text-overflow:ellipsis;
white-space: nowrap;
......
src/app/my/member-detail/member-detail.component.html
......@@ -4,7 +4,7 @@
<!-- <span class="icon-tuandui iconfont"
style="position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"></span> -->
<img src="assets/images/cup_icon.png" >
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName.split('').join('/')}}/战/队</div>
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName}}战队</div>
</div>
</div>
<div class="rankInfoWrapper">
......@@ -14,8 +14,8 @@
</div>
<div><span>手机号</span><span>{{practitionerDeatil?.mobileNo}}</span></div>
<div><span>级别和职称</span><span>{{practitionerDeatil?.practitionerLevel}}-{{practitionerDeatil?.practitionerTitle}}</span></div>
<div><span>分公司和体系</span><span>{{practitionerDeatil?.branch}}-{{practitionerDeatil?.system}}</span></div>
<div><span>辅导人</span><span>{{practitionerDeatil?.mentor}}</span></div>
<div><span>分公司和体系</span><span style="white-space: nowrap;overflow: hidden;text-overflow: ellipsis;">{{practitionerDeatil?.allSystemName}}</span></div>
<div><span>直接辅导人</span><span>{{practitionerDeatil?.mentor}}</span></div>
<div><span>介绍人</span><span>{{practitionerDeatil?.introducer}}</span></div>
<div><span>性别</span><span>{{practitionerDeatil?.gender}}</span></div>
<div><span>年龄</span><span>{{practitionerDeatil?.age}}</span></div>
......
src/app/my/member-detail/member-detail.component.scss
......@@ -36,10 +36,10 @@
align-items: center;
border-bottom: 1px #ddd solid;
span{
width: 35%;
width: 30%;
}
span:nth-child(2){
width: 65%;
width: 70%;
text-align: right;
}
}
......
src/app/my/member-detail/member-detail.component.ts
......@@ -12,20 +12,22 @@ export class MemberDetailComponent implements OnInit {
subordinateSystemName: any;
teamMemberList:Array<any>;
practitionerDeatil:any;
teamList:Array<any>;
constructor(private activateRoute: ActivatedRoute,private myService:MyService) { }
ngOnInit() {
this.practitionerId = Number(this.activateRoute.snapshot.paramMap.get('practitionerId'));
this.subordinateSystemName = sessionStorage.getItem('subordinateSystemName');
this.queryTeamMemberDetail();
}
queryTeamMemberDetail(){
const practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
this.myService.queryTeamMemberDetail({practitionerId:practitionerId}).subscribe((res)=>{
this.myService.queryTeamMemberDetail({practitionerId:this.practitionerId}).subscribe((res)=>{
if(res['success']){
this.teamMemberList = res['data']['teamMemberDetail'];
this.practitionerDeatil = this.teamMemberList.filter((item)=>{
this.teamList = res['data']['teamMemberList'];
this.subordinateSystemName = res['data']['systemName'];
let allArr = this.teamMemberList.concat(this.teamList)
this.practitionerDeatil = allArr.filter((item)=>{
return item.practitionerId == this.practitionerId ;
})[0];
}
......
src/app/my/member-list/member-list.component.html 0 → 100644
<div class="team_sales_detail_wrapper">
<div class="teamHeader">
<div class="teamItem teamInfo">
<img src="assets/images/cup_icon.png" >
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName}}战队</div>
</div>
</div>
<div class="rankInfoWrapper">
<div class="rankContent">
<div style="font-size: 18px;margin: 5px auto;text-align: center;">战队成员</div>
<div class="content_wrapper memberList">
<ul style="border: none;background: #e7eef5;border-radius: 5px;">
<li>姓名</li>
<li>级别</li>
<li class="sex">性别</li>
<li>手机号</li>
<li></li>
</ul>
<div style="width: 100%;text-align: center;float: left;height: 35px;"
*ngIf="teamMemberList?.length <=0">
暂无战队成员，努力去增员吧
</div>
<ul *ngFor="let teamMemberItem of teamList;index as i;" (click)="goToList(teamMemberItem)">
<li>
<span style="color:#333;font-size: 14px;font-weight: normal;">{{i+1}} </span>
<i style="margin-left: 10px;font-style: normal;">{{teamMemberItem.system}}</i>
</li>
<li>{{teamMemberItem.systemType}}</li>
<li class="sex">/</li>
<li>/</li>
<li><i class="iconfont icon-ar-r" style="color: #a4a4a4;font-size: 12px;" ></i></li>
</ul>
<ul *ngFor="let teamMemberItem of teamMemberList;index as i;" [routerLink]="['/member_detail',teamMemberItem.practitionerId]">
<li>
<span style="color:#333;font-size: 14px;font-weight: normal;">{{teamList?.length == 0 ?i + 1:teamList?.length+i+1}} </span>
<i style="margin-left: 10px;font-style: normal;">{{teamMemberItem.name}}</i>
</li>
<li>{{teamMemberItem.practitionerLevel}}{{teamMemberItem.practitionerTitle}}</li>
<li class="sex">{{teamMemberItem.gender}}</li>
<li>{{teamMemberItem.mobileNo}}</li>
<li><i class="iconfont icon-ar-r" style="color: #a4a4a4;font-size: 12px;" ></i></li>
</ul>
</div>
</div>
</div>
</div>
src/app/my/member-list/member-list.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: 24px;
position: relative;
display: flex;
align-items: center;
justify-content: center;
text-align: center;
overflow: hidden;
border-radius: 6px;
color: #fff;
height: 125px;
img{
width: 12%;
margin-left: -8%;
}
}
}
.rankInfoWrapper{
overflow: auto;
width: 100%;
float: left;
.rankContent{
float: left;
width: 100%;
overflow: auto;
background: #fff;
// box-shadow: 0 0px 2.5px #eceaea;
// border-radius: 6px;
padding: 5px;
.tab{
display: flex;
margin-bottom: 10px;
display: flex;
justify-content: space-between;
align-items: center;
ul{
width: 30%;
display: flex;
justify-content: space-between;
li.selected{
font-weight: bold;
border-bottom: 2px red solid;
}
}
}
.content_wrapper{
ul{
width: 100%;
height: 38px;
margin: 5px 0px;
line-height: 38px;
border-bottom: 1px #ddd solid;
li{
float: left;
width: 18%;
text-align: center;
margin:0 1%;
position: relative;
overflow: hidden;
height: 38px;
font-family: '微软雅黑';
span{
position: absolute;
left: -2px;
width: 15px;
text-align: center;
}
li.icon .iconfont{
position: absolute;
}
}
li.name{
width: 20%;
}
li.day{
width: 12%;
}
li:last-child{
width: 3%;
margin-right: 0;
}
}
ul:nth-child(2),ul:nth-child(3),ul:nth-child(4){
border-radius: 5px;
border: none;
li span{
font-size: 18px;
font-weight: bold;
}
}
ul:nth-child(2){
background: #feccd5;
li span{
color: #f8002e;
}
}
ul:nth-child(3){
background: #d1deeb;
li span{
color: #1b5b99;
}
}
ul:nth-child(4){
background: #fff4da;
li span{
color: #fab218;
}
}
}
.content_wrapper.memberList{
ul{
background: transparent;
border-bottom: 1px #ddd solid;
border-radius: 0;
li{
width: 25%;
}
li:nth-child(1){
width: 20%;
}
li:nth-child(4){
width: 28%;
}
li.sex{
width: 13%;
}
li:last-child{
margin-right: 0;
width: 4%;
}
}
ul:last-child{
border-bottom: none;
}
}
}
}
}
src/app/my/member-list/member-list.component.spec.ts 0 → 100644
import { async, ComponentFixture, TestBed } from '@angular/core/testing';
import { MemberListComponent } from './member-list.component';
describe('MemberListComponent', () => {
let component: MemberListComponent;
let fixture: ComponentFixture<MemberListComponent>;
beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [ MemberListComponent ]
})
.compileComponents();
}));
beforeEach(() => {
fixture = TestBed.createComponent(MemberListComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
it('should create', () => {
expect(component).toBeTruthy();
});
});
src/app/my/member-list/member-list.component.ts 0 → 100644
import { Component, OnInit } from '@angular/core';
import { ActivatedRoute, Router } from "@angular/router";
import { MyService } from '../my.service';
import { LifeCommonService } from '../../common/life-common.service';
@Component({
selector: 'ydlife-member-list',
templateUrl: './member-list.component.html',
styleUrls: ['./member-list.component.scss']
})
export class MemberListComponent implements OnInit {
practitionerId: any;
subordinateSystemName: any;
teamMemberList:Array<any>;
systemType:any;
teamList:Array<any>;
sid:any;
constructor(private activatedRoute: ActivatedRoute, private router: Router,
private myService: MyService, public lifeCommonService: LifeCommonService) { }
ngOnInit() {
this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
this.systemType = this.activatedRoute.snapshot.paramMap.get('systemType');
this.sid = this.activatedRoute.snapshot.queryParams.sid?this.activatedRoute.snapshot.queryParams.sid:null;
this.queryTeamMemberDetail()
}
//下级列表和战队成员列表
queryTeamMemberDetail(){
this.myService.queryTeamMemberDetail({systemType:this.systemType,sid:this.sid}).subscribe((res)=>{
if(res['success']){
this.teamMemberList = res['data']['teamMemberDetail'];
this.teamList = res['data']['teamMemberList'];
this.subordinateSystemName = res['data']['systemName'];
}
})
}
goToList(itemInfo) {
window.location.href = `https://${window.location.host}/ydLife/member_list/${itemInfo.systemType}?sid=${itemInfo.sid}`
}
}
src/app/my/menu-item/menu-item.component.ts
......@@ -70,13 +70,13 @@ export class MenuItemComponent implements OnInit {
content: [
{ no: 23, subtitle: '新人入口', icon: 'pin', path: '', routerLink: 'newPeople' ,showSubMenu:true},
{ no: 24, subtitle: '目标设置', icon: 'set', path: '', routerLink: 'target',showSubMenu:true },
{ no: 21, subtitle: '公司制度', icon: 'management', path: '', routerLink: '',showSubMenu:true },
{ no: 33, subtitle: '佣金政策', icon: '', path: '', routerLink: '',showSubMenu:true },
{ no: 12, subtitle: '销售保单', icon: 'policy', path: '', routerLink: '',showSubMenu:true },
{ no: 20, subtitle: '我的客户', icon: 'customer', path: '', routerLink: 'customer',showSubMenu:true },
// { no: 14, subtitle: '我的佣金', icon: 'commission', path: '', routerLink: '',showSubMenu:true },
{ no: 19, subtitle: '薪资单', icon: 'salary', path: '', routerLink: 'salary',showSubMenu:this.isShowSalay },
{ no: 26, subtitle: '投核保知识库', icon: 'ask', path: '', routerLink: 'underwriting_knowledge' ,showSubMenu:true},
// { no: 25, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:true},
// { no: 26, subtitle: '', icon: 'default', path: '', routerLink: '' ,showSubMenu:!this.isShowSalay}
],
isShow: true
},
......@@ -88,17 +88,17 @@ export class MenuItemComponent implements OnInit {
{ no: 6, subtitle: '培训课件', icon: 'train', path: '', routerLink: 'training',showSubMenu:true },
{ no: 10, subtitle: '职业类别', icon: 'job', path: 'https://www.ydinsurance.cn/occupationQry/', routerLink: '',showSubMenu:true },
{ no: 11, subtitle: '文件下载', icon: 'download', path: 'https://www.ydinsurance.cn/?page_id=13957', routerLink: 'fileUpload',showSubMenu:true },
// { no: 17, subtitle: '产品库', icon: 'product', path: '', routerLink: 'https://www.ydinsurance.cn/?page_id=14331' ,showSubMenu:true}
],
isShow: true
},{
title:'新人入口',
type:'newPeople',
content:[
{ no: 27, subtitle: '经纪合同', icon: 'abc', path: '', routerLink: 'my_application' ,showSubMenu:true},
{ no: 28, subtitle: '欢迎信', icon: 'train', path: '', routerLink: 'thanks',showSubMenu:true },
{ no: 21, subtitle: '公司制度', icon: 'management', path: '', routerLink: '',showSubMenu:true },
{ no: 28, subtitle: '欢迎信', icon: '', path: '', routerLink: 'thanks',showSubMenu:true },
{ no: 31, subtitle: '新人入职包', icon: '', path: '', routerLink: '',showSubMenu:true },
{ no: 30, subtitle: '执业证书', icon: 'card', path: `https://${window.location.host}/brokerQry/#/brokerDetail/${this.lifeCustomerInfo.practitionerId}?source=0`, routerLink: '',showSubMenu:true },
{ no: 32, subtitle: '公司介绍', icon: '', path: '', routerLink: '',showSubMenu:true },
{ no: 27, subtitle: '我的经纪合同', icon: '', path: '', routerLink: 'my_application' ,showSubMenu:true},
]
}
......@@ -129,7 +129,17 @@ export class MenuItemComponent implements OnInit {
} else if (item.no === 18) {
this.router.navigate(['/material'], { queryParams: { recruit: 'recruit' } });
}else if(item.no === 21){
//公司制度
this.router.navigate(['/fileUpload'], { queryParams: { fileUploadType: 'management' } });
}else if(item.no === 32){
//公司介绍
this.router.navigate(['/fileUpload'], { queryParams: { fileUploadType: 'introduce' } });
}else if(item.no === 31){
//新人入职包
this.router.navigate(['/fileUpload'], { queryParams: { fileUploadType: 'newRecruits' } });
}else if(item.no === 33){
//佣金政策
this.router.navigate(['/fileUpload'], { queryParams: { fileUploadType: 'commissionPolicy' } });
}else {
this.isNeedAlert = true;
this.dialogInfo = {
......
src/app/my/my-center-home/my-center-home.component.html
......@@ -3,7 +3,7 @@
<div class="weui-panel__hd header">
<!--头部经纪人信息START-->
<div class="avatar" routerLink="setting">
<img
<img style="width: 60px;height: 60px;"
src="{{lifeCustomerInfo?.practitionerBasicInfo?.headImagePath ? lifeCustomerInfo?.practitionerBasicInfo?.headImagePath : './assets/images/icons/meng.png'}}"
alt="头像">
</div>
......@@ -47,8 +47,8 @@
<div>
<ul class="performance_list title">
<li></li>
<li>首年保费</li>
<li>首年佣金</li>
<li>FYP</li>
<li>FYC</li>
<li>件数</li>
<li>完成率</li>
</ul>
......
src/app/my/my-center-home/my-center-home.component.ts
......@@ -172,29 +172,37 @@ export class MyCenterHomeComponent implements OnInit, AfterViewInit {
// 点击产品进入详情页
goProductDetail(product: Plans): void {
this.productInfo = product;
this.productInfo.type = 2;
this.inquiry = {
planId: this.productInfo.planId,
adultCount: this.productInfo.adultCount,
childCount: this.productInfo.childCount,
eldCount: this.productInfo.eldCount,
dayCount: this.productInfo.minDay
};
this.setInitDate();
this.ls.setObject('inquiry', this.inquiry);
if (this.productInfo.noPlanProduct === true) {
window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
} else {
if (this.productInfo.productCategoryId === 1 || this.productInfo.productCategoryId === 4) {
window.location.href = `https://${window.location.host}/pdetail/${this.productInfo.planId}`
} else if (this.productInfo.productCategoryId === 2) {
window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=7`
} else if (this.productInfo.productCategoryId === 5) {
window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=9`
} else {
if(product.isThirdpartyPurchase == 1){
if(product.thirdpartyPurchaseUrl){
window.location.href = product.thirdpartyPurchaseUrl;
}else{
alert('请配置跳转链接');
}
}else{
this.productInfo = product;
this.productInfo.type = 2;
this.inquiry = {
planId: this.productInfo.planId,
adultCount: this.productInfo.adultCount,
childCount: this.productInfo.childCount,
eldCount: this.productInfo.eldCount,
dayCount: this.productInfo.minDay
};
this.setInitDate();
this.ls.setObject('inquiry', this.inquiry);
if (this.productInfo.noPlanProduct === true) {
window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
this.router.navigate(['/pdetail', this.productInfo.planId]);
} else {
if (this.productInfo.productCategoryId === 1 || this.productInfo.productCategoryId === 4) {
window.location.href = `https://${window.location.host}/pdetail/${this.productInfo.planId}`
} else if (this.productInfo.productCategoryId === 2) {
window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=7`
} else if (this.productInfo.productCategoryId === 5) {
window.location.href = `https://${window.location.host}/hProductDetail/${this.productInfo.planId}?type=9`
} else {
window.location.href = `https://${window.location.host}/life/${this.productInfo.productId}`
this.router.navigate(['/pdetail', this.productInfo.planId]);
}
}
}
}
......
src/app/my/my-question/my-question.component.html
......@@ -12,7 +12,7 @@
></span>
</h4>
<div class="answerDate" *ngIf="listItem.spread">{{listItem.submitDate}}</div>
<div class="answer" *ngIf="listItem.spread">{{listItem.answer}}</div>
<div class="answer rich_media_content" *ngIf="listItem.spread" [innerHtml]="listItem.answer | safeHtml"></div>
<div class="answerDate" *ngIf="listItem.spread">{{listItem.firstAnswerDate}}</div>
</div>
<div *ngIf="!List?.length" style="margin-top: 10%;text-align: center;font-size: 20px;">暂无投核保问题</div>
......
src/app/my/my-routing.module.ts
......@@ -65,6 +65,7 @@ import { UnderwritingKnowledgeComponent } from './underwriting-knowledge/underwr
import { MyQuestionComponent } from './my-question/my-question.component';
import { AskComponent } from './ask/ask.component';
import { MenuItemComponent } from './menu-item/menu-item.component';
import { MemberListComponent } from './member-list/member-list.component';
const myRoutes: Routes = [
{ path: '', component: MyCenterHomeComponent, canActivate: [AuthGuard], data: [{ title: '银盾保险经纪 - 工作台' }] },
......@@ -141,7 +142,7 @@ const myRoutes: Routes = [
{ path: 'exhibition',component:MenuItemComponent,data:[{title:'银盾保经-我的展业',type:'exhibition'}],canActivate:[AuthGuard]},
{ path: 'trainingCenter',component:MenuItemComponent,data:[{title:'银盾保经-教育培训',type:'trainingCenter'}],canActivate:[AuthGuard]},
{ path: 'newPeople',component:MenuItemComponent,data:[{title:'银盾保经-新人入口',type:'newPeople'}],canActivate:[AuthGuard]},
{ path: 'member_list/:systemType',component:MemberListComponent,canActivate:[AuthGuard]},
];
@NgModule({
......
src/app/my/my.module.ts
......@@ -78,9 +78,10 @@ import { UnderwritingKnowledgeComponent } from './underwriting-knowledge/underwr
import { MyQuestionComponent } from './my-question/my-question.component';
import { AskComponent } from './ask/ask.component';
import { MenuItemComponent } from './menu-item/menu-item.component';
import { MemberListComponent } from './member-list/member-list.component';
@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, HistoricalRankComponent, TeamAreaPanelComponent, ArticleComponent, ArticleDetailComponent, ArticleReadComponent,SalaryDetailComponent,SalaryFirstYearComponent,DetailModalComponent, ProductComponent, ProductDataComponent, CommissionComponent, FileListComponent,MyCustomerComponent, CustomerRelationComponent, MyCustomerPolicyComponent, UnderwritingKnowledgeComponent, MyQuestionComponent, AskComponent, MenuItemComponent],
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, TeamAreaPanelComponent, ArticleComponent, ArticleDetailComponent, ArticleReadComponent,SalaryDetailComponent,SalaryFirstYearComponent,DetailModalComponent, ProductComponent, ProductDataComponent, CommissionComponent, FileListComponent,MyCustomerComponent, CustomerRelationComponent, MyCustomerPolicyComponent, UnderwritingKnowledgeComponent, MyQuestionComponent, AskComponent, MenuItemComponent, MemberListComponent],
imports: [
CommonModule,
LifeCommonModule,
......
src/app/my/my.service.ts
......@@ -20,10 +20,10 @@ export class MyService {
}
// 文件下载
filePath(itemType, itemId, fileCategory, code, mdDropOptionId) {
filePath(itemType, itemId, fileCategory, code, mdDropOptionCode) {
const url = this.API + '/filePathQuery';
return this.http
.post(url, JSON.stringify({ itemType: itemType, itemId: itemId, fileCategory: fileCategory, code: code, mdDropOptionId: mdDropOptionId }));
.post(url, JSON.stringify({ itemType: itemType, itemId: itemId, fileCategory: fileCategory, code: code, mdDropOptionCode: mdDropOptionCode }));
}
// 重要公告
......
src/app/my/sales-rank/sales-rank.component.html
......@@ -30,12 +30,12 @@
<li>团队</li>
<li *ngIf="searchType=='1'" style="color: #333;font-weight: normal;position: relative;"
(click)="rank(timeType,isOnlineType,2)">
首年保费<img src="assets/images/icon.png"
FYP<img src="assets/images/icon.png"
style="position: relative;width: 12%;right: 0;top: -2px;margin-left: 3px;">
</li>
<li *ngIf="searchType=='2'" style="color: #333;font-weight: normal;position: relative;"
(click)="rank(timeType,isOnlineType,3)">
首年佣金<img src="assets/images/icon.png"
FYC<img src="assets/images/icon.png"
style="position: relative;width: 12%;right: 0;top: -2px;margin-left: 3px;">
</li>
<li *ngIf="searchType=='3'" style="color: #333;font-weight: normal;margin-right: 0;position: relative;"
......
src/app/my/team-panel/team-panel.component.html
......@@ -7,7 +7,7 @@
<!-- <span class="icon-tuandui iconfont"
style="position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"></span> -->
<img src="assets/images/cup_icon.png" >
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName?subordinateSystemName.split('').join('/'):''}}/战/队</div>
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName}}战队</div>
</div>
<div class="taem_panel_item_wrapper" style="margin-top: -15px;">
<div class="taem_panel_item_top">
......
src/app/my/team-panel/team-panel.component.ts
......@@ -28,7 +28,8 @@ export class TeamPanelComponent implements OnInit {
constructor(private myService: MyService, public lifeCommonService: LifeCommonService) { }
ngOnInit() {
this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
this.subordinateSystemName = sessionStorage.getItem('subordinateSystemName');
this.subordinateSystemName = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerBasicInfo']['subordinateName'];
console.log(this.subordinateSystemName)
this.teamActionsAverageQuery();
// this.potentialActivityQuery();
this.subordinateSystemMemberQuery(1);
......
src/app/my/team-sales-score/team-sales-score.component.html
......@@ -4,7 +4,7 @@
<!-- <span class="icon-tuandui iconfont"
style="position: absolute;width:45px;height:45px;line-height:35px;font-size: 30px;left:0;border: 1px #dcdcdc solid; padding: 5px;border-radius: 50%;"></span> -->
<img src="assets/images/cup_icon.png" >
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName.split('').join('/')}}/战/队</div>
<div style="float: left;letter-spacing: 5px;margin-left: 5%;">{{subordinateSystemName}}战队</div>
</div>
</div>
<div *ngIf="showType==='teamSalesScore'">
......@@ -85,7 +85,7 @@
<div style="font-size: 18px;margin: 5px auto;text-align: center;">战队成员</div>
<div class="content_wrapper memberList">
<ul style="border: none;background: #e7eef5;border-radius: 5px;">
<li>姓名</li>
<li>姓名/团队</li>
<li>级别</li>
<li class="sex">性别</li>
<li>手机号</li>
......@@ -95,9 +95,19 @@
*ngIf="teamMemberList?.length <=0">
暂无战队成员，努力去增员吧
</div>
<ul *ngFor="let teamMemberItem of teamMemberList;index as i;" [routerLink]="['/member_detail',teamMemberItem.practitionerId]">
<ul *ngFor="let teamMemberItem of teamList;index as i;" (click)="goToList(teamMemberItem)">
<li>
<span style="color:#333;font-size: 14px;font-weight: normal;">{{i+1}} </span>
<i style="margin-left: 10px;font-style: normal;">{{teamMemberItem.system}}</i>
</li>
<li>{{teamMemberItem.systemType}}</li>
<li class="sex">/</li>
<li>/</li>
<li><i class="iconfont icon-ar-r" style="color: #a4a4a4;font-size: 12px;" ></i></li>
</ul>
<ul *ngFor="let teamMemberItem of teamMemberList;index as i;" [routerLink]="['/member_detail',teamMemberItem.practitionerId]">
<li>
<span style="color:#333;font-size: 14px;font-weight: normal;">{{teamList?.length == 0 ?i + 1:teamList?.length+i+1}} </span>
<i style="margin-left: 10px;font-style: normal;">{{teamMemberItem.name}}</i>
</li>
<li>{{teamMemberItem.practitionerLevel}}{{teamMemberItem.practitionerTitle}}</li>
......
src/app/my/team-sales-score/team-sales-score.component.ts
......@@ -17,12 +17,12 @@ export class TeamSalesScoreComponent implements OnInit {
salesPerformanceForecastInfos: Array<any>;
personalList:Array<any>;
teamMemberList:Array<any>;
teamList:Array<any>;
constructor(private activateRoute: ActivatedRoute, private router: Router,
private myService: MyService, public lifeCommonService: LifeCommonService) { }
ngOnInit() {
this.practitionerId = JSON.parse(localStorage.getItem('lifeCustomerInfo'))['practitionerId'];
this.subordinateSystemName = sessionStorage.getItem('subordinateSystemName');
//判断显示销售得分还是销售预测
this.showType = this.activateRoute.snapshot.paramMap.get('type');
if (this.showType === 'teamSalesScore') {
......@@ -72,7 +72,13 @@ export class TeamSalesScoreComponent implements OnInit {
this.myService.queryTeamMemberDetail({practitionerId:this.practitionerId}).subscribe((res)=>{
if(res['success']){
this.teamMemberList = res['data']['teamMemberDetail'];
this.teamList = res['data']['teamMemberList'];
this.subordinateSystemName = res['data']['systemName'];
}
})
}
goToList(itemInfo) {
this.router.navigate(['/member_list', itemInfo.systemType],{queryParams:{sid:itemInfo.sid}});
}
}
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