bugfix

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/views/batch-specimen/batch-specimen.component.html

@@ -74,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

@@ -89,7 +89,12 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
   typeSpecimentList:any[] = [];
   patientSpecimentList:any[] = [];
   package:any = {};
+  maskFlag: any = false;
   querySaveSpePackage(){
+    this.maskFlag = this.message.loading("正在加载中..", {
+      nzDuration: 0,
+    }).messageId;
+
     let postData:any = {
       deptId: this.deptDTO.id,
     };
@@ -101,6 +106,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 || [];

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

@@ -72,7 +72,7 @@
             <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

@@ -237,4 +237,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}`);
+  }
 }