seimin 1 year ago
parent
commit
64d96a4c86

+ 3 - 1
src/app/views/worker-statistics-detail/worker-statistics-detail.component.ts

@@ -73,6 +73,8 @@ export class WorkerStatisticsDetailComponent implements OnInit {
73
     }
73
     }
74
     if(this.specialClose){
74
     if(this.specialClose){
75
       postData.specialClose = 1;
75
       postData.specialClose = 1;
76
+    }else{
77
+      postData.specialClose = this.route.snapshot.params.specialClose === 'null' ? undefined : this.route.snapshot.params.specialClose;
76
     }
78
     }
77
     if(this.type === 'workerStatistics'){
79
     if(this.type === 'workerStatistics'){
78
       postData.groupId = this.groupId === 'null' ? undefined : this.groupId;
80
       postData.groupId = this.groupId === 'null' ? undefined : this.groupId;
@@ -99,7 +101,7 @@ export class WorkerStatisticsDetailComponent implements OnInit {
99
   //查看积分详情
101
   //查看积分详情
100
   integralDetail(obj) {
102
   integralDetail(obj) {
101
     this.router.navigateByUrl(
103
     this.router.navigateByUrl(
102
-      `/main/${this.type}/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/${this.type}/${this.deptId}/orderDetail/${obj.id}/3`
104
+      `/main/${this.type}/workerStatisticsDetail/${this.currentPersonId}/${this.startTime}/${this.endTime}/${this.groupId}/${this.type}/${this.deptId}/${this.route.snapshot.params.specialClose}/orderDetail/${obj.id}/3`
103
     );
105
     );
104
   }
106
   }
105
   //关闭
107
   //关闭

+ 1 - 1
src/app/views/worker-statistics/worker-statistics-routing.module.ts

@@ -9,7 +9,7 @@ const routes: Routes = [
9
     component: WorkerStatisticsComponent,
9
     component: WorkerStatisticsComponent,
10
     children: [
10
     children: [
11
       {
11
       {
12
-        path: 'workerStatisticsDetail/:workerId/:startTime/:endTime/:groupId/:type/:deptId',//id是workid,startTime是开始时间,endTime是结束时间,groupId是组ID,type是类型
12
+        path: 'workerStatisticsDetail/:workerId/:startTime/:endTime/:groupId/:type/:deptId/:specialClose',//id是workid,startTime是开始时间,endTime是结束时间,groupId是组ID,type是类型
13
         loadChildren: () => import('../worker-statistics-detail/worker-statistics-detail.module').then(m => m.WorkerStatisticsDetailModule)
13
         loadChildren: () => import('../worker-statistics-detail/worker-statistics-detail.module').then(m => m.WorkerStatisticsDetailModule)
14
       }
14
       }
15
     ]
15
     ]

+ 1 - 1
src/app/views/worker-statistics/worker-statistics.component.ts

@@ -341,7 +341,7 @@ export class WorkerStatisticsComponent implements OnInit {
341
     let endDate = this.endDate + " " + "23:59:59";
341
     let endDate = this.endDate + " " + "23:59:59";
342
     let group = this.group || "null";
342
     let group = this.group || "null";
343
     this.router.navigateByUrl(
343
     this.router.navigateByUrl(
344
-      `/main/workerStatistics/workerStatisticsDetail/${workerId}/${startDate}/${endDate}/${group}/workerStatistics/null`
344
+      `/main/workerStatistics/workerStatisticsDetail/${workerId}/${startDate}/${endDate}/${group}/workerStatistics/null/${this.checkOptionsOne[0].checked ? 0 : 'null'}`
345
     );
345
     );
346
   }
346
   }
347
 }
347
 }