seimin %!s(int64=3) %!d(string=hai) anos
pai
achega
42f40cc2b7

+ 2 - 2
src/app/views/inspect-active-detail/inspect-active-detail-routing.module.ts

@@ -1,6 +1,6 @@
1 1
 import { NgModule } from "@angular/core";
2 2
 import { Routes, RouterModule } from "@angular/router";
3
-import { InspectActiveDetailComponent } from './inspect-active-detail.component';
3
+import { InspectActiveDetailComponent } from "./inspect-active-detail.component";
4 4
 
5 5
 const routes: Routes = [
6 6
   {
@@ -8,7 +8,7 @@ const routes: Routes = [
8 8
     component: InspectActiveDetailComponent,
9 9
     children: [
10 10
       {
11
-        path: "inspectActiveOrderList/:deptId/:startTime/:endTime/:workerId", //id是deptId,startTime是开始时间,endTime是结束时间,workerId是支助人员ID
11
+        path: "inspectActiveOrderList/:deptId/:startTime/:endTime/:date/:workerId", //date是选中的日期,id是deptId,startTime是开始时间,endTime是结束时间,workerId是支助人员ID
12 12
         loadChildren: () =>
13 13
           import(
14 14
             "../inspect-active-order-list/inspect-active-order-list.module"

+ 1 - 1
src/app/views/inspect-active-detail/inspect-active-detail.component.html

@@ -31,7 +31,7 @@
31 31
           <td>{{data.count4}}</td>
32 32
           <td>
33 33
             <div class="coop">
34
-              <span *ngIf="data.userId" (click)="integralDetail(data)">查看</span>
34
+              <span *ngIf="data.userId&&data.count5" (click)="integralDetail(data)">查看</span>
35 35
             </div>
36 36
           </td>
37 37
         </tr>

+ 1 - 1
src/app/views/inspect-active-detail/inspect-active-detail.component.ts

@@ -65,7 +65,7 @@ export class InspectActiveDetailComponent implements OnInit {
65 65
   //查看工单列表
66 66
   integralDetail(obj) {
67 67
     this.router.navigateByUrl(
68
-      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}/inspectActiveOrderList/${this.currentDeptId}/${this.startTime}/${this.endTime}/${obj.userId}`
68
+      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}/inspectActiveOrderList/${this.currentDeptId}/${this.startTime}/${this.endTime}/${obj.datetime}/${obj.userId}`
69 69
     );
70 70
   }
71 71
   //关闭

+ 6 - 3
src/app/views/inspect-active-order-list/inspect-active-order-list.component.ts

@@ -3,6 +3,7 @@ import { ActivatedRoute, Router } from "@angular/router";
3 3
 import { NzMessageService } from "ng-zorro-antd";
4 4
 import { MainService } from "src/app/services/main.service";
5 5
 import { ToolService } from "src/app/services/tool.service";
6
+import { format } from "date-fns";
6 7
 
7 8
 @Component({
8 9
   selector: "app-inspect-active-order-list",
@@ -16,6 +17,7 @@ export class InspectActiveOrderListComponent implements OnInit {
16 17
   workerId; //当前支助人员id
17 18
   startTime; //当前开始时间
18 19
   endTime; //当前结束时间
20
+  date; //选中的日期
19 21
   listOfData = []; //获取选中支助人员的工单列表
20 22
   pageIndex: number = 1; //页码
21 23
   listLength: number = 0; //总数据条目数
@@ -33,6 +35,7 @@ export class InspectActiveOrderListComponent implements OnInit {
33 35
     this.currentDeptId = this.route.snapshot.params.deptId;
34 36
     this.startTime = this.route.snapshot.params.startTime;
35 37
     this.endTime = this.route.snapshot.params.endTime;
38
+    this.date = this.route.snapshot.params.date;
36 39
     this.workerId = this.route.snapshot.params.workerId;
37 40
     this.getListByWorker(this.hosId, this.currentDeptId);
38 41
   }
@@ -46,8 +49,8 @@ export class InspectActiveOrderListComponent implements OnInit {
46 49
         taskType: { associationType: { id: 260 } },
47 50
         abnormityType: 0,
48 51
         timeOut: 0,
49
-        startTime1: this.startTime,
50
-        endTime1: this.endTime,
52
+        startTime1: format(this.date - 0, "yyyy-MM-dd") + " 00:00:00",
53
+        endTime1: format(this.date - 0, "yyyy-MM-dd") + " 23:59:59",
51 54
         hosId,
52 55
         createDept: currentDeptId,
53 56
         worker: {
@@ -89,7 +92,7 @@ export class InspectActiveOrderListComponent implements OnInit {
89 92
   //查看积分详情
90 93
   integralDetail(obj) {
91 94
     this.router.navigateByUrl(
92
-      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}/inspectActiveOrderList/${this.currentDeptId}/${this.startTime}/${this.endTime}/${this.workerId}/orderDetail/${obj.id}/3`
95
+      `/main/inspectActive/inspectActiveDetail/${this.currentDeptId}/${this.startTime}/${this.endTime}/inspectActiveOrderList/${this.currentDeptId}/${this.startTime}/${this.endTime}/${this.date}/${this.workerId}/orderDetail/${obj.id}/3`
93 96
     );
94 97
   }
95 98
   //关闭