Commit 96ec3842 by sunchao

时间选择缓存

parent 26bb4d48
...@@ -39,7 +39,8 @@ ...@@ -39,7 +39,8 @@
<ng-container *ngFor="let salesActivityItem of salesActivityList"> <ng-container *ngFor="let salesActivityItem of salesActivityList">
<li [ngClass]="{'selected':addTrack.mdDropOptionId==salesActivityItem.id}" (click)="selectTask(salesActivityItem.id);" <li [ngClass]="{'selected':addTrack.mdDropOptionId==salesActivityItem.id}" (click)="selectTask(salesActivityItem.id);"
*ngIf="(addTrack.taskType == 1 && salesActivityItem.id != '102') || (addTrack.taskType == 2 && salesActivityItem.id != '114' && salesActivityItem.id != '113') || (addTrack.taskType == 3)"> *ngIf="(addTrack.taskType == 1 && salesActivityItem.id != '102') || (addTrack.taskType == 2 && salesActivityItem.id != '114' && salesActivityItem.id != '113') || (addTrack.taskType == 3)">
{{salesActivityItem.dropOptionName}} <span class="dot" *ngIf="(addTrack.mdDropOptionId==salesActivityItem.id && addTrack.referLeadsId) || (addTrack.mdDropOptionId==salesActivityItem.id && addTrack.referPotentialId)"
style="width: 5px;height: 5px;background: red;border-radius: 50%;position: absolute;right: 0;top: -5px;"></span> {{salesActivityItem.dropOptionName}}
</li> </li>
</ng-container> </ng-container>
</ul> </ul>
......
...@@ -4,7 +4,7 @@ ul,ol{ ...@@ -4,7 +4,7 @@ ul,ol{
.todo_wrapper{ .todo_wrapper{
background: #fff; background: #fff;
// padding-bottom: 60px; padding-bottom: 60px;
.top{ .top{
.head{ .head{
display: flex; display: flex;
...@@ -42,7 +42,7 @@ ul,ol{ ...@@ -42,7 +42,7 @@ ul,ol{
} }
.task_content_wrapper{ .task_content_wrapper{
.part_wrapper{ .part_wrapper{
margin-top: 10px; margin-top: 15px;
position: relative; position: relative;
padding: 0 4%; padding: 0 4%;
ul{ ul{
...@@ -59,6 +59,7 @@ ul,ol{ ...@@ -59,6 +59,7 @@ ul,ol{
background: #f6f6f6; background: #f6f6f6;
border-radius: 10px; border-radius: 10px;
margin:5px 1%; margin:5px 1%;
position: relative;
} }
li.selected{ li.selected{
background: #1b5b99; background: #1b5b99;
...@@ -91,6 +92,8 @@ ul,ol{ ...@@ -91,6 +92,8 @@ ul,ol{
display: flex; display: flex;
justify-content: space-evenly; justify-content: space-evenly;
align-items: center; align-items: center;
height: 100px;
overflow: hidden;
.picker_list{ .picker_list{
width: 35%; width: 35%;
} }
...@@ -128,7 +131,7 @@ ul,ol{ ...@@ -128,7 +131,7 @@ ul,ol{
background: #1b5b99; background: #1b5b99;
color: #fff; color: #fff;
text-align: center; text-align: center;
// position: fixed; position: fixed;
bottom: 0; bottom: 0;
font-size: 20px; font-size: 20px;
font-weight: bold; font-weight: bold;
......
...@@ -89,6 +89,7 @@ export class AddTaskComponent implements OnInit { ...@@ -89,6 +89,7 @@ export class AddTaskComponent implements OnInit {
this.addTrack.referLeadsId = this.activateRoute.snapshot.queryParams['referLeadsId']; this.addTrack.referLeadsId = this.activateRoute.snapshot.queryParams['referLeadsId'];
this.addTrack.referPotentialId = this.activateRoute.snapshot.queryParams['referPotentialId']; this.addTrack.referPotentialId = this.activateRoute.snapshot.queryParams['referPotentialId'];
this.addTrack.customerId = this.activateRoute.snapshot.queryParams['customerId']; this.addTrack.customerId = this.activateRoute.snapshot.queryParams['customerId'];
console.log(this.addTrack.referLeadsId)
//查询 //查询
if(this.taskInfo){ if(this.taskInfo){
for(let i=0;i<this.tabList.length;i++){ for(let i=0;i<this.tabList.length;i++){
...@@ -104,32 +105,34 @@ export class AddTaskComponent implements OnInit { ...@@ -104,32 +105,34 @@ export class AddTaskComponent implements OnInit {
taskTimeEnd: [this.taskInfo.taskTimeEnd] taskTimeEnd: [this.taskInfo.taskTimeEnd]
}; };
}else{ }else{
//商机页或者增员页跳转过来如果有缓存切换到缓存数据 //商机页或者增员页跳转过来如果有缓存切换到缓存数据
if(JSON.parse(sessionStorage.getItem('pageDwellDtatus'))){ if(JSON.parse(sessionStorage.getItem('pageDwellDtatus'))){
this.tabType = JSON.parse(sessionStorage.getItem('pageDwellDtatus'))['tabType']; const pageDwellDtatus = JSON.parse(sessionStorage.getItem('pageDwellDtatus'))
this.addTrack.taskType = JSON.parse(sessionStorage.getItem('pageDwellDtatus'))['taskType']; this.tabType = pageDwellDtatus['tabType'];
setTimeout(() => { this.addTrack.taskType =pageDwellDtatus['taskType'];
setTimeout(() => {
this.dropOptionsQuery(this.tabType);
this.addTrack.mdDropOptionId = pageDwellDtatus['mdDropOptionId'];
}, 300);
this.addTrack.taskTimeFrom = [pageDwellDtatus['taskTimeFrom'][0]['label']?pageDwellDtatus['taskTimeFrom'][0]['label']:pageDwellDtatus['taskTimeFrom'][0]];
this.addTrack.taskTimeEnd = [pageDwellDtatus['taskTimeEnd'][0]['label']?pageDwellDtatus['taskTimeEnd'][0]['label']:pageDwellDtatus['taskTimeEnd'][0]];
}else{
//新增
this.addTrack.mdDropOptionId = null;
this.tabType = 'bizchance_promotion_action';
this.addTrack.taskType = 1;
this.dropOptionsQuery(this.tabType); this.dropOptionsQuery(this.tabType);
this.addTrack.mdDropOptionId = JSON.parse(sessionStorage.getItem('pageDwellDtatus'))['mdDropOptionId']; this.addTrack.taskTimeFrom = ['08:30'];
}, 300); this.addTrack.taskTimeEnd = ['08:30'];
this.addTrack.taskTimeFrom = ['08:30']; }
this.addTrack.taskTimeEnd = ['08:30']; //如果有日程时间就取缓存没有就默认当天
}else{ if(sessionStorage.getItem('trackTime')){
//新增 this.addTrack.trackTime = sessionStorage.getItem('trackTime');
this.addTrack.mdDropOptionId = null; }else{
this.tabType = 'bizchance_promotion_action'; this.addTrack.trackTime = dayjs().format('YYYY-MM-DD');
this.addTrack.taskType = 1; }
this.dropOptionsQuery(this.tabType);
}
//如果有日程时间就取缓存没有就默认当天
if(sessionStorage.getItem('trackTime')){
this.addTrack.trackTime = sessionStorage.getItem('trackTime');
}else{
this.addTrack.trackTime = dayjs().format('YYYY-MM-DD');
}
this.addTrack.taskTimeFrom = ['08:30'];
this.addTrack.taskTimeEnd = ['08:30'];
} }
} }
goBack(){ goBack(){
...@@ -165,7 +168,9 @@ export class AddTaskComponent implements OnInit { ...@@ -165,7 +168,9 @@ export class AddTaskComponent implements OnInit {
pageDwellDtatus = { pageDwellDtatus = {
tabType:this.tabType, tabType:this.tabType,
mdDropOptionId:null, mdDropOptionId:null,
taskType:this.addTrack.taskType taskType:this.addTrack.taskType,
taskTimeFrom:this.addTrack.taskTimeFrom,
taskTimeEnd:this.addTrack.taskTimeEnd
} }
sessionStorage.setItem('pageDwellDtatus',JSON.stringify(pageDwellDtatus)); sessionStorage.setItem('pageDwellDtatus',JSON.stringify(pageDwellDtatus));
} }
...@@ -186,6 +191,14 @@ export class AddTaskComponent implements OnInit { ...@@ -186,6 +191,14 @@ export class AddTaskComponent implements OnInit {
if(type===2){ if(type===2){
this.addTrack.taskTimeEnd = result; this.addTrack.taskTimeEnd = result;
} }
const pageDwellDtatus={
tabType:this.tabType,
mdDropOptionId:this.addTrack.mdDropOptionId,
taskType:this.addTrack.taskType,
taskTimeFrom:this.addTrack.taskTimeFrom,
taskTimeEnd:this.addTrack.taskTimeEnd
}
sessionStorage.setItem('pageDwellDtatus',JSON.stringify(pageDwellDtatus));
} }
selectTask(id){ selectTask(id){
...@@ -193,7 +206,9 @@ export class AddTaskComponent implements OnInit { ...@@ -193,7 +206,9 @@ export class AddTaskComponent implements OnInit {
const pageDwellDtatus = { const pageDwellDtatus = {
tabType:this.tabType, tabType:this.tabType,
mdDropOptionId:this.addTrack.mdDropOptionId, mdDropOptionId:this.addTrack.mdDropOptionId,
taskType:this.addTrack.taskType taskType:this.addTrack.taskType,
taskTimeFrom:this.addTrack.taskTimeFrom,
taskTimeEnd:this.addTrack.taskTimeEnd
} }
sessionStorage.setItem('pageDwellDtatus',JSON.stringify(pageDwellDtatus)); sessionStorage.setItem('pageDwellDtatus',JSON.stringify(pageDwellDtatus));
//如果从查询页过来选了新的任务重新设置 //如果从查询页过来选了新的任务重新设置
...@@ -247,6 +262,8 @@ export class AddTaskComponent implements OnInit { ...@@ -247,6 +262,8 @@ export class AddTaskComponent implements OnInit {
clearRouterInfo(){ clearRouterInfo(){
this.linkToastFlag=false, this.linkToastFlag=false,
this.router.navigate(['/addtask'], {replaceUrl: true}); this.router.navigate(['/addtask'], {replaceUrl: true});
this.addTrack.referLeadsId = undefined;
this.addTrack.referPotentialId = undefined;
} }
clickCalendar(){ clickCalendar(){
......
...@@ -108,11 +108,12 @@ input::placeholder { ...@@ -108,11 +108,12 @@ input::placeholder {
} }
.timeContent{ .timeContent{
.am-picker-col{ .am-picker-col{
// height: 102px; // height: 102px;
// .am-picker-col-mask{ // .am-picker-col-mask{
// background-size: 100% 34px!important; // background-size: 100% 34px!important;
// } // }
.am-picker-col-indicator { .am-picker-col-indicator {
// background: #f6f6f6; // background: #f6f6f6;
// border-radius: 50px; // border-radius: 50px;
......
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