药房功能开通修复

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

@@ -186,7 +186,9 @@
                   </div>
 
                   <!-- 药品/静配信息未开通 -->
-                  <div *ngIf="!deptTaskTypeRules.openStaticDistribution" nz-col nzSpan="11" nz-row class="h100p">
+                  <div
+                    *ngIf="!deptTaskTypeRules.openStaticDistribution&&!deptTaskTypeRules.openDrugsBag&&!drugJpLoading"
+                    nz-col nzSpan="11" nz-row class="h100p">
                     <div class="notAvailable display_flex align-items_center justify-content_flex-center">
                       <div>
                         <img src="../../assets/images/icon_jianchakong.png" alt="">
@@ -209,7 +211,9 @@
                     </div>
                   </div>
                   <!-- 药品/静配信息已开通 -->
-                  <div *ngIf="deptTaskTypeRules.openStaticDistribution" nz-col nzSpan="11" nz-row class="h100p">
+                  <div
+                    *ngIf="(deptTaskTypeRules.openStaticDistribution||deptTaskTypeRules.openDrugsBag)&&!drugJpLoading"
+                    nz-col nzSpan="11" nz-row class="h100p">
                     <div nz-col nzSpan="6"
                       class="borderR alignC display_flex justify-content_flex-center align-items_center h100p">
                       <img src="../../assets/images/icon_hujingpei.png" alt="">
@@ -223,10 +227,6 @@
                               *ngFor="let item of jpDrugsWKOMsg.drugsInfoList">
                               <span>{{item}}</span>
                             </div>
-                            <div class="item txtC alignC display_flex justify-content_flex-center align-items_center"
-                              *ngIf="jpDrugsWKOMsg.drugsInfoList.length>0">
-                              <span>{{jpDrugsWKOMsg.drugsInfoList[0]}}</span>
-                            </div>
                           </div>
                           <div class="swiper none display_flex justify-content_flex-center align-items_center"
                             *ngIf="!jpDrugsWKOMsg.drugsInfoList||!jpDrugsWKOMsg.drugsInfoList.length">
@@ -244,21 +244,24 @@
                               *ngFor="let item of jpDrugsWKOMsg.jpInfoList">
                               <span>{{item}}</span>
                             </div>
-                            <div class="item txtC alignC display_flex justify-content_flex-center align-items_center"
-                              *ngIf="jpDrugsWKOMsg.jpInfoList.length>0">
-                              <span>{{jpDrugsWKOMsg.jpInfoList[0]}}</span>
-                            </div>
                           </div>
                           <div class="swiper none display_flex justify-content_flex-center align-items_center"
                             *ngIf="!jpDrugsWKOMsg.jpInfoList||!jpDrugsWKOMsg.jpInfoList.length">
                             <div class="item alignC display_flex justify-content_flex-center align-items_center">
-                              <span>暂无静配药品配送信息</span>
+                              <span>暂无静配配送信息</span>
                             </div>
                           </div>
                         </div>
                       </div>
                     </div>
                   </div>
+                  <div *ngIf="drugJpLoading" nz-col nzSpan="11" nz-row
+                    class="h100p display_flex justify-content_flex-center align-items_center">
+                    <div class="txtC" style="text-align: center;">
+                      <img src="../../../assets/images/loading.gif" alt="">
+                      <div>加载中...</div>
+                    </div>
+                  </div>
                 </div>
                 <div class="tab borderB" nz-row>
                   <div nz-col nzSpan="6"

src/app/views/hushijiandan/hushijiandan.component.less

@@ -1692,7 +1692,7 @@
   position: fixed;
   top: 40%;
   right: 0;
-  z-index: 99;
+  z-index: 9;
   border-radius: 5px 0 0 5px;
 
   .fixedMark {

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

@@ -361,11 +361,13 @@ export class HushijiandanComponent implements OnInit {
   }
 
   // 药品静配提示信息
+  drugJpLoading = true;
   getJpDrugsWKOMsg() {
     let that = this;
     that.mainService
       .postCustom("nurse", "getJpDrugsWKOMsg", {})
       .subscribe((data) => {
+        this.drugJpLoading = false;
         that.jpDrugsWKOMsg = data.data ? data.data : {};
         console.log(that.jpDrugsWKOMsg);
         if (
@@ -545,7 +547,7 @@ export class HushijiandanComponent implements OnInit {
             // 标本权限
             that.getSpecimenWorkOrderMsg();
           }
-          if (that.deptTaskTypeRules.openStaticDistribution) {
+          if (that.deptTaskTypeRules.openStaticDistribution||that.deptTaskTypeRules.openDrugsBag) {
             // 药品静配权限
             that.getJpDrugsWKOMsg();
           }