药品流程信息

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

@@ -16,7 +16,7 @@ export class LogPromptModalComponent implements OnInit {
   historySpecimenPageSize: number = 5; //表格每页展示条数
   historySpecimenListLength: number = 10; //表格总数据量
   @Input() show: Boolean;
-  @Input() packid: String;
+  @Input() drugsBagId: String;
 
   @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
@@ -40,7 +40,7 @@ export class LogPromptModalComponent implements OnInit {
       sum: this.historySpecimenPageSize,
       drugsBagOperationLog: {
         hosId: this.hosId,
-        packid: this.packid,
+        drugsBagId: this.drugsBagId,
       },
     };
     this.hsLoading = true;

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

@@ -45,16 +45,16 @@
         <thead>
           <tr class="thead">
             <th nzWidth="6%">序号</th>
-            <th nzWidth="11%">发药科室</th>
-            <th nzWidth="11%">申请科室</th>
-            <th nzWidth="11%">同步时间</th>
+            <th nzWidth="10%">发药科室</th>
+            <th nzWidth="10%">申请科室</th>
+            <th nzWidth="10%">同步时间</th>
             <th nzWidth="10%">药品状态</th>
-            <!-- <th nzWidth="14%">批次号</th> -->
-            <th nzWidth="11%">记账时间</th>
-            <th nzWidth="11%">配药时间</th>
-            <th nzWidth="11%">核对时间</th>
+            <th nzWidth="10%">记账时间</th>
+            <th nzWidth="10%">配药时间</th>
+            <th nzWidth="10%">核对时间</th>
             <th nzWidth="10%">请领单号</th>
-            <th nzWidth="8%">药品标识</th>
+            <th nzWidth="7%">药品标识</th>
+            <th nzWidth="7%">操作</th>
           </tr>
         </thead>
         <tbody>
@@ -64,12 +64,12 @@
             <td>{{ data.target?.dept }}</td>
             <td>{{ data.creatTime }}</td>
             <td>{{ data.drugsState?.name }}</td>
-            <!-- <td>{{data.batchNo}}</td> -->
             <td>{{data.bagTime}}</td>
             <td>{{data.startDispensingTime}}</td>
             <td>{{data.checkTime}}</td>
             <td>{{data.packid}}</td>
             <td>{{data.id}}</td>
+            <td><button (click)="showLogs(data)">查看历史</button></td>
           </tr>
         </tbody>
       </nz-table>
@@ -88,3 +88,10 @@
 <app-prompt-modal *ngIf="promptModalShow" [content]="promptContent" [success]="ifSuccess" [show]="promptModalShow"
   [info]="promptInfo">
 </app-prompt-modal>
+<!-- 药包流程信息查看 -->
+<app-log-prompt-modal
+  *ngIf="logPromptModalShow"
+  [show]="logPromptModalShow"
+  [drugsBagId]="drugsBagId"
+  (closeModelHs)="closeModelLog($event)"
+></app-log-prompt-modal>

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

@@ -32,6 +32,17 @@ export class DrugSearchComponent implements OnInit {
     });
     this.getHospital();
   }
+  // 查看流程信息弹窗
+  logPromptModalShow = false; //弹窗开关
+  drugsBagId = ""; //查看记录携带id
+  showLogs(data) {
+    this.drugsBagId = data.id;
+    this.logPromptModalShow = true;
+  }
+  // 关闭流程信息弹窗
+  closeModelLog(e) {
+    this.logPromptModalShow = JSON.parse(e).show;
+  }
   // 清空药品
   delModal: boolean = false; //删除模态框
   tipsMsg1: string; //提示框信息

src/app/views/hushijiandan/hushijiandan.component.html

@@ -3341,7 +3341,7 @@
 <app-log-prompt-modal
   *ngIf="historyDPromptModalShow"
   [show]="historyDPromptModalShow"
-  [packid]="packidD"
+  [drugsBagId]="drugsBagId"
   (closeModelHs)="closeModelHistoryDrugsbag($event)"
 ></app-log-prompt-modal>
 <!-- 报修详情查看 -->

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -495,9 +495,9 @@ export class HushijiandanComponent implements OnInit {
   }
   // 查看药单历史记录
   historyDPromptModalShow = false; //药单历史记录弹窗开关
-  packidD = ""; //查看历史记录携带
+  drugsBagId = ""; //查看历史记录携带
   viewDrugsbagHistory(data) {
-    this.packidD = data.packid;
+    this.drugsBagId = data.id;
     this.historyDPromptModalShow = true;
   }
   // 关闭药单历史记录弹窗

src/app/views/pharmacy2/pharmacy2.component.html

@@ -569,6 +569,6 @@
 <app-log-prompt-modal
   *ngIf="logPromptModalShow"
   [show]="logPromptModalShow"
-  [packid]="packid"
+  [drugsBagId]="drugsBagId"
   (closeModelHs)="closeModelLog($event)"
 ></app-log-prompt-modal>

src/app/views/pharmacy2/pharmacy2.component.ts

@@ -144,10 +144,10 @@ export class Pharmacy2Component implements OnInit, OnDestroy {
   }
   // 查看流程信息弹窗
   logPromptModalShow = false; //弹窗开关
-  packid = ""; //查看记录携带packid
+  drugsBagId = ""; //查看记录携带drugsBagId
   showLogs(data) {
     clearInterval(this.logTimer);
-    this.packid = data.packid;
+    this.drugsBagId = data.id;
     this.logPromptModalShow = true;
   }
   // 关闭流程信息弹窗