工单日志完善

src/app/share/order-detail/order-detail.component.html

@@ -79,11 +79,11 @@
             </div>
           </div>
           <div class="info" nz-row>
-            <div nz-col nzSpan="6" *ngIf="orderInfo.inspectScore">
-              陪检方式：{{ orderInfo.inspectScore.inspectMode }}
-            </div>
             <div nz-col nzSpan="6" *ngIf="orderInfo.inspectUsers">
-              陪检人员：{{ orderInfo.inspectUsers }}
+              执行人员：{{ orderInfo.inspectUsers }}
+            </div>
+            <div nz-col nzSpan="6" *ngIf="orderInfo.inspectUsersNum">
+              执行人数：{{ orderInfo.inspectUsersNum }}
             </div>
           </div>
           <div class="info" nz-row *ngIf="orderInfo.urgentDetails">

src/app/views/work-order-log/work-order-log-routing.module.ts

@@ -1,11 +1,19 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { WorkOrderLogComponent } from './work-order-log.component';
+import { OrderDetailComponent } from 'src/app/share/order-detail/order-detail.component';
 
 
 const routes: Routes = [{
   path: '',
   component: WorkOrderLogComponent,
+  children: [
+    {
+      // 查看详情
+      path: 'orderDetail/:id',
+      component: OrderDetailComponent,
+    }
+  ]
 }];
 
 @NgModule({

src/app/views/work-order-log/work-order-log.component.html

@@ -19,7 +19,8 @@
         </div>
       </div>
       <div nz-col nzXl='7' class="list-template__btns">
-        <button nz-button class="btn default" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='search()'>搜索</button>
+        <button nz-button class="btn default ml8" (click)='reset()'>重置</button>
       </div>
     </div>
     <div class="list-template__bottom">
@@ -50,7 +51,7 @@
             <td><button *ngIf="data.attachments" (click)="previewImageHandler(data.attachments)">查看图片</button><span *ngIf="!data.attachments">无</span></td>
             <td>
               <div class="coop">
-                <span (click)="del(data)">查看</span>
+                <span *ngIf="coopBtns.look" (click)="detail($event,data.workOrderId)">查看</span>
               </div>
             </td>
           </tr>
@@ -65,3 +66,5 @@
   </div>
 </div>
 <app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

src/app/views/work-order-log/work-order-log.component.ts

@@ -1,10 +1,10 @@
 import { Component, OnInit, ViewChild } from "@angular/core";
-import { ActivatedRoute } from "@angular/router";
+import { ActivatedRoute, Router } from "@angular/router";
 
 import { OverlayScrollbarsComponent } from "overlayscrollbars-ngx";
 import { ToolService } from "../../services/tool.service";
 import { WorkOrderLogService } from './work-order-log.service';
-import { format } from 'date-fns';
+import { format, startOfDay, endOfDay } from 'date-fns';
 
 @Component({
   selector: "app-work-order-log",
@@ -18,6 +18,7 @@ export class WorkOrderLogComponent implements OnInit {
   })
   osComponentRef1: OverlayScrollbarsComponent;
   constructor(
+    private router: Router,
     private route: ActivatedRoute,
     private tool: ToolService,
     private workOrderLogService: WorkOrderLogService,
@@ -57,7 +58,7 @@ export class WorkOrderLogComponent implements OnInit {
   previewImageHandler(data) {
     this.isPreview = false;
     data = data || [];
-    this.imgs = data.map((v) => 'http://192.168.3.108/file' + v.relativeFilePath);
+    this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath);
     this.isPreview = true;
   }
 
@@ -65,13 +66,25 @@ export class WorkOrderLogComponent implements OnInit {
   search() {
     this.getList(true);
   }
+  // 重置
+  reset() {
+    this.searchDto = {
+      dateRange: [],
+    }
+    this.search();
+  }
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl("/main/workOrderLog/orderDetail/" + id);
+  }
   // 表格数据
   loading1 = false;
   getList(isResetPageIndex = false) {
     isResetPageIndex && (this.pageIndex = 1);
     let searchDto = {
-      startTime: this.searchDto.dateRange[0] ? format(this.searchDto.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
-      endTime: this.searchDto.dateRange[1] ? format(this.searchDto.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      startTime: this.searchDto.dateRange[0] ? format(startOfDay(this.searchDto.dateRange[0]), 'yyyy-MM-dd HH:mm:ss') : undefined,
+      endTime: this.searchDto.dateRange[1] ? format(endOfDay(this.searchDto.dateRange[1]), 'yyyy-MM-dd HH:mm:ss') : undefined,
       logRemarks: this.searchDto.logRemarks,
       operation: this.operationList.find(v => v.id == this.searchDto.operation),
     }