标本视图优化

src/app/share/order-prompt-modal/order-prompt-modal.component.html

@@ -0,0 +1,45 @@
+<div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="show">
+  <div class="modalBody">
+    <div class="title">工单列表查看<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="content">
+      <nz-table class="hospitalTable" [nzData]="historySpecimenList" nzSize="middle" [nzShowPagination]="false"
+        [nzLoading]="hsLoading">
+        <thead>
+          <tr class="thead">
+              <th nzWidth="4%">序号</th>
+              <th nzWidth="8%">单号</th>
+              <th nzWidth="7%">申请科室</th>
+              <th nzWidth="5%">实际接收</th>
+              <th nzWidth="8%">发起时间</th>
+              <th nzWidth="8%">状态</th>
+              <th nzWidth="5%">操作</th>
+          </tr>
+        </thead>
+        <tbody>
+          <tr *ngFor="let data of historySpecimenList;let i = index;">
+              <td>{{ i + 1 }}</td>
+              <td>{{ data.gdcode || '无' }}</td>
+              <td>{{ data.createDeptDTO?data.createDeptDTO.dept:'无' }}</td>
+              <td>{{ data.actualReceiveNum }}</td>
+              <td>{{ data.startTime|date:'yyyy-MM-dd HH:mm'}}</td>
+              <td>{{ data.gdState?data.gdState.name:'无' }}</td>
+              <td>
+                <div class="coop">
+                  <span (click)="goToOrderDetail(data.id)">查看</span>
+                </div>
+              </td>
+          </tr>
+        </tbody>
+      </nz-table>
+      <div class="pagination">
+        <nz-pagination [(nzPageIndex)]="historySpecimenPageIndex" [(nzTotal)]="historySpecimenListLength"
+          [(nzPageSize)]="historySpecimenPageSize" (nzPageIndexChange)="getOrders()"
+          (nzPageSizeChange)="getOrders()">
+        </nz-pagination>
+      </div>
+    </div>
+    <div class="display_flex justify-content_flex-center">
+      <button class="btn know" nz-button nzType="primary" (click)="hideModal()">知道了</button>
+    </div>
+  </div>
+</div>

src/app/share/order-prompt-modal/order-prompt-modal.component.less

@@ -0,0 +1,176 @@
+@import "../../../../src/theme.less";
+.coop span {
+  display: inline-block;
+  padding: 0 8px;
+  cursor: pointer;
+  position: relative;
+}
+.modal {
+  position: fixed;
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  background: rgba(0, 0, 0, 0.4);
+  z-index: 8;
+  .ji {
+    position: absolute;
+    right: 0px;
+    top: -3px;
+    width: 30px;
+  }
+  .hospitalTable {
+    width: 100%;
+    td {
+      text-align: center !important;
+      position: relative;
+    }
+    .thead {
+      background-image: linear-gradient(to right, @bg-start, @bg-end);
+      th {
+        text-align: center !important;
+        color: #fff;
+        background: transparent;
+      }
+    }
+  }
+
+  .modalBody {
+    width: 1094px;
+    min-height: 220px;
+    background: #fff;
+    border-radius: 5px;
+    padding: 10px 20px;
+    color: #333;
+    &.modalBody-search {
+      width: 480px;
+      min-height: 250px;
+    }
+
+    .title {
+      width: 100%;
+      text-align: center;
+      font-size: 18px;
+      position: relative;
+
+      i {
+        position: absolute;
+        right: 0;
+        top: 0;
+        font-size: 20px;
+        color: #666;
+        cursor: pointer;
+        padding: 0 5px;
+      }
+    }
+
+    .content {
+      min-height: 117px;
+      background: #f9fafb;
+      border: 1px solid #e5e9ed;
+      border-radius: 5px;
+      overflow: hidden;
+      margin-top: 12px;
+      display: flex;
+      flex-direction: column;
+      justify-content: center;
+      align-items: center;
+      &.content-search {
+        min-height: 147px;
+        justify-content: start;
+        .defeat-search {
+          width: 100%;
+          height: 52px;
+          display: flex;
+          justify-content: center;
+          align-items: center;
+          border-bottom: solid 1px #e5e9ed;
+          em {
+            color: #666;
+            font-style: normal;
+          }
+        }
+        .form {
+          width: 100%;
+          padding: 0 16px;
+          .ant-form-item-label,
+          .ant-form-explain {
+            text-align: left !important;
+          }
+        }
+      }
+
+      div {
+        text-align: center;
+        margin: 0;
+
+        &.defeat {
+          color: #333;
+          font-size: 28px;
+        }
+        &.countDown {
+          font-size: 14px;
+          color: 666;
+          em {
+            font-style: normal;
+            color: @primary-color;
+          }
+        }
+
+        &:nth-child(3) {
+          font-size: 14px;
+          color: #666;
+          padding-bottom: 10px;
+        }
+      }
+    }
+
+    button {
+      margin-top: 10px;
+
+      &.btn {
+        margin-left: 8px;
+      }
+    }
+  }
+
+  // 新增
+  &.add {
+    .modalBody {
+      width: 480px;
+      height: auto;
+
+      .content {
+        width: 100%;
+        height: auto;
+        padding: 18px 14px 0 14px;
+
+        .addForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+
+        .editForm {
+          .ant-form-item {
+            margin-bottom: 15px;
+
+            .ant-form-item-label {
+              line-height: 0;
+            }
+          }
+        }
+      }
+
+      button {
+        &:nth-child(1) {
+          margin-right: 20px;
+        }
+      }
+    }
+  }
+}

src/app/share/order-prompt-modal/order-prompt-modal.component.ts

@@ -0,0 +1,61 @@
+import { Component, OnInit, Input, Output, EventEmitter } from '@angular/core';
+import { MainService } from '../../services/main.service';
+import { Router } from '@angular/router';
+
+@Component({
+  selector: 'app-order-prompt-modal',
+  templateUrl: './order-prompt-modal.component.html',
+  styleUrls: ['./order-prompt-modal.component.less']
+})
+export class OrderPromptModalComponent implements OnInit {
+  // 切换科室，切换弹窗
+  hsLoading = false;
+  historySpecimenList: any = [];
+  historySpecimenPageIndex: number = 1;//表格当前页码
+  historySpecimenPageSize: number = 5;//表格每页展示条数
+  historySpecimenListLength: number = 10;//表格总数据量
+  @Input() show: Boolean;
+  @Input() workId: any;
+
+  @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
+
+  constructor(private mainService: MainService,private router: Router) { }
+
+  ngOnInit() {
+    this.getOrders();
+  }
+  // 关闭弹窗
+  hideModal() {
+    this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
+  }
+  // 查看工单详情
+  goToOrderDetail(id){
+    this.router.navigateByUrl(`specimenView2/detailSample/${id}`);
+  }
+  // 获取列表数据
+  getOrders(idx?) {
+    if (idx) {
+      this.historySpecimenPageIndex = 1;
+    }
+    let postData = {
+      idx: this.historySpecimenPageIndex - 1,
+      sum: this.historySpecimenPageSize,
+      workOrder: {
+        hosId: JSON.parse(localStorage.getItem("user")).user.currentHospital.id,
+        worker: {id: this.workId},
+        gdState: {id: "72"},
+        taskType: {associationType: {id: 256}},
+      }
+    }
+    this.hsLoading = true;
+    this.mainService.getFetchDataList('data','workOrder',postData).subscribe(data => {
+      this.hsLoading = false;
+      this.historySpecimenList = data.list || [];
+      this.historySpecimenListLength = data.totalNum || 0;
+    })
+  }
+}
+
+
+
+

src/app/share/share.module.ts

@@ -34,6 +34,7 @@ import { LogPromptModalComponent } from './log-prompt-modal/log-prompt-modal.com
 import { DetailBxComponent } from './detail-bx/detail-bx.component';
 import { ImageViewerComponent } from './image-viewer/image-viewer.component';
 import { SpePromptModalComponent } from './spe-prompt-modal/spe-prompt-modal.component';
+import { OrderPromptModalComponent } from './order-prompt-modal/order-prompt-modal.component';
 
 @NgModule({
   declarations: [
@@ -66,6 +67,7 @@ import { SpePromptModalComponent } from './spe-prompt-modal/spe-prompt-modal.com
     DetailBxComponent,
     ImageViewerComponent,
     SpePromptModalComponent,
+    OrderPromptModalComponent,
   ],
   imports: [
     CommonModule,
@@ -113,6 +115,7 @@ import { SpePromptModalComponent } from './spe-prompt-modal/spe-prompt-modal.com
     DetailBxComponent,
     ImageViewerComponent,
     SpePromptModalComponent,
+    OrderPromptModalComponent,
   ]
 })
 export class ShareModule { }

src/app/share/spe-prompt-modal/spe-prompt-modal.component.ts

@@ -15,6 +15,7 @@ export class SpePromptModalComponent implements OnInit {
   historySpecimenListLength: number = 10;//表格总数据量
   @Input() show: Boolean;
   @Input() checkDeptId: String;
+  @Input() pharmacySearchKey: String;
   @Input() printDate: any;
 
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
@@ -39,6 +40,7 @@ export class SpePromptModalComponent implements OnInit {
       specimen: {
         hosId: JSON.parse(localStorage.getItem("user")).user.currentHospital.id,
         checkDept: {id: this.checkDeptId},
+        scode: this.pharmacySearchKey || undefined,
         speState: {id: 382},
         printDate: this.printDate?(new Date(this.printDate).getTime()):undefined,
       }

src/app/views/questionnaire-answer/questionnaire-answer.component.less

@@ -1,10 +1,11 @@
 @import "../../../../src/theme.less";
 
 :host {
-  ::ng-deep .ant-calendar-picker {
-    width: 100% !important;
+  ::ng-deep .ant-table table{
+    table-layout: fixed;
   }
 }
+
 .save {
   position: fixed;
   left: 0;

src/app/views/specimen-view2/specimen-view2.component.html

@@ -72,25 +72,25 @@
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span>检验项目</span>
-                <span>{{item.specimen_desc || '无'}}</span>
+                <span title="检验项目">{{item.specimen_desc || '无'}}</span>
+                <span></span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>患者姓名（床号）</span>
-                <span>{{item.patientname || '无'}}<span *ngIf="item.patientname && item.bednum">（{{item.bednum}}）</span></span>
+                <span title="标本编码">{{item.scode || '无'}}</span>
+                <span title="标本类型">{{item.stype || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>住院号</span>
-                <span>{{item.residence_no || '无'}}</span>
+                <span title="患者姓名（床号）">{{item.patientname || '无'}}（{{item.bednum || '无'}}）</span>
+                <span title="住院号">{{item.residence_no || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span class="moreContent left">{{item.sick_room || '无'}}</span>
+                <span title="起点科室" class="moreContent left">{{item.sick_room || '无'}}</span>
                 <span class="icon_transport transport-arrow-right-full"></span>
-                <span class="moreContent">{{item.check_dept || '无'}}</span>
+                <span title="终点科室" class="moreContent">{{item.check_dept || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>采集时间</span>
-                <span>{{item.print_date ? (item.print_date|date:'MM-dd HH:mm') :'无'}}</span>
+                <span></span>
+                <span title="采集时间">{{item.print_date ? (item.print_date|date:'MM-dd HH:mm') :'无'}}</span>
               </div>
             </div>
           </div>
@@ -161,30 +161,14 @@
       <overlay-scrollbars #osComponentRef2 class="pharmacy-main__selectionWrap">
         <div *ngIf="!loading2" style="height: 100%">
           <div
-            (click)="goToOrderDetail(item)"
+            (click)="showOrderList(item)"
             class="pharmacy-main__selection"
             *ngFor="let item of waitPharmacyList; let i = index"
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span>单号</span>
-                <span>{{item.gdcode || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>执行人</span>
-                <span>{{item.userName || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>科室名称</span>
-                <span class="moreContent">{{item.start_department || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>扫描标本总数</span>
-                <span>{{item.actual_receive_num || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>到达时间</span>
-                <span>{{item.arrivetime ? (item.arrivetime|date:'MM-dd HH:mm') :'无'}}</span>
+                <span title="执行人姓名">{{item.userName || '无'}}</span>
+                <span title="工单数量">{{item.orderNum || '无'}}</span>
               </div>
             </div>
           </div>
@@ -261,12 +245,8 @@
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span>科室名称</span>
-                <span class="moreContent">{{item.check_dept || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>数量</span>
-                <span>{{item.count || '无'}}</span>
+                <span title="检验科室名称" class="moreContent left">{{item.check_dept || '无'}}</span>
+                <span title="配送标本数量">{{item.count || '无'}}</span>
               </div>
             </div>
           </div>
@@ -343,24 +323,16 @@
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span>单号</span>
-                <span>{{item.gdcode || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>执行人</span>
-                <span>{{item.userName || '无'}}</span>
+                <span title="配送科室" class="moreContent left">{{item.deptList || '无'}}</span>
+                <span></span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>配送科室</span>
-                <span class="moreContent">{{item.deptList || '无'}}</span>
+                <span title="单号">{{item.gdcode || '无'}}</span>
+                <span title="执行人">{{item.userName || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>建单时间</span>
-                <span>{{item.starttime ? (item.starttime|date:'MM-dd HH:mm') :'无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>标本总数</span>
-                <span>{{item.count || '无'}}</span>
+                <span title="建单时间">{{item.starttime ? (item.starttime|date:'MM-dd HH:mm') :'无'}}</span>
+                <span title="标本总数">{{item.count === undefined ? '无' : item.count}}</span>
               </div>
             </div>
           </div>
@@ -437,45 +409,29 @@
           >
             <div class="pharmacy-main__selectionInfo">
               <div class="pharmacy-main__selectionItem">
-                <span>标本编码</span>
-                <span>{{item.scode || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>标本类型</span>
-                <span>{{item.stype || '无'}}</span>
+                <span title="检验项目">{{item.specimen_desc || '无'}}</span>
+                <span></span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>检验项目</span>
-                <span>{{item.specimen_desc || '无'}}</span>
+                <span title="标本编码">{{item.scode || '无'}}</span>
+                <span title="标本类型">{{item.stype || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>状态</span>
-                <span>{{item.spe_state || '无'}}</span>
+                <span title="患者姓名（床号）">{{item.patientname || '无'}}（{{item.bednum || '无'}}）</span>
+                <span title="住院号">{{item.residence_no || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>住院号</span>
-                <span>{{item.residence_no || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>患者姓名（床号）</span>
-                <span>{{item.patientname || '无'}}<span *ngIf="item.patientname && item.bednum">（{{item.bednum}}）</span></span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>收取人</span>
-                <span>{{item.receiver || '无'}}</span>
-              </div>
-              <div class="pharmacy-main__selectionItem">
-                <span>收取时间</span>
-                <span>{{item.arrive_time ? (item.arrive_time|date:'MM-dd HH:mm') : '无'}}</span>
+                <span title="起点科室" class="moreContent left">{{item.sick_room || '无'}}</span>
+                <span class="icon_transport transport-arrow-right-full"></span>
+                <span title="终点科室" class="moreContent">{{item.check_dept || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span>中转时间</span>
-                <span>{{item.trans_time ? (item.trans_time|date:'MM-dd HH:mm') : '无'}}</span>
+                <span title="收取时间">{{item.arrive_time ? (item.arrive_time|date:'MM-dd HH:mm') : '无'}}</span>
+                <span title="收取人">{{item.receiver || '无'}}</span>
               </div>
               <div class="pharmacy-main__selectionItem">
-                <span class="moreContent left">{{item.sick_room || '无'}}</span>
-                <span class="icon_transport transport-arrow-right-full"></span>
-                <span class="moreContent">{{item.check_dept || '无'}}</span>
+                <span></span>
+                <span title="中转时间">{{item.trans_time ? (item.trans_time|date:'MM-dd HH:mm') : '无'}}</span>
               </div>
             </div>
           </div>
@@ -593,6 +549,15 @@
   *ngIf="spePromptModalShow"
   [show]="spePromptModalShow"
   [checkDeptId]="checkDeptId"
+  [pharmacySearchKey]="pharmacySearchKey"
   [printDate]="printDate"
   (closeModelHs)="closeModelSpe($event)"
 ></app-spe-prompt-modal>
+
+<!-- 工单列表查看 -->
+<app-order-prompt-modal
+  *ngIf="orderPromptModalShow"
+  [show]="orderPromptModalShow"
+  [workId]="workId"
+  (closeModelHs)="closeModelOrder($event)"
+></app-order-prompt-modal>

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

@@ -174,6 +174,19 @@ export class SpecimenView2Component implements OnInit, OnDestroy {
     this.spePromptModalShow = JSON.parse(e).show;
     this.autoUpdate(false);
   }
+   // 查看工单列表弹窗
+   orderPromptModalShow = false; //弹窗开关
+   workId = ""; //支助人员ID
+   showOrderList(data) {
+     clearInterval(this.logTimer);
+     this.workId = data.workerid;
+     this.orderPromptModalShow = true;
+   }
+   // 关闭工单列表弹窗
+   closeModelOrder(e) {
+     this.orderPromptModalShow = JSON.parse(e).show;
+     this.autoUpdate(false);
+   }
   // 自动刷新倒计时
   autoUpdate(flag = true) {
     if (flag) {