工单日志

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

@@ -1,9 +1,24 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl='6' class="list-template__searchBox">
+      <div nz-col nzXl='17' class="list-template__searchBox">
+        <div class="list-template__searchItem">
+          <span class="label">备注</span>：
+          <input nz-input class="formItem" placeholder="请输入备注" [(ngModel)]="searchDto.logRemarks" />
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">操作类型</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" [nzShowSearch]="false" nzAllowClear
+            nzPlaceHolder="请选择操作类型" [(ngModel)]="searchDto.operation">
+            <nz-option *ngFor="let option of operationList" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+          </nz-select>
+        </div>
+        <div class="list-template__searchItem">
+          <span class="label">操作时间</span>：
+          <nz-range-picker [(ngModel)]="searchDto.dateRange"></nz-range-picker>
+        </div>
       </div>
-      <div nz-col nzXl='18' class="list-template__btns">
+      <div nz-col nzXl='7' class="list-template__btns">
         <button nz-button class="btn default" (click)='search()'>搜索</button>
       </div>
     </div>
@@ -25,14 +40,14 @@
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData;let index=index;">
-            <td>{{ data.title }}</td>
-            <td>{{ data.taskNames }}</td>
-            <td>{{ data.deptNames }}</td>
-            <td>{{ data.type?.name }}</td>
-            <td>{{ data.type?.name }}</td>
-            <td>{{ data.type?.name }}</td>
-            <td>{{ data.type?.name }}</td>
-            <td>{{ data.type?.name }}</td>
+            <td>{{ data.gdcode }}</td>
+            <td>{{ data.createDept?.dept }}</td>
+            <td>{{ data.operation?.name }}</td>
+            <td>{{ data.username }}</td>
+            <td>{{ data.handoverUserid?.name }}</td>
+            <td>{{ data.operationTime }}</td>
+            <td>{{ data.logRemarks }}</td>
+            <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>
@@ -49,3 +64,4 @@
     </div>
   </div>
 </div>
+<app-image-viewer [imageUrl]="imgs" hidden *ngIf="isPreview" [isPreviewNow]="true"></app-image-viewer>

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

@@ -4,6 +4,7 @@ import { ActivatedRoute } 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';
 
 @Component({
   selector: "app-work-order-log",
@@ -23,6 +24,9 @@ export class WorkOrderLogComponent implements OnInit {
   ) {}
 
   listOfData: any[] = []; //表格数据
+  searchDto: any = {
+    dateRange: [],
+  }
 
   hosId: any; //院区（搜索）
   pageIndex: number = 1; //页码
@@ -36,6 +40,25 @@ export class WorkOrderLogComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.hosId = this.tool.getCurrentHospital().id;
     this.getList(true);
+    this.getOperationList();
+  }
+
+  // 获取快捷类型
+  operationList: any[] = [];
+  getOperationList() {
+    this.workOrderLogService.getDictionary("gdOperate").subscribe((res) => {
+      this.operationList = res || [];
+    });
+  }
+
+  // 预览图片
+  imgs = [];
+  isPreview = false;
+  previewImageHandler(data) {
+    this.isPreview = false;
+    data = data || [];
+    this.imgs = data.map((v) => 'http://192.168.3.108/file' + v.relativeFilePath);
+    this.isPreview = true;
   }
 
   // 搜索
@@ -46,10 +69,17 @@ export class WorkOrderLogComponent implements OnInit {
   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,
+      logRemarks: this.searchDto.logRemarks,
+      operation: this.operationList.find(v => v.id == this.searchDto.operation),
+    }
     let data = {
       pageIndex: this.pageIndex,
       pageSize: this.pageSize,
       hosId: this.hosId,
+      searchDto,
     };
     this.loading1 = true;
     this.workOrderLogService

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

@@ -1,6 +1,5 @@
 import { Injectable } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
-import { map } from 'rxjs/operators';
 
 @Injectable({
   providedIn: 'root'
@@ -11,37 +10,23 @@ export class WorkOrderLogService {
   ) { }
 
   // 列表-查
-  query({pageIndex, pageSize, hosId}) {
+  query({pageIndex, pageSize, hosId, searchDto}) {
+    console.log(searchDto);
     let data = {
       idx: pageIndex - 1,
       sum: pageSize,
       record: {
         hosId,
+        ...searchDto,
       },
     };
     return this.mainService.getFetchDataList("simple/data", "record", data);
   }
 
-  // 查询科室
-  // queryDept({hosId, keywords}){
-  //   let postData = {
-  //     department: {
-  //       simpleQuery: true,
-  //       hospital: {id: hosId},
-  //       dept: keywords,
-  //     },
-  //     idx: 0,
-  //     sum: 9999,
-  //   };
-  //   return this.mainService.getFetchDataList("data", "department", postData).pipe(map((v:any) => {
-  //     if(Array.isArray(v.list)){
-  //       v.list = v.list.map(vv => ({id: vv.id, name: vv.dept}));
-  //     }else{
-  //       v.list = [];
-  //     }
-  //     return v;
-  //   }));
-  // }
+  // 字典
+  getDictionary(type) {
+    return this.mainService.getDictionary("list", type);
+  }
 }