日程规划bug修复

f8b78c9f · sunchao · 98df0791 · f8b78c9f · f8b78c9f · f8b78c9f
Commit f8b78c9f authored Sep 24, 2020 by sunchao
8 changed files
--- a/src/app/my/add-task/add-task.component.html
+++ b/src/app/my/add-task/add-task.component.html
@@ -38,13 +38,15 @@
      <ul class="part1_list">
        <ng-container  *ngFor="let salesActivityItem of salesActivityList">
          <li [ngClass]="{'selected':addTrack.mdDropOptionId==salesActivityItem.id}" (click)="selectTask(salesActivityItem.id);" 
-          *ngIf="(addTrack.taskType == 1 && salesActivityItem.id != '102') || (addTrack.taskType == 2 && salesActivityItem.id != '114') || (addTrack.taskType == 3)">
+          *ngIf="(addTrack.taskType == 1 && salesActivityItem.id != '102') || (addTrack.taskType == 2 && salesActivityItem.id != '114' && salesActivityItem.id != '113') || (addTrack.taskType == 3)">
              {{salesActivityItem.dropOptionName}}
          </li>
        </ng-container>
      </ul>
-      <div class="important_mark"> <span [ngClass]="{'circle':addTrack.taskImportantTag==true}" (click)="addTrack.taskImportantTag=!addTrack.taskImportantTag"></span> <div>重要标签</div> </div>
+      <div class="important_mark" [ngStyle]="{'bottom':addTrack.taskType == 2?'-35%':'5px'}"> 
+        <span [ngClass]="{'circle':addTrack.taskImportantTag==true}" (click)="addTrack.taskImportantTag=!addTrack.taskImportantTag"></span>
+         <div>重要标签</div>
+      </div>
    </div>
    <div class="part_wrapper part2">
      <div style="font-size: 18px;">选择任务需要的时间</div>

--- a/src/app/my/add-task/add-task.component.scss
+++ b/src/app/my/add-task/add-task.component.scss
@@ -69,7 +69,6 @@ ul,ol{
            .important_mark{
                position: absolute;
                right: 3%;
-                bottom: 5px;
                font-size: 12px;
                color: #a0a0a0;
                display: flex;

--- a/src/app/my/add-task/add-task.component.ts
+++ b/src/app/my/add-task/add-task.component.ts
@@ -39,24 +39,29 @@ export class AddTaskComponent implements OnInit {
  constructor(private myService:MyService,private router: Router,private _modal: ModalService, private _toast: ToastService,
   public lifeCommonService:LifeCommonService,private activateRoute:ActivatedRoute) {
    this.seasons = [
-      {label: '08:00',value:1},{label: '08:30',value:2},
+      {label: '06:00',value:1},{label: '06:30',value:2},
-      {label: '09:00',value:3},{label: '09:30', value:4},
+      {label: '07:00',value:3},{label: '07:30',value:4},
-      {label: '10:00',value:5},{label: '10:30',value:6},
+      {label: '08:00',value:5},{label: '08:30',value:6},
-      {label: '11:00',value:7},{label: '11:30',value:8},
+      {label: '09:00',value:7},{label: '09:30', value:8},
-      {label: '12:00',value:9},{label: '12:30',value:10},
+      {label: '10:00',value:9},{label: '10:30',value:10},
-      {label: '13:00',value:11},{label: '13:30',value:12},
+      {label: '11:00',value:11},{label: '11:30',value:12},
-      {label: '14:00',value:13},{label: '14:30',value:14},
+      {label: '12:00',value:13},{label: '12:30',value:14},
-      {label: '15:00',value:15},{label: '15:30',value:16},
+      {label: '13:00',value:15},{label: '13:30',value:16},
-      {label: '16:00',value:17},{label: '16:30',value:18},
+      {label: '14:00',value:17},{label: '14:30',value:18},
-      {label: '17:00',value:19},{label: '17:30',value:20},
+      {label: '15:00',value:19},{label: '15:30',value:20},
-      {label: '18:00',value:21},{label: '18:30',value:22},
+      {label: '16:00',value:21},{label: '16:30',value:22},
-      {label: '19:00',value:23},{label: '19:30',value:24},
+      {label: '17:00',value:23},{label: '17:30',value:24},
-      {label: '20:00',value:25},{label: '20:30',value:26},
+      {label: '18:00',value:25},{label: '18:30',value:26},
-      {label: '21:00',value:27},{label: '21:30',value:28},
+      {label: '19:00',value:27},{label: '19:30',value:28},
-      {label: '22:00',value:29},{label: '22:30',value:30}
+      {label: '20:00',value:29},{label: '20:30',value:30},
+      {label: '21:00',value:31},{label: '21:30',value:32},
+      {label: '22:00',value:33},{label: '22:30',value:34},
+      {label: '23:00',value:35},{label: '23:30',value:36},
+      {label: '00:00',value:37}
    ];
    // console.log(this.router.getCurrentNavigation().extras.state)
-    this.taskInfo = this.router.getCurrentNavigation().extras.state;
+    // this.taskInfo = this.router.getCurrentNavigation().extras.state;
+    this.taskInfo =JSON.parse(localStorage.getItem('taskInfo'));
   }
   initPara() {
@@ -107,6 +112,8 @@ export class AddTaskComponent implements OnInit {
        this.dropOptionsQuery(this.tabType);
        this.addTrack.mdDropOptionId = JSON.parse(sessionStorage.getItem('pageDwellDtatus'))['mdDropOptionId'];
      }, 300);
+      this.addTrack.taskTimeFrom = ['08:30'];
+      this.addTrack.taskTimeEnd =  ['08:30'];
    }else{
      //新增
      this.addTrack.mdDropOptionId = null;
@@ -127,7 +134,8 @@ export class AddTaskComponent implements OnInit {
  goBack(){
    // history.go(-1);
-    this.router.navigate(['/todo'])
+    this.router.navigate(['/todo']);
+    localStorage.removeItem('taskInfo');
  }
  //判断是否选择同一个tab
@@ -188,6 +196,17 @@ export class AddTaskComponent implements OnInit {
      taskType:this.addTrack.taskType
    }
    sessionStorage.setItem('pageDwellDtatus',JSON.stringify(pageDwellDtatus));
+    //如果从查询页过来选了新的任务重新设置
+    if(this.taskInfo){
+      this.taskInfo = {
+        ...this.taskInfo,
+        tabType:this.tabType,
+        mdDropOptionId:this.addTrack.mdDropOptionId,
+        taskType:this.addTrack.taskType
+      }
+      localStorage.setItem('taskInfo',JSON.stringify(this.taskInfo));
+    }
    if(this.tabType == 'bizchance_promotion_action' ){
      ModalService.alert('是否联系到商机', '', [
        { text: '否', onPress: () =>  
@@ -312,7 +331,8 @@ export class AddTaskComponent implements OnInit {
        taskImportantTag:this.addTrack.taskImportantTag?1:0,
        isActive:1,
        taskTimeFrom:this.addTrack.taskTimeFrom[0]['label']?this.addTrack.taskTimeFrom[0]['label']:this.addTrack.taskTimeFrom[0],
-        taskTimeEnd:this.addTrack.taskTimeEnd[0]['label']?this.addTrack.taskTimeEnd[0]['label']:this.addTrack.taskTimeEnd[0]
+        taskTimeEnd:this.addTrack.taskTimeEnd[0]['label']?this.addTrack.taskTimeEnd[0]['label']:this.addTrack.taskTimeEnd[0],
+        mdDropOptionName:undefined
      }
    if(trackAdded.taskTimeFrom == trackAdded.taskTimeEnd){
      const toast = ToastService.show('任务起始时间不能等于结束时间!', 0);

--- a/src/app/my/my-business/my-business.component.ts
+++ b/src/app/my/my-business/my-business.component.ts
@@ -60,7 +60,9 @@ export class MyBusinessComponent implements OnInit {
  change(event){
    this.showBusinessList = this.businessList.filter((item)=>{
+      if(item.name){
        return item.name.indexOf(event) !=-1;
+      }
    })
  }
@@ -70,14 +72,15 @@ export class MyBusinessComponent implements OnInit {
      // this.router.navigate(['/addtask/'], { queryParams: { customerId:opportunityId , referLeadsId: leadsAssignedId },state:this.selectedBusiness});
      this.router.navigate(['/addtask/'], { queryParams: { customerId:opportunityId , referLeadsId: leadsAssignedId }});
    }else{
-      this.toastDialog = true;
+      this.router.navigate(['/addtask/']);
-      this.toastInfo = {
+      // this.toastDialog = true;
-        status: 1,
+      // this.toastInfo = {
-        msg:'请选择您需要关联的商机！',
+      //   status: 1,
-        timeout: 3000,
+      //   msg:'请选择您需要关联的商机！',
-        align: 'center'
+      //   timeout: 3000,
-      };
+      //   align: 'center'
-      return;
+      // };
+      // return;
    }
  }
 }
--- a/src/app/my/recruiting/recruiting.component.ts
+++ b/src/app/my/recruiting/recruiting.component.ts
@@ -62,7 +62,9 @@ export class RecruitingComponent implements OnInit {
  change(event){
    this.showRecruitingList = this.recruitingList.filter((item)=>{
+      if(item.name){
        return item.name.indexOf(event) !=-1;
+      }
    })
  }
@@ -85,14 +87,7 @@ export class RecruitingComponent implements OnInit {
      // this.router.navigate(['/addtask/'], { queryParams: { referPotentialId: potentialId },state:this.selectedRecruiting});
      this.router.navigate(['/addtask/'], { queryParams: { referPotentialId: potentialId }});
    }else{
-      this.toastDialog = true;
+      this.router.navigate(['/addtask/']);
-      this.toastInfo = {
-        status: 1,
-        msg:'请选择您需要关联的增员对象！',
-        timeout: 3000,
-        align: 'center'
-      };
-      return;
    }
  }
 }
--- a/src/app/my/todo-list/todo-list.component.html
+++ b/src/app/my/todo-list/todo-list.component.html
@@ -55,7 +55,9 @@
                  <span *ngIf="taskItem.taskImportantTag==1">(重要)</span>
                  {{taskItem.mdDropOptionName}}
                </div>
-                <div class="notice">{{taskItem.notice}}</div>
+                <div class="notice">
+                  {{taskItem.notice}}
+                </div>
              </div>
              <div class="red" *ngIf="taskItem.taskImportantTag==1"></div>
              <div class="iconfont icon-shanchu1" (click)="editeTask(taskItem,'delete')"></div>
@@ -65,8 +67,8 @@
        </ul>
      </div>
    </div>
-    <div class="addBtn" [ngStyle]="{'background':taskList?.length? '#ff002b' : '#eb6100'}" [routerLink]="['/addtask']">
+    <div class="addBtn" *ngIf="editFlag" [ngStyle]="{'background':taskList?.length? '#ff002b' : '#eb6100'}" [routerLink]="['/addtask']">
-      <i class="iconfont icon-jiahao" ></i>
+      <i class="iconfont icon-jiahao" (click)="removeTaskInfo()"></i>
    </div>
  </div>
  <!-- <Calendar [(ngModel)]="this.state.date"

--- a/src/app/my/todo-list/todo-list.component.scss
+++ b/src/app/my/todo-list/todo-list.component.scss
@@ -110,6 +110,7 @@ ul,ol{
                            }
                            .notice{
                                color: #a0a0a0;
+                                word-break:break-all;
                            }
                        }
                        .red{
@@ -126,8 +127,9 @@ ul,ol{
                            position: absolute;
                            right: 5px;
                            z-index: 20;
-                            font-size: 24px;
+                            font-size: 20px;
-                            top: 35%;
+                            top: 32px;
+                            color: #a0a0a0;
                        }
                    }
                }

--- a/src/app/my/todo-list/todo-list.component.ts
+++ b/src/app/my/todo-list/todo-list.component.ts
@@ -32,25 +32,31 @@ export class TodoListComponent implements OnInit {
    onSelect: undefined,
  }
  practitionerId:number;
+  //日程是否可修改
+  editFlag:boolean = true;
+  localTime:any = new Date().getTime();
  constructor(public lifeCommonService: LifeCommonService,private myService:MyService,
    private _modal: ModalService, private _toast: ToastService,private router:Router) {
    this.taskTimeList = [
-      {id:1,time:'8:00'},
+      {id:1,time:'6:00'},
-      {id:2,time:'9:00'},
+      {id:2,time:'7:00'},
-      {id:3,time:'10:00'},
+      {id:3,time:'8:00'},
-      {id:4,time:'11:00'},
+      {id:4,time:'9:00'},
-      {id:5,time:'12:00'},
+      {id:5,time:'10:00'},
-      {id:6,time:'13:00'},
+      {id:6,time:'11:00'},
-      {id:7,time:'14:00'},
+      {id:7,time:'12:00'},
-      {id:8,time:'15:00'},
+      {id:8,time:'13:00'},
-      {id:9,time:'16:00'},
+      {id:9,time:'14:00'},
-      {id:10,time:'17:00'},
+      {id:10,time:'15:00'},
-      {id:11,time:'18:00'},
+      {id:11,time:'16:00'},
-      {id:12,time:'19:00'},
+      {id:12,time:'17:00'},
-      {id:13,time:'20:00'},
+      {id:13,time:'18:00'},
-      {id:14,time:'21:00'},
+      {id:14,time:'19:00'},
-      {id:15,time:'22:00'},
+      {id:15,time:'20:00'},
-      {id:16,time:'23:00'}
+      {id:16,time:'21:00'},
+      {id:17,time:'22:00'},
+      {id:18,time:'23:00'},
+      {id:19,time:'00:00'},
    ]   
  }
@@ -79,6 +85,12 @@ export class TodoListComponent implements OnInit {
    //缓存任务时间
    sessionStorage.setItem('trackTime',this.trackTime);
    this.queryScheduleTrackList();
+    //选中时间<当前时间
+    if((new Date(this.trackTime + ' 23:59').getTime())<this.localTime){
+      this.editFlag = false;
+    }else{
+      this.editFlag = true;
+    }
  }
  initPara() {
@@ -124,6 +136,12 @@ export class TodoListComponent implements OnInit {
    sessionStorage.setItem('trackTime',this.trackTime);
    this.queryScheduleTrackList();
    this.weekArr = this.lifeCommonService.makeDate(startDate);
+    //选中时间<当前时间
+    if((new Date(this.trackTime + ' 23:59').getTime())<this.localTime){
+      this.editFlag = false;
+    }else{
+      this.editFlag = true;
+    }
  }
  queryScheduleTrackList(){
@@ -157,9 +175,23 @@ export class TodoListComponent implements OnInit {
  editeTask(taskInfo,type){
    if(type == 'edit'){
-      this.router.navigate(['/addtask'], {state:taskInfo})
+      if(this.editFlag == true){
+        this.router.navigate(['/addtask'], {state:taskInfo});
+        localStorage.setItem('taskInfo',JSON.stringify(taskInfo))
+      }else{
+        const toast = ToastService.show('不可以修改今天之前的日程哦！', 0);
+          setTimeout(() => {
+            ToastService.hide();
+          }, 3000);
+      }
    }else{
      this.deleteScheduleTrackById(taskInfo);
    }
  }
+  //新增的时候清空编辑缓存
+  removeTaskInfo(){
+    localStorage.removeItem('taskInfo');
+    sessionStorage.removeItem('pageDwellDtatus');
+  }
 }