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

package-lock.json

@@ -10191,6 +10191,7 @@
     },
     "node_modules/npm/node_modules/lodash._baseindexof": {
       "version": "3.1.0",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10205,16 +10206,19 @@
     },
     "node_modules/npm/node_modules/lodash._bindcallback": {
       "version": "3.0.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._cacheindexof": {
       "version": "3.0.2",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
     "node_modules/npm/node_modules/lodash._createcache": {
       "version": "3.1.2",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT",
       "dependencies": {
@@ -10228,6 +10232,7 @@
     },
     "node_modules/npm/node_modules/lodash._getnative": {
       "version": "3.9.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },
@@ -10243,6 +10248,7 @@
     },
     "node_modules/npm/node_modules/lodash.restparam": {
       "version": "3.6.1",
+      "extraneous": true,
       "inBundle": true,
       "license": "MIT"
     },

src/app/views/pathology/pathology.component.html

@@ -21,6 +21,10 @@
       </div>
 			<div class="error-class">{{errorcODEMsg}}</div>
     </div>
+		<div class="nurseCode" (click)="showNurseCode()">
+		  <i class="nurseCodeIcon icon_transport transport-erweima"></i
+		  >二维码
+		</div>
     <div class="userInfo">
       <div class="wel">欢迎您：</div>
       <div class="user">
@@ -235,6 +239,26 @@
   <!-- <router-outlet></router-outlet> -->
 </div>
 
+<!-- 科室二维码模态框 -->
+<!-- 在模态框所在的 div 添加属性 [appDrag] -->
+<div appDrag class="modal" *ngIf="isShowNurseCode">
+  <div class="header drag-title">
+    <h2>签到二维码</h2>
+    <i
+      class="icon-close icon_transport transport-guanbi1"
+      (click)="closeNurseCode()"
+    ></i>
+  </div>
+  <div class="dialog-center">
+    <div class="dialog-code">
+      <img [src]="nurseCodeImg" alt="" />
+    </div>
+  </div>
+  <div class="dialog-operate">
+    <strong class="dialog-refresh" (click)="showNurseCode()">刷新</strong>
+    <span>{{ refreshQRCodeTime }}s</span>
+  </div>
+</div>
 <!-- 科室切换提示框 -->
 <app-hs-prompt-modal
   [changeShow]="changeShow"

src/app/views/pathology/pathology.component.less

@@ -82,7 +82,7 @@
     }
 
     .pharmacy-name {
-      // flex: 1;
+      flex: 1;
       // border-right: 1px solid #e5e9ed;
       display: flex;
       // justify-content: space-between;
@@ -199,15 +199,30 @@
 		}
 	}
 	
+	.nurseCode {
+	  width: 80px;
+	  font-size: 14px;
+	  color: #333;
+	  display: flex;
+	  justify-content: space-between;
+	  align-items: center;
+	  margin-right: 20px;
+	  cursor: pointer;
+	
+	  .nurseCodeIcon {
+	    margin-right: 8px;
+	    font-size: 24px;
+	    color: #929292;
+	  }
+	}
+	
   .userInfo {
-    // display: none;
-    width: 336px;
-    // height: 100%;
-    // float: right;
-    padding: 8px;
+    width: 260px;
+    height: 100%;
+    padding: 8px 36px 8px 8px;
     box-sizing: border-box;
     font-size: 14px;
-    // border-left: 1px solid #e5e9ed;
+    border-left: 1px solid #e5e9ed;
 
     .wel {
       line-height: 15px;
@@ -1094,4 +1109,90 @@
 }
 .spin-style{
 	z-index:9999;
-}
+}
+
+  .modal {
+    // 相对于 background 定位， 位置暂时设置为 0，0，0，0 在指令中将其位置水平垂直居中在页面中间
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+    width: 280px;
+    height: 310px;
+    z-index: 3100;
+    background: #f9fafb;
+    box-shadow: 1px 1px 20px rgba(0, 0, 0, 0.3);
+    border-radius: 30px;
+    border: 1px solid @hs_border_color;
+    overflow: hidden;
+    cursor: move;
+
+    .drag-title {
+      height: 50px;
+      line-height: 50px;
+      position: relative;
+
+      h2 {
+        height: 100%;
+        font-size: 18px;
+        color: #333;
+        text-align: center;
+        margin: 0;
+      }
+
+      .icon-close {
+        position: absolute;
+        top: 0;
+        right: 16px;
+        font-size: 16px;
+        cursor: pointer;
+        color: @hs_border_color;
+      }
+    }
+
+    .dialog-center {
+      width: 235px;
+      height: 208px;
+      background-color: #fff;
+      border: 1px solid @hs_border_color;
+      margin: 0 auto;
+      border-radius: 30px;
+      position: relative;
+
+      .dialog-code {
+        width: 180px;
+        height: 200px;
+        overflow: hidden;
+        position: absolute;
+        margin: auto;
+        top: 0;
+        right: 0;
+        bottom: 0;
+        left: 0;
+
+        img {
+          width: 100%;
+        }
+      }
+    }
+
+    .dialog-operate {
+      display: flex;
+      height: 40px;
+      justify-content: space-between;
+      align-items: center;
+      font-size: 14px;
+
+      .dialog-refresh {
+        color: @primary-color;
+        margin-left: 40px;
+        cursor: pointer;
+      }
+
+      span {
+        color: #999;
+        margin-right: 40px;
+      }
+    }
+  }

src/app/views/pathology/pathology.component.ts

@@ -166,6 +166,8 @@ export class PathologyComponent implements OnInit, OnDestroy {
 	toDayData:any = null;
 	toDayTime:any = null;
 	backType='list';
+	loginUserDeptId: number = JSON.parse(localStorage.getItem("user")).user.dept
+	  .id; //登录人所属科室
   ngOnDestroy() {
     clearTimeout(this.timer);
     clearTimeout(this.logTimer);
@@ -215,6 +217,36 @@ export class PathologyComponent implements OnInit, OnDestroy {
 			this.getToday()
 		},60000)
   }
+	
+	isShowNurseCode = false; //是否展开科室二维码
+	nurseCodeImg = ""; //图片
+	refreshQRCodeTime = 0; //刷新时间间隔
+	// 关闭科室二维码
+	closeNurseCode() {
+	  this.isShowNurseCode = false;
+	  clearInterval(this.timers);
+	  this.timer = null;
+	}
+	// 展开科室二维码
+	timers = null;
+	showNurseCode() {
+	  this.isShowNurseCode = true;
+	  this.mainService.getDeptCode([this.loginUserDeptId]).subscribe((data) => {
+	    if (data["status"] == 200) {
+	      this.nurseCodeImg = data["data"][0].base64;
+	      this.refreshQRCodeTime = data["data"][0].refreshQRCodeTime;
+	      clearInterval(this.timers);
+	      this.timers = setInterval(() => {
+	        this.refreshQRCodeTime = Math.max(--this.refreshQRCodeTime, 0);
+	        if (this.refreshQRCodeTime === 0) {
+	          clearInterval(this.timers);
+	          this.showNurseCode();
+	        }
+	      }, 1000);
+	    }
+	  });
+	}
+	
   // 当前时间日期
   runTime() {
     clearTimeout(this.timer);

src/app/views/pathology/pathology.module.ts

@@ -4,11 +4,12 @@ import { CommonModule } from '@angular/common';
 import { PathologyRoutingModule } from './pathology-routing.module';
 import { ShareModule } from 'src/app/share/share.module';
 import { PathologyComponent } from './pathology.component';
-
+import { DragModule } from 'src/app/directives/drag/drag.module';
 
 @NgModule({
   declarations: [PathologyComponent],
   imports: [
+		DragModule,
     CommonModule,
     PathologyRoutingModule,
     ShareModule

src/app/views/specimen-room-view/specimen-room-view.component.html

@@ -36,7 +36,7 @@
         }}</span>
       </div>
       <div class="userInfo-wrap">
-        <div class="logOut" (click)="changeKsNow()">切换科室</div>
+        <div class="logOut" (click)="setSpecimen()">切换科室</div>
         <div class="logOut" (click)="logOut()">退出</div>
       </div>
     </div>

src/app/views/specimen-room-view/specimen-room-view.component.less

@@ -62,7 +62,7 @@
     display: flex;
 		color: #000;
     .pharmacy-logo {
-      width: 221px;
+      width: 100px;
       background-color: #fff;
       display: flex;
       flex-direction: column;
@@ -82,7 +82,7 @@
     }
 
     .pharmacy-name {
-      // flex: 1;
+      flex: 1;
       // border-right: 1px solid #e5e9ed;
       display: flex;
       // justify-content: space-between;
@@ -159,14 +159,12 @@
     }
   }
   .userInfo {
-    // display: none;
-    width: 336px;
-    // height: 100%;
-    // float: right;
-    padding: 8px;
-    box-sizing: border-box;
-    font-size: 14px;
-    // border-left: 1px solid #e5e9ed;
+		width: 260px;
+		height: 100%;
+		padding: 8px 36px 8px 8px;
+		box-sizing: border-box;
+		font-size: 14px;
+		border-left: 1px solid #e5e9ed;
 
     .wel {
       line-height: 15px;

src/app/views/specimen-room-view/specimen-room-view.component.ts

@@ -317,11 +317,19 @@ export class SpecimenRoomViewComponent implements OnInit, OnDestroy {
 
 	// 获取是否关联标本间
 	setSpecimen(){
-		this.validateForm = this.fb.group({
-		  specimen: [null, [Validators.required]],
-			operation: [null, [Validators.required]],
-			generate:[1, [Validators.required]],
-		});
+		if(this.validateForm){
+			this.validateForm = this.fb.group({
+			  specimen: [this.validateForm.value.specimen, [Validators.required]],
+				operation: [this.validateForm.value.operation, [Validators.required]],
+				generate:[this.validateForm.value.generate, [Validators.required]],
+			});
+		}else{
+			this.validateForm = this.fb.group({
+			  specimen: [null, [Validators.required]],
+				operation: [null, [Validators.required]],
+				generate:[1, [Validators.required]],
+			});
+		}
 		this.relevanceModal = true
 	}