Merge branch 'master' into develop

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

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

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

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

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

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

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

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