数据对接

src/app/share/select-date-yytime/select-date-yytime.component.ts

@@ -49,11 +49,7 @@ export class SelectDateYytimeComponent implements OnInit {
 
   // 立即执行
   submitFormDirect(): void {
-    if(!this.yyDate || !this.yyTime) {
-      this.message.warning('请选择完整预约时间');
-      return;
-    }
-    this.submitFormDirectE.emit(format(this.yyDate, 'yyyy-MM-dd') + ' ' + format(startOfMinute(this.yyTime), 'HH:mm:ss'));
+    this.submitFormDirectE.emit();
   }
 }
 

src/app/views/batch-inspection/batch-inspection.component.ts

@@ -413,8 +413,7 @@ export class BatchInspectionComponent implements OnInit {
   }
 
   // 批量发起陪检-立即执行
-  submitSelectDateDirect(date){
-    console.log(date)
+  submitSelectDateDirect(){
     let pilList = cloneDeep(this.listOfData);
     pilList.forEach(v => {
       delete v.inspectList;

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

@@ -32,7 +32,7 @@
             <!-- 检查列表 -->
             <div *ngSwitchCase="'inspectList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #inspectListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -105,7 +105,7 @@
             <!-- 工单信息 -->
             <div *ngSwitchCase="'order'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #orderTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -207,7 +207,7 @@
             <!-- 工单日志 -->
             <div *ngSwitchCase="'orderLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #orderLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -231,7 +231,7 @@
             <!-- 检查日志 -->
             <div *ngSwitchCase="'inspectLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #inspectLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -253,7 +253,7 @@
             <!-- 标本列表 -->
             <div *ngSwitchCase="'specimenList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #specimenListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -330,7 +330,7 @@
             <!-- 标本日志 -->
             <div *ngSwitchCase="'specimenLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #specimenLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -352,7 +352,7 @@
             <!-- 药品列表 -->
             <div *ngSwitchCase="'drugsBagList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #drugsBagListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -420,7 +420,7 @@
             <!-- 药包日志 -->
             <div *ngSwitchCase="'drugsBagLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #drugsBagLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -442,7 +442,7 @@
             <!-- 药品日志 -->
             <div *ngSwitchCase="'drugsLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #drugsLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -464,7 +464,7 @@
             <!-- 静配包列表 -->
             <div *ngSwitchCase="'jpBagList'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #jpBagListTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -515,7 +515,7 @@
             <!-- 静配包日志 -->
             <div *ngSwitchCase="'jpBagLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #jpBagLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -537,7 +537,7 @@
             <!-- 静配日志 -->
             <div *ngSwitchCase="'jpLogs'" class="list-template__bottom">
               <nz-table class="list-template__nzTable" #jpLogsTpl [nzData]="panel.list" nzSize="middle"
-                [nzShowPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
                 <thead>
                   <tr class="thead">
                     <th nzWidth="130px">序号</th>
@@ -556,6 +556,32 @@
                 </tbody>
               </nz-table>
             </div>
+            <!-- 原始数据日志 -->
+            <div *ngSwitchCase="'dataSourceList'" class="list-template__bottom">
+              <nz-table class="list-template__nzTable" #dataSourceTpl [nzData]="panel.list" nzSize="middle"
+                [nzFrontPagination]="false" [nzLoading]="loading1" [ngStyle]="{width:panel.list[0].length*130+292+'px'}">
+                <thead>
+                  <tr class="thead">
+                    <th nzWidth="110px">业务标识</th>
+                    <th nzWidth="150px">时间</th>
+                    <th nzWidth="800px">原始数据</th>
+                    <th nzWidth="110px">优先级</th>
+                    <th nzWidth="110px">状态标识</th>
+                    <th nzWidth="150px">业务唯一标识</th>
+                  </tr>
+                </thead>
+                <tbody>
+                  <tr *ngFor="let data of dataSourceTpl.data;let i = index">
+                    <td>{{data[5]}}</td>
+                    <td>{{data[1]|date:'yyyy-MM-dd HH:mm:ss'}}</td>
+                    <td (click)="toSource(data[2], '原始数据')" class="wordBreak">{{data[2]}}</td>
+                    <td>{{data[3]}}</td>
+                    <td>{{data[4]}}</td>
+                    <td>{{data[6]}}</td>
+                  </tr>
+                </tbody>
+              </nz-table>
+            </div>
           </ng-container>
         </app-collapse-panel>
       </app-collapse>

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

@@ -1,7 +1,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 } from "ng-zorro-antd";
+import { NzModalService, NzMessageService } from "ng-zorro-antd";
 
 @Component({
   selector: "app-info-search",
@@ -12,7 +12,8 @@ export class InfoSearchComponent implements OnInit {
   constructor(
     private mainService: MainService,
     private tool: ToolService,
-    private modalService: NzModalService
+    private modalService: NzModalService,
+    private message: NzMessageService,
   ) {}
 
   searchCriteria = {
@@ -41,6 +42,10 @@ export class InfoSearchComponent implements OnInit {
       type: "jpBag",
       name: "静配",
     },
+    {
+      type: "dataSource",
+      name: "原始数据",
+    },
   ]; // 类型列表
   hosId;
   ngOnInit() {
@@ -155,6 +160,12 @@ export class InfoSearchComponent implements OnInit {
       extra: "jpLogs",
       list: [],
     },
+    {
+      active: true,
+      name: "原始数据日志",
+      extra: "dataSourceList",
+      list: [],
+    },
   ];
   // 获取数据
   getList() {
@@ -181,4 +192,17 @@ export class InfoSearchComponent implements OnInit {
       nzMaskClosable: true,
     });
   }
+  // 弹窗
+  toSource(string, name) {
+    this.modalService.info({
+      nzTitle: name,
+      nzContent: "<pre>" + string + "</pre>",
+      nzWidth: 1000,
+      nzMaskClosable: true,
+      nzOnOk: () => {
+        navigator.clipboard.writeText(string);
+        this.message.info(`复制${name}成功`);
+      }
+    });
+  }
 }