Bläddra i källkod

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

maotao 2 veckor sedan
förälder
incheckning
721ee35d98

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

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

+ 3 - 0
src/app/share/package-specimen-rule/package-specimen-rule.component.html

@@ -6,6 +6,7 @@
6 6
       <div class="block">
7 7
         <div class="name">标本紧急度:</div>
8 8
         <div class="value">
9
+          <ng-container *ngIf="configs.spePackageUrgentsList.length == 0">无限制条件</ng-container>
9 10
           <ng-container *ngFor="let item of configs.spePackageUrgentsList;let last = last">
10 11
             {{item.name}}<ng-container *ngIf="!last">、</ng-container>
11 12
           </ng-container>
@@ -14,6 +15,7 @@
14 15
       <div class="block">
15 16
         <div class="name">关联检验科室:</div>
16 17
         <div class="value">
18
+          <ng-container *ngIf="configs.spePackageDeptList.length == 0">无限制条件</ng-container>
17 19
           <ng-container *ngFor="let item of configs.spePackageDeptList;let last = last">
18 20
             {{item.dept}}<br *ngIf="!last">
19 21
           </ng-container>
@@ -22,6 +24,7 @@
22 24
       <div class="block">
23 25
         <div class="name">关联试管类型:</div>
24 26
         <div class="value">
27
+          <ng-container *ngIf="configs.spePackageTubeList.length == 0">无限制条件</ng-container>
25 28
           <ng-container *ngFor="let item of configs.spePackageTubeList;let last = last">
26 29
             {{item.name}}<ng-container *ngIf="!last">、</ng-container>
27 30
           </ng-container>

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

@@ -24,10 +24,10 @@
24 24
             <th nzWidth="6%">打包人</th>
25 25
             <th nzWidth="15%">打包时间</th>
26 26
             <th nzWidth="6%">标本数</th>
27
-            <th nzWidth="6%">配送人</th>
28
-            <th nzWidth="15%">配送时间</th>
29
-            <th nzWidth="6%">接收人</th>
30
-            <th nzWidth="15%">接收时间</th>
27
+            <th nzWidth="6%">收取人</th>
28
+            <th nzWidth="15%">收取时间</th>
29
+            <th nzWidth="6%">送达人</th>
30
+            <th nzWidth="15%">送达时间</th>
31 31
             <th nzWidth="8%">状态</th>
32 32
             <th nzWidth="10%">操作</th>
33 33
           </tr>
@@ -38,10 +38,10 @@
38 38
             <td>{{ data.packUserDTO?.name }}</td>
39 39
             <td>{{ data.packTime | date: 'yyyy-MM-dd HH:mm'}}</td>
40 40
             <td>{{ data.specimenNum }}</td>
41
-            <td>{{ data.deliveryUserDTO?.name }}</td>
42
-            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
43 41
             <td>{{ data.receiveUserDTO?.name }}</td>
44 42
             <td>{{ data.receiveTime | date: 'yyyy-MM-dd HH:mm'}}</td>
43
+            <td>{{ data.deliveryUserDTO?.name }}</td>
44
+            <td>{{ data.deliveryTime | date: 'yyyy-MM-dd HH:mm'}}</td>
45 45
             <td>{{ data.status?.name }}</td>
46 46
             <td>
47 47
               <div class="coop">

+ 5 - 1
src/app/views/batch-specimen/batch-specimen.component.html

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

+ 7 - 1
src/app/views/batch-specimen/batch-specimen.component.ts

@@ -90,6 +90,10 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
90 90
   patientSpecimentList:any[] = [];
91 91
   package:any = {};
92 92
   querySaveSpePackage(){
93
+    this.maskFlag = this.message.loading("正在加载中..", {
94
+      nzDuration: 0,
95
+    }).messageId;
96
+
93 97
     let postData:any = {
94 98
       deptId: this.deptDTO.id,
95 99
     };
@@ -101,6 +105,8 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
101 105
     this.mainService
102 106
       .querySaveSpePackage(postData)
103 107
       .subscribe((result:any) => {
108
+        this.message.remove(this.maskFlag);
109
+        this.maskFlag = false;
104 110
         if (result.state == 200) {
105 111
           this.total = result.totalCount;
106 112
           this.typeSpecimentList = result.tube || [];
@@ -232,7 +238,7 @@ export class BatchSpecimenComponent implements OnInit, AfterViewInit {
232 238
     this.getSpePackageEndDeptList();
233 239
   }
234 240
 
235
-  // 查询标本包里的所有终点克是
241
+  // 查询标本包里的所有终点科室
236 242
   isShowEndDeptIdArr:any[] = [];
237 243
   getSpePackageEndDeptList(){
238 244
     this.mainService

+ 8 - 0
src/app/views/specimen-package/specimen-package-routing.module.ts

@@ -1,12 +1,20 @@
1 1
 import { NgModule } from '@angular/core';
2 2
 import { Routes, RouterModule } from '@angular/router';
3 3
 import { SpecimenPackageComponent } from './specimen-package.component';
4
+import { OrderDetailComponent } from 'src/app/share/order-detail/order-detail.component';
4 5
 
5 6
 
6 7
 const routes: Routes = [
7 8
   {
8 9
     path: '',
9 10
     component: SpecimenPackageComponent,
11
+    children: [
12
+      {
13
+        // 查看详情
14
+        path: 'orderDetail/:id',
15
+        component: OrderDetailComponent,
16
+      }
17
+    ]
10 18
   }
11 19
 ];
12 20
 

+ 9 - 6
src/app/views/specimen-package/specimen-package.component.html

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

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

@@ -61,12 +61,6 @@ export class SpecimenPackageComponent implements OnInit {
61 61
   // 初始化增删改按钮
62 62
   coopBtns: any = {};
63 63
 
64
-  // 查看
65
-  detail(e, id) {
66
-    e.stopPropagation();
67
-    this.router.navigateByUrl("/main/patientInspectLog/patientInspectLogDetail/" + id);
68
-  }
69
-
70 64
   // 日期选择
71 65
   onCalendarChangeDate(dateArr){
72 66
     if(dateArr.length == 2){
@@ -184,7 +178,7 @@ export class SpecimenPackageComponent implements OnInit {
184 178
     flag && this.getDeliveryUserList();
185 179
   }
186 180
 
187
-  // 获取送人
181
+  // 获取送
188 182
   deliveryUserList: any = [];
189 183
   getDeliveryUserList(e = undefined) {
190 184
     let postData = {
@@ -237,4 +231,10 @@ export class SpecimenPackageComponent implements OnInit {
237 231
   closeModelLog(e) {
238 232
     this.logPromptModalShow = JSON.parse(e).show;
239 233
   }
234
+
235
+  // 查看
236
+  detail(e, id) {
237
+    e.stopPropagation();
238
+    this.router.navigateByUrl(`/main/specimenPackage/orderDetail/${id}`);
239
+  }
240 240
 }