标本打印优化

src/app/app-routing.module.ts

@@ -23,7 +23,8 @@ import { IncidentConfigGuard } from './guard/IncidentConfig.guard';
 import { OtherConfigGuard } from './guard/OtherConfig.guard';
 //业务页面控制查看权限
 import { PageConfigGuard } from './guard/PageConfig.guard';
-
+//系统配置查看权限
+import { SystemConfigGuard } from './guard/SystemConfig.guard';
 const routes: Routes = [
   // 默认
   {
@@ -116,7 +117,7 @@ const routes: Routes = [
 	{
 	  path: 'systemConfig',
 	  loadChildren: () => import('./views/system-config/system-config.module').then(m => m.SystemConfigModule),
-	  canActivate: [PageConfigGuard]
+	  canActivate: [SystemConfigGuard]
 	},
   // 业务页面控制查看
   {

src/app/guard/SystemConfig.guard.ts

@@ -0,0 +1,22 @@
+import { Injectable } from '@angular/core';
+import { CanActivate, Router } from '@angular/router';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class SystemConfigGuard implements CanActivate  {
+  constructor(public router: Router) { }
+
+  canActivate(): boolean {
+    const menus = JSON.parse(localStorage.getItem('menu'));
+    let can = false;
+    if (menus) {
+      can = menus.some(e => e.link == 'systemConfig');
+    }
+    if (!can) {
+      this.router.navigate(['login']);
+      return false
+    }
+    return true;
+  }
+}

src/app/share/pathology-add/pathology-add.component.html

@@ -281,7 +281,7 @@
   <!-- 打印 -->
   <div id="report" style="display: none;">
 		<div class="monad">
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'" style="border: 1px solid #AAAAAA;
+			<div *ngIf="printData && printData.specimenList && printData.specimenList.length" style="border: 1px solid #AAAAAA;
 				border-radius: 5px;font-size: 12px;">
 				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
 					 <div style="width: 60%;height: 70px;text-align: center;">
@@ -325,51 +325,8 @@
 				</div>
 			</div>
 			
-			<div *ngIf="printData && printData.specimenList && printData.specimenList.length>0 && operation == 'addPrint'" style="border: 1px solid #AAAAAA;
-				border-radius: 5px;font-size: 12px;">
-				 <div style="display: flex;align-items: center;flex-wrap: nowrap;height: 80px;padding: 0 1px;">
-					 <div style="width: 60%;height: 70px;text-align: center;">
-						 <img style="max-width: 90%;height: 80%;" [src]="printData.applyBarCode" alt="">
-						 <div>{{printData.applyCode}}</div>
-					 </div>
-					 <div style="width: 40%;height: 100%;text-align: center;display: flex;align-items: center;">
-						 <img style="max-width: 100%;max-height: 100%;" [src]="tool.logoUrl" alt="">
-					 </div>
-				 </div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">患者姓名</div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">{{printData.patientName}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;border-top: 1px solid #aaa;padding:1px;">性别</div>
-					<div style="width:16%;padding:1px;border-top: 1px solid #aaa;">{{printData.specimenList[0].patientGender}}</div>
-				</div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">住院号</div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;padding:1px;">{{printData.residenceNo}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">年龄</div>
-					<div style="width:16%;padding:1px;"> {{printData.patientAge}}岁</div>
-				</div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">科室 </div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;
-					padding:1px;overflow: hidden;white-space: nowrap">{{printData.patientDept}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">床号</div>
-					<div style="width:16%;padding:1px;">{{printData.patientBedNum}}床</div>
-				</div>
-				<div style="display: flex;border-bottom: 1px solid #AAAAAA;">
-					<div style="width:20%;border-right: 1px solid #AAAAAA;padding:1px;">部位 </div>
-					<div style="width:50%;border-right: 1px solid #AAAAAA;
-					padding:1px;overflow: hidden;white-space: nowrap">{{printData.takePart}}</div>
-					<div style="width:14%;border-right: 1px solid #AAAAAA;padding:1px;">标本数</div>
-					<div style="width:16%;padding:1px;">{{printData.specimenNum}}</div>
-				</div>
-				<div style="display: flex;">
-					<div style="width:20%;box-sizing: border-box;border-right: 1px solid #AAAAAA;padding:1px;">日期</div>
-					<div style="width:80%;box-sizing: border-box;padding:1px;border-right: 1px solid #fff;">{{printData.specimenList[0].inVitroTime|date:'yyyy-MM-dd'}}</div>
-				</div>
-			</div>
-			
-			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1 && operation == 'addPrint'"></div>
-			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1 && operation != 'addPrint'"></div>
+			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1"></div>
+			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">
 				 <div style="height: 50px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>

src/app/share/pathology-detail/pathology-detail.component.html

@@ -156,6 +156,7 @@
 				</div>
 				
 			</div>
+			<div style="height: 70px;" *ngIf="printData && printData.specimenList && printData.specimenList.length==1"></div>
 			<div style="height: 20px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>1"></div>
 			<div style="font-size: 12px;" *ngIf="printData && printData.specimenList && printData.specimenList.length>0">
 				<div *ngFor="let data of printData.specimenList; let index=index;">

src/app/views/fuwutai/fuwutai.component.ts

@@ -2832,7 +2832,7 @@ export class FuwutaiComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category.mutiCategory,
+        // "title": category.mutiCategory,
         "description": this.incidentModel.description,
         "directProcess": 1,
         "handleDescription": this.incidentModel.handleDescription,
@@ -3522,7 +3522,8 @@ export class FuwutaiComponent implements OnInit {
     }
 
     let category = this.applicationCategoryList.find(v => v.id == this.incidentModel.category);
-    if(!this.incidentModel.duty){
+    console.log('故障现象对象=>>>>>',category)
+		if(!this.incidentModel.duty){
       this.msg.warning(`故障现象【${category.mutiCategory}】没有设置责任部门!`);
       return;
     }
@@ -3572,7 +3573,7 @@ export class FuwutaiComponent implements OnInit {
         "category": this.incidentModel.category ? { id: this.incidentModel.category } : undefined,
         "priorityId": this.incidentModel.priorityId || undefined,
         "source": this.incidentModel.source ? { id: this.incidentModel.source } : undefined,
-        "title": category.mutiCategory,
+        // "title": category.mutiCategory,
         "description": this.incidentModel.description,
         "yyTime": this.incidentModel.yyTime ? format(new Date(this.incidentModel.yyTime), 'yyyy-MM-dd HH:mm:ss') : undefined,
         "requester": this.incidentModel.requester ? { id: this.incidentModel.requester } : undefined,