Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

src/app/share/dialog-delete/dialog-delete.component.html

@@ -1,6 +1,6 @@
 <!-- 删除模态框 -->
 <div class="dialog-delete" *ngIf="delModal" [ngStyle]="{'z-index': (isSelected || isShowEndDeptId) ? '9' : '9999999'}">
-  <div class="modalBody" [ngStyle]="{'height': isSelected ? 'auto' : '220px'}">
+  <div class="modalBody">
     <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal('x')"></i></div>
     <div class="content">
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>

src/app/share/package-specimen-rule/package-specimen-rule.component.html

@@ -6,6 +6,7 @@
       <div class="block">
         <div class="name">标本紧急度：</div>
         <div class="value">
+          <ng-container *ngIf="configs.spePackageUrgentsList.length == 0">无限制条件</ng-container>
           <ng-container *ngFor="let item of configs.spePackageUrgentsList;let last = last">
             {{item.name}}<ng-container *ngIf="!last">、</ng-container>
           </ng-container>
@@ -14,6 +15,7 @@
       <div class="block">
         <div class="name">关联检验科室：</div>
         <div class="value">
+          <ng-container *ngIf="configs.spePackageDeptList.length == 0">无限制条件</ng-container>
           <ng-container *ngFor="let item of configs.spePackageDeptList;let last = last">
             {{item.dept}}<br *ngIf="!last">
           </ng-container>
@@ -22,6 +24,7 @@
       <div class="block">
         <div class="name">关联试管类型：</div>
         <div class="value">
+          <ng-container *ngIf="configs.spePackageTubeList.length == 0">无限制条件</ng-container>
           <ng-container *ngFor="let item of configs.spePackageTubeList;let last = last">
             {{item.name}}<ng-container *ngIf="!last">、</ng-container>
           </ng-container>

src/app/share/specimen-package-list-modal/specimen-package-list-modal.component.html

@@ -24,10 +24,10 @@
             <th nzWidth="6%">打包人</th>
             <th nzWidth="15%">打包时间</th>
             <th nzWidth="6%">标本数</th>
-            <th nzWidth="6%">配送人</th>
-            <th nzWidth="15%">配送时间</th>
-            <th nzWidth="6%">接收人</th>
-            <th nzWidth="15%">接收时间</th>
+            <th nzWidth="6%">收取人</th>
+            <th nzWidth="15%">收取时间</th>
+            <th nzWidth="6%">送达人</th>
+            <th nzWidth="15%">送达时间</th>
             <th nzWidth="8%">状态</th>
             <th nzWidth="10%">操作</th>
           </tr>
@@ -38,10 +38,10 @@
             <td>{{ data.packUserDTO?.name }}</td>
             <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.specimenNum }}</td>
-            <td>{{ data.deliveryUserDTO?.name }}</td>
-            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.receiveUserDTO?.name }}</td>
             <td>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.deliveryUserDTO?.name }}</td>
+            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.status?.name }}</td>
             <td>
               <div class="coop">

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

@@ -58,7 +58,8 @@
   </nz-table>
 </div>
 <div class="footer display_flex align-items_center justify-content_flex-center">
-  <button nzType="primary" class="btn" nz-button (click)='packageHandler()' *ngIf="this.total > 0">打包</button>
+  <button nzType="primary" class="btn" nz-button (click)='packageHandler()' *ngIf="this.total > 0 && package.status.value === '0'">打包</button>
+  <button nzType="primary" class="btn" nz-button (click)='printPackage()' *ngIf="this.total > 0 && package.status.value === '1'">补打</button>
   <button nzType="default" nz-button class="btn cancel ml8" (click)='goBack()'>取消</button>
 </div>
 
@@ -73,6 +74,9 @@
 
 <app-package-specimen-rule *ngIf="isShowPackageSpecimenRule" (cancelFlagHand)="closePackageSpecimenRule($event)"></app-package-specimen-rule>
 
+<!-- 遮罩 -->
+<app-mask *ngIf="maskFlag"></app-mask>
+
 <!-- 打印的内容 -->
 <div id="print-section" hidden>
   <!-- 80mm*80mm -->

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

@@ -90,6 +90,10 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
   patientSpecimentList:any[] = [];
   package:any = {};
   querySaveSpePackage(){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
     let postData:any = {
       deptId: this.deptDTO.id,
     };
@@ -101,6 +105,8 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
     this.mainService
       .querySaveSpePackage(postData)
       .subscribe((result:any) => {
+        this.message.remove(this.maskFlag);
+        this.maskFlag = false;
         if (result.state == 200) {
           this.total = result.totalCount;
           this.typeSpecimentList = result.tube || [];
@@ -232,7 +238,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
     this.getSpePackageEndDeptList();
   }
 
-  // 查询标本包里的所有终点克是
+  // 查询标本包里的所有终点科室
   isShowEndDeptIdArr:any[] = [];
   getSpePackageEndDeptList(){
     this.mainService

src/app/views/specimen-package/specimen-package-routing.module.ts

@@ -1,12 +1,20 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { SpecimenPackageComponent } from './specimen-package.component';
+import { OrderDetailComponent } from 'src/app/share/order-detail/order-detail.component';
 
 
 const routes: Routes = [
   {
     path: '',
     component: SpecimenPackageComponent,
+    children: [
+      {
+        // 查看详情
+        path: 'orderDetail/:id',
+        component: OrderDetailComponent,
+      }
+    ]
   }
 ];
 

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

@@ -18,8 +18,8 @@
           </nz-select>
         </div>
         <div class="list-template__searchItem">
-          <span class="label">配送人</span>：
-          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择配送人" [(ngModel)]="searchDto.deliveryUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
+          <span class="label">送达人</span>：
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择送达人" [(ngModel)]="searchDto.deliveryUser" nzAllowClear nzServerSearch nzShowSearch (nzOnSearch)="changeInp('patient', $event)" (nzOpenChange)="openChangePatient($event)" (ngModelChange)="setIsSelecting(true)">
             <ng-container *ngFor="let option of deliveryUserList">
               <nz-option *ngIf="!isLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
             </ng-container>
@@ -55,8 +55,8 @@
             <th nzWidth="10%">打包科室</th>
             <th nzWidth="10%">检验科室</th>
             <th nzWidth="10%">标本数</th>
-            <th nzWidth="10%">配送人|配送时间</th>
-            <th nzWidth="10%">接收人|接收时间</th>
+            <th nzWidth="10%">收取人|收取时间</th>
+            <th nzWidth="10%">送达人|送达时间</th>
             <th nzWidth="10%">状态</th>
             <th nzWidth="10%">工单号</th>
             <th nzWidth="10%">操作</th>
@@ -69,10 +69,10 @@
             <td>{{data.packDeptDTO?.dept}}</td>
             <td>{{ data.endDeptNames }}</td>
             <td>{{data.specimenNum}}</td>
-            <td>{{ data.deliveryUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.receiveUserDTO?.name }}<br>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
+            <td>{{ data.deliveryUserDTO?.name }}<br>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
             <td>{{ data.status?.name }}</td>
-            <td>{{ data.gdDTO?.gdcode }}</td>
+            <td class="clickable" (click)="detail($event, data.gdid)">{{ data.gdDTO?.gdcode }}</td>
             <td>
               <div class="coop">
                 <span (click)="showLogs(data)">查看日志</span>
@@ -101,3 +101,6 @@
   [id]="packId"
   (closeModelHs)="closeModelLog($event)"
 ></app-specimen-package-log-prompt-modal>
+
+<!-- 查看详情 -->
+<router-outlet></router-outlet>

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

@@ -61,12 +61,6 @@ export class SpecimenPackageComponent implements OnInit {
   // 初始化增删改按钮
   coopBtns: any = {};
 
-  // 查看
-  detail(e, id) {
-    e.stopPropagation();
-    this.router.navigateByUrl("/main/patientInspectLog/patientInspectLogDetail/" + id);
-  }
-
   // 日期选择
   onCalendarChangeDate(dateArr){
     if(dateArr.length == 2){
@@ -184,7 +178,7 @@ export class SpecimenPackageComponent implements OnInit {
     flag && this.getDeliveryUserList();
   }
 
-  // 获取配送人
+  // 获取送达人
   deliveryUserList: any = [];
   getDeliveryUserList(e = undefined) {
     let postData = {
@@ -237,4 +231,10 @@ export class SpecimenPackageComponent implements OnInit {
   closeModelLog(e) {
     this.logPromptModalShow = JSON.parse(e).show;
   }
+
+  // 查看
+  detail(e, id) {
+    e.stopPropagation();
+    this.router.navigateByUrl(`/main/specimenPackage/orderDetail/${id}`);
+  }
 }