药房端添加科室切换

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

@@ -24,6 +24,7 @@ export class HsPromptModalComponent implements OnInit {
   @Input() changeShow: Boolean;
   @Input() closeTime: Number;
   @Input() closeTimeFlag;
+  @Input() deptType:string = 'nurse';//默认按护士端的科室条件搜索
 
   @Output() closeModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
   @Output() clearModelHs = new EventEmitter<any>(); //1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
@@ -162,15 +163,28 @@ export class HsPromptModalComponent implements OnInit {
       keywords = e;
     }
     this.currentKeywords = keywords;
-    let dataObj = {
-      idx: 0,
-      sum: 10,
-      department: {
-        hospital: { id: hosId },
-        keyWord: keywords,
-        nurseSign: 1,
-      },
-    };
+    let dataObj = {};
+    if(this.deptType === 'nurse'){
+      dataObj = {
+        idx: 0,
+        sum: 10,
+        department: {
+          hospital: { id: hosId },
+          keyWord: keywords,
+          nurseSign: 1,
+        },
+      }
+    }else if(this.deptType === 'pharmacy'){
+      dataObj = {
+        idx: 0,
+        sum: 10,
+        department: {
+          hospital: { id: hosId },
+          dept: keywords,
+          type: {id: "386"},
+        },
+      }
+    }
     this.mainService
       .getFetchDataList("data", "department", dataObj)
       .subscribe((data) => {

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

@@ -2943,6 +2943,7 @@
   [show]="hsPromptModalShow"
   (closeModelHs)="closeModelHs($event)"
   (clearModelHs)="clearModelHs($event)"
+  deptType="nurse"
 >
 </app-hs-prompt-modal>
 <!-- 标本历史记录查看 -->

src/app/views/pharmacy/pharmacy.component.html

@@ -8,12 +8,19 @@
     <div class="pharmacy-name">
       <h2 class="pharmacy-name__title">药房</h2>
     </div>
-    <div class="pharmacy-operate" (click)="toggleLogin()">
-      <img src="./../../assets/images/login_logo.png" class="pharmacy-operate__img" alt="">
-      <p class="pharmacy-operate__title">{{currentDept}}</p>
-      <!-- 弹层 -->
-      <div class="pharmacy-operatePop" (click)="logOut()" *ngIf="loginFlag">
-        退出
+    <div class="userInfo">
+      <div class="wel">欢迎您：</div>
+      <div class="user">
+        <img src="../../assets/images/icon_keshi.png" alt="" />
+        <span *ngIf="deptDisplay">{{
+          deptDisplay == 2
+            ? loginUser.dept.deptalias
+            : loginUser.dept.dept
+        }}</span>
+      </div>
+      <div class="userInfo-wrap">
+        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="logOut()">退出</div>
       </div>
     </div>
   </div>
@@ -208,7 +215,16 @@
   </div>
 </div>
 
-
+<!-- 药房端科室切换提示框 -->
+<app-hs-prompt-modal
+  [changeShow]="changeShow"
+  [closeTime]="closeTime"
+  [closeTimeFlag]="closeTimeFlag"
+  [show]="hsPromptModalShow"
+  (closeModelHs)="closeModelHs($event)"
+  (clearModelHs)="clearModelHs($event)"
+  deptType="pharmacy"
+>
 
 
 <!-- 返回系统按钮 -->

src/app/views/pharmacy/pharmacy.component.less

@@ -103,7 +103,45 @@
 			}
 		}
 	}
+  .userInfo {
+    width: 336px;
+    height: 100%;
+    float: right;
+    padding: 8px;
+    box-sizing: border-box;
+    font-size: 14px;
+    border-left: 1px solid #e5e9ed;
+
+    .wel {
+      line-height: 15px;
+    }
+
+    .user {
+      font-size: 20px;
+      height: 36px;
+      display: flex;
+      justify-content: center;
+      align-items: center;
+      line-height: normal;
 
+      img {
+        height: 100%;
+        margin-right: 8px;
+      }
+    }
+    .userInfo-wrap {
+      display: flex;
+      justify-content: flex-end;
+      .logOut {
+        display: inline-block;
+        text-align: right;
+        color: @primary-color;
+        line-height: 20px;
+        cursor: pointer;
+        margin-right: 8px;
+      }
+    }
+  }
 	// 头部 end
 	// 主体部分 start
 	.pharmacy-main {

src/app/views/pharmacy/pharmacy.component.ts

@@ -27,8 +27,6 @@ export class PharmacyComponent implements OnInit {
   constructor(private mainService: MainService, public router: Router) {}
   //待配药数据
   codes = [];
-  // 登录切换效果
-  loginFlag = false;
   // 待配药
   printPharmacyList = []; //数据列表
   printPharmacyIdx = 0; //页码
@@ -47,19 +45,20 @@ export class PharmacyComponent implements OnInit {
   pharmacyFlag = false;
   pharmacySearchKey = "";
   pharmacyLoad = false;
-  //当前登录人所属科室
-  currentDept = "";
+
+  // other
+  loginUser: any = localStorage.getItem("user")
+    ? JSON.parse(localStorage.getItem("user")).user
+    : null; //登录人信息
 
   ngOnInit() {
+    this.changeKs();
     // 待配药列表
     this.getPharmacyList(this.printPharmacyIdx, 1, this.printPharmacySearchKey);
     // 配药中列表
     this.getPharmacyList(this.waitPharmacyIdx, 2, this.waitPharmacySearchKey);
     // 核对中列表
     this.getPharmacyList(this.pharmacyIdx, 3, this.pharmacySearchKey);
-    //当前登录人所属科室
-    this.currentDept = JSON.parse(localStorage.getItem("user")).user.dept.dept;
-
     this.initRole();
   }
   // 药房端药房列表查询、搜索
@@ -225,10 +224,6 @@ export class PharmacyComponent implements OnInit {
       }
     });
   }
-  // 退出按钮切换效果
-  toggleLogin() {
-    this.loginFlag = !this.loginFlag;
-  }
   //待配药
   print(id?) {
     let arr = [];
@@ -327,4 +322,50 @@ export class PharmacyComponent implements OnInit {
       this.fixedTab = type;
     }
   }
+  //药房端科室切换
+  changeShow = true;
+  closeTime = 3;
+  closeTimeFlag = 0;
+  hsPromptModalShow: boolean = true; //科室切换提示框是否展示
+  timerCloseTime = null;
+  deptDisplay = 1; //护士端是否显示可以别名，1是显示科室名称，2是显示科室别名
+  //子传父接收
+  closeModelHs(e) {
+    this.hsPromptModalShow = JSON.parse(e).show;
+    this.changeShow = JSON.parse(e).changeShow;
+  }
+  //子传父接收
+  clearModelHs(e) {
+    if (JSON.parse(e).clear === true) {
+      clearInterval(this.timerCloseTime);
+    }
+    this.changeShow = JSON.parse(e).changeShow;
+  }
+  // 头部切换科室
+  changeKsNow() {
+    this.hsPromptModalShow = true;
+    clearInterval(this.timerCloseTime);
+    this.changeShow = false;
+  }
+  // 切换科室
+  changeKs() {
+    this.hsPromptModalShow = true;
+    // (1)	当用户设置为正数时，用户必须查看此窗体指定秒数。
+    // (2)	当用户设置为负数时，用户可点击知道了也可倒计时自动关闭。
+    // (3)	如果用户填写0则为无自动关闭和强制查看时间。
+    if (this.closeTimeFlag === 0) {
+      return;
+    }
+    this.closeTime = Math.abs(this.closeTimeFlag);
+    clearInterval(this.timerCloseTime);
+    this.timerCloseTime = setInterval(() => {
+      this.closeTime = Math.max(--this.closeTime, 0);
+      if (this.closeTime === 0) {
+        if (this.closeTimeFlag <= 0) {
+          this.hsPromptModalShow = false;
+        }
+        clearInterval(this.timerCloseTime);
+      }
+    }, 1000);
+  }
 }