数据核对

src/app/services/main.service.ts

@@ -516,6 +516,12 @@ export class MainService {
       headers: this.headers,
     });
   }
+  //数据核对-原始数据
+  queryDataSource(data = {}) {
+    return this.http.post(host.host + "/testData/queryDataSource", data, {
+      headers: this.headers,
+    });
+  }
   // 更新,新增，删除检查类型设置
   upDictionary(data) {
     return this.http.post(host.host + "/common/common/upDictionary", data, {

src/app/views/info-search/info-search.component.html

@@ -1,7 +1,7 @@
 <div class="list-template">
   <div class="list-template__content">
     <div class="list-template__top" nz-row>
-      <div nz-col nzXl='16' 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)]="searchCriteria.id" />
@@ -9,7 +9,7 @@
         <div class="list-template__searchItem">
           <span class="label">类型：</span>
           <nz-select [nzDropdownMatchSelectWidth]="false" class="formItem" nzPlaceHolder="请选择类型"
-            [(ngModel)]="searchCriteria.target">
+            [(ngModel)]="searchCriteria.target" (ngModelChange)="changeTarget($event)">
             <ng-container *ngFor="let data of typeList">
               <nz-option *ngIf="!isLoading" nzLabel="{{data.name}}" nzValue="{{data.type}}"></nz-option>
             </ng-container>
@@ -18,8 +18,16 @@
             </nz-option>
           </nz-select>
         </div>
+        <div class="list-template__searchItem" *ngIf="searchCriteria.target === 'dataSource'">
+          <span class="label">时间范围</span>：
+          <nz-range-picker nzShowTime [(ngModel)]="dateRange" (nzOnCalendarChange)="onCalendarChangeDate($event)"></nz-range-picker>
+        </div>
+        <div class="list-template__searchItem" *ngIf="searchCriteria.target === 'dataSource'">
+          <span class="label">业务标识：</span>
+          <input nz-input class="formItem" placeholder="请输入业务标识" [(ngModel)]="searchCriteria.busiType" />
+        </div>
       </div>
-      <div nz-col nzXl="8" class="list-template__btns">
+      <div nz-col nzXl="7" class="list-template__btns">
         <button nz-button class="btn default" (click)='reset()'>重置</button>
         <button nz-button class="btn default ml8" (click)='getList()'>搜索</button>
       </div>

src/app/views/info-search/info-search.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit } from "@angular/core";
 import { MainService } from "src/app/services/main.service";
 import { ToolService } from "src/app/services/tool.service";
 import { NzModalService, NzMessageService } from "ng-zorro-antd";
+import { startOfDay, endOfDay, format } from 'date-fns';
 
 @Component({
   selector: "app-info-search",
@@ -16,10 +17,13 @@ export class InfoSearchComponent implements OnInit {
     private message: NzMessageService,
   ) {}
 
+  dateRange: any = []; //时间范围
+
   searchCriteria = {
     //搜索条件
     id: "", //编码
     target: "order", //类型
+    busiType: "", //业务标识
   };
   typeList = [
     {
@@ -57,12 +61,20 @@ export class InfoSearchComponent implements OnInit {
       panel.active = !panel.active;
     }
   }
+  // 日期选择
+  onCalendarChangeDate(dateArr){
+    if(dateArr.length == 2){
+      this.dateRange = [startOfDay(dateArr[0]), endOfDay(dateArr[1])];
+    }
+  }
   // 重置
   reset() {
+    this.dateRange = [];
     this.searchCriteria = {
       //搜索条件
       id: "",
       target: "order",
+      busiType: "",
     };
     this.getList();
   }
@@ -167,21 +179,48 @@ export class InfoSearchComponent implements OnInit {
       list: [],
     },
   ];
+  // 修改类型
+  changeTarget(e){
+    this.searchCriteria.id = '';
+    this.searchCriteria.busiType = '';
+    this.dateRange = [];
+  }
   // 获取数据
   getList() {
     this.loading1 = true;
-    let id = this.searchCriteria.id || "dsadmin";
-    console.log(id);
-    this.mainService
-      .infoSearch(this.searchCriteria.target, id)
-      .subscribe((result) => {
-        this.panels = this.panelsClone;
-        this.loading1 = false;
-        this.panels.forEach((item) => {
-          item.list = result[item.extra] || [];
+    console.log(this.dateRange)
+    if(this.searchCriteria.target == 'dataSource'){
+      // 原始数据
+      let postData = {
+        content: this.searchCriteria.id,
+        busiType: this.searchCriteria.busiType,
+        startTime: this.dateRange.length ? format(this.dateRange[0], 'yyyy-MM-dd HH:mm:ss') : undefined,
+        endTime: this.dateRange.length ? format(this.dateRange[1], 'yyyy-MM-dd HH:mm:ss') : undefined,
+      }
+      this.mainService
+        .queryDataSource(postData)
+        .subscribe((result) => {
+          this.panels = this.panelsClone;
+          this.loading1 = false;
+          this.panels.forEach((item) => {
+            item.list = result[item.extra] || [];
+          });
+          this.panels = this.panels.filter((item) => item.list.length > 0);
+        });
+    }else{
+      let id = this.searchCriteria.id || "dsadmin";
+      console.log(id);
+      this.mainService
+        .infoSearch(this.searchCriteria.target, id)
+        .subscribe((result) => {
+          this.panels = this.panelsClone;
+          this.loading1 = false;
+          this.panels.forEach((item) => {
+            item.list = result[item.extra] || [];
+          });
+          this.panels = this.panels.filter((item) => item.list.length > 0);
         });
-        this.panels = this.panels.filter((item) => item.list.length > 0);
-      });
+    }
   }
   // json弹窗
   toJson(json) {

src/app/views/specimen-search/specimen-search.component.ts

@@ -123,12 +123,13 @@ export class SpecimenSearchComponent implements OnInit {
   startDate: string; //发起时间开始
   endDate: string; //发起时间结束
 	changeDate(result?): void {
-	  if (!result) {
-	    this.startDate = this.endDate = "";
+	  if (result.length==0) {
+	    this.startDate = this.endDate = null;
 	    return;
 	  }
 	  this.startDate = format(result[0], 'yyyy-MM-dd HH:mm:ss');
 	  this.endDate = format(result[1], 'yyyy-MM-dd HH:mm:ss');
+    this.searchCriteria.dateRange = [this.startDate, this.endDate];
 	}
 	onCalendarChangeDate(dateArr){
 	  console.log(dateArr)
@@ -313,6 +314,8 @@ export class SpecimenSearchComponent implements OnInit {
         speState: this.searchCriteria.speState
           ? { id: this.searchCriteria.speState }
           : undefined,
+        startArriveTime: this.startDate || undefined,
+        endArriveTime: this.endDate || undefined,
       },
     };
     if (field && sort) {