拉取代码

src/app/components/display-form/display-form.component.html

@@ -6,7 +6,7 @@
     </div>
     <div class="content">
       <div class="conditions" *ngIf="!isLoading">
-        <div nz-row>
+        <div nz-row *ngIf="hsmsData.hsmsSwitch">
           <div nz-col nzSpan="4">护工信息隐藏：</div>
           <div nz-col nzSpan="20">
             <nz-radio-group class="w100" [(ngModel)]="hurseInfoHiding">
@@ -15,7 +15,7 @@
             </nz-radio-group>
           </div>
         </div>
-        <div nz-row>
+        <div nz-row *ngIf="hsmsData.hsmsSwitch">
           <div nz-col nzSpan="4">护工信息：</div>
           <div nz-col nzSpan="20">
             <nz-radio-group class="w100" [(ngModel)]="patientCareCol">
@@ -34,7 +34,7 @@
             </nz-radio-group>
           </div>
         </div>
-        <div nz-row>
+        <div nz-row *ngIf="hsmsData.hsmsSwitch">
           <div nz-col nzSpan="4">配送人员刷新：</div>
           <div nz-col nzSpan="4">
             <nz-input-group nzAddOnAfter="秒">

src/app/components/display-form/display-form.component.ts

@@ -10,6 +10,7 @@ import { NzMessageService } from 'ng-zorro-antd';
   styleUrls: ['./display-form.component.less']
 })
 export class DisplayFormComponent implements OnInit {
+	@Input() hsmsData:any;
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
   constructor(
@@ -32,6 +33,7 @@ export class DisplayFormComponent implements OnInit {
 	rightMenuLocation: any = 2; //右侧菜单
 	showSource: any = 2; //是否展示来源
   ngOnInit() {
+		console.log(778778, this.hsmsData)
     this.initControlView();
   }
 

src/app/services/tool.service.ts

@@ -15,7 +15,6 @@ export class ToolService {
 	 
 	// 提供方法来触发事件
 	triggerEvent(data: any) {
-		console.log(9999,data)
 		this.allSubject.next(data);
 	}
 	
@@ -26,7 +25,6 @@ export class ToolService {
 	
 	// 提供方法来订阅事件
 	getEventObservable() {
-		console.log(3333333)
 		return this.allSubject.asObservable();
 	}
 	

src/app/views/fuwutai/fuwutai.component.html

@@ -1,5 +1,5 @@
 <div class="fuwutai">
-  <div class="top" id="top" *ngIf="hurseInfoHiding != 1 && hsmsData.hsmsSwitch==1">
+  <div class="top" id="top" *ngIf="hurseInfoHiding != 1 && hsmsData.hsmsSwitch">
     <!-- 头部Tab -->
     <div class="tabBox">
       <div class="tab" #tabs>
@@ -2062,7 +2062,7 @@
 <!-- 工单范围 -->
 <app-order-scope *ngIf="showInitModal" [showGovDutyConfig]="showGovDutyConfig" [hsmsData]="hsmsData" [itsmData]="itsmData" [coopBtns]="coopBtns" (confirmModal)="confirmOrderScope($event)" (cancelModal)="cancelOrderScope($event)"></app-order-scope>
 <!-- 展示形式 -->
-<app-display-form *ngIf="showDisplayFormModal" (confirmModal)="confirmDisplayForm($event)" (cancelModal)="cancelDisplayForm($event)"></app-display-form>
+<app-display-form *ngIf="showDisplayFormModal" [hsmsData]="hsmsData" (confirmModal)="confirmDisplayForm($event)" (cancelModal)="cancelDisplayForm($event)"></app-display-form>
 <!-- 消息弹框模板 -->
 <ng-template #msgTemplate let-msg="data">
   <div class="msgTemBox ant-notification-notice-content">

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

@@ -2688,7 +2688,42 @@ export class FuwutaiComponent implements OnInit {
   fixedTab: string = "";
   checkFixedTab(type: string) {
     if (type == "toSystem") {
-      this.router.navigateByUrl("main");
+			let roleMenus = JSON.parse(localStorage.getItem("user")).menu;
+			let sy = false;
+			let gglb = false;
+			let gzgd = false;
+			roleMenus.forEach((e) => {
+				if (e.link == "home") {
+				  sy = true;
+				}else if (e.link == "orderManagement") {
+			    gglb = true;
+			  }else if (e.link == "incidentManagement") {
+			    gzgd = true;
+			  }
+			});
+			
+			if(!gglb && !gzgd && !sy){
+				this.msg.error("暂无权限进入系统！", {
+				  nzDuration: 2000,
+				});
+				return
+			}
+			if(sy){
+				this.router.navigateByUrl("main");
+				return
+			}else if(gglb){
+				this.router.navigateByUrl("/main/orderManagement");
+				return
+			}else if(gzgd){
+				this.router.navigateByUrl("/main/incidentManagement");
+				return
+			}
+			if(gglb && gzgd){
+				this.router.navigateByUrl("/main/orderManagement");
+			}
+			if(!gglb && !gzgd && sy){
+				this.router.navigateByUrl("/main/home");
+			}
       return;
     }
     if (type == "logout") {

src/app/views/incident-management/incident-management.component.ts

@@ -74,17 +74,18 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
   changeTab(key){
     this.queryTask = key;
 		let itemDept = this.maintainDept.find(i=>i.id == this.hosIds)
+		let list = this.tool.getUserInfoPermission().dutyGroupList || []
 		if(itemDept){
 			this.searchDTO.maintainDepartment = itemDept.id
 			if(this.queryTask!='todo' && this.queryTask!='doing' && this.queryTask!='storage'){
-				let arr = this.tool.getUserInfoPermission().dutyGroupList.filter(i=>i.hospital.id == itemDept.id)
+				let arr = list.filter(i=>i.hospital.id == itemDept.id)
 				if(arr){
 					this.maintainGroup = arr
 				}else{
-					this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+					this.maintainGroup = list
 				}
 			}else{
-				this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+				this.maintainGroup = list
 			}
 
 		}
@@ -177,11 +178,12 @@ export class IncidentManagementComponent implements OnInit, OnDestroy {
 	// 选择维修科室
 	deptChange(e){
 		this.searchDTO.maintainGroup = null
-		let arr  = this.tool.getUserInfoPermission().dutyGroupList.filter(i=>i.hospital.id == e)
+		let list = this.tool.getUserInfoPermission().dutyGroupList || []
+		let arr = list.filter(i=>i.hospital.id == e)
 		if(arr){
 			this.maintainGroup = arr
 		}else{
-			this.maintainGroup = this.tool.getUserInfoPermission().dutyGroupList
+			this.maintainGroup = list
 		}
 		this.searchDTO.department = null
 		this.searchDTO.todoingUser = null

src/app/views/main/main.component.html

@@ -641,6 +641,9 @@
 <!-- 查询范围 -->
 <app-query-range [hospital]="hospital" [duty]="duty" [queryType]="queryType" [parent]="parent" [hiddenParent]="true" (cancelQueryRange)="cancelQueryRange()" (submitQueryRange)="submitQueryRange($event)" *ngIf="queryRangeFlag"></app-query-range>
 
+<!-- 知识库查看 -->
+<app-knowledge-look (cancelKnowledgeModal)="cancelKnowledgeModal()" *ngIf="isShowKnowledge" [knowledgeData]="coopData"></app-knowledge-look>
+
 <!-- 操作成功/失败提示框 -->
 <app-prompt-modal
   *ngIf="promptModalShow"

src/app/views/main/main.component.ts

@@ -1055,6 +1055,24 @@ export class MainComponent implements OnInit, OnDestroy {
 	      }
 	    });
 	}
+	
+	// 引入知识库
+	importKnowage(item){
+	  console.log(item)
+	  this.incidentModel = {...this.incidentModel, description:  `引用知识库解决，知识库编号：${item.solutionNumber}`};
+	  this.solutionId = item.id;
+	}
+	// 知识库查看-知道了
+	isShowKnowledge:boolean = false;
+	showKnowledgeModal(data) {
+	  this.coopData = data || {};
+	  this.isShowKnowledge = true;
+	}
+	
+	cancelKnowledgeModal(flag) {
+	  this.isShowKnowledge = false;
+	}
+	
 	// 获取患者信息
 	searchPatientList(id, searchWords) {
 	  this.searchPatientListSubject.next([id, searchWords]);
@@ -1833,22 +1851,31 @@ export class MainComponent implements OnInit, OnDestroy {
 							this.applicationRequesterList.push({
 								name: this.userInfo.user.name,
 								id: this.userInfo.user.id,
+								account: this.userInfo.user.account
 							})
 							this.incidentModel.requester = this.userInfo.user.id;
+							let id = this.eventData.data.alarmId?this.eventData.data.alarmId:''
+							let ly = this.eventData.data.alarmSource?this.eventData.data.alarmSource:''
+							let dd = this.eventData.data.alarmLocation?this.eventData.data.alarmLocation:''
+							let jjd = this.eventData.data.alarmUrgency?this.eventData.data.alarmUrgency.name:''
+							let time = this.eventData.data.alarmActiveTime?format(new Date(this.eventData.data.alarmActiveTime), 'yyyy-MM-dd HH:mm:ss'):''
+							let ip = this.eventData.data.alarmIp?this.eventData.data.alarmIp:''
+							let ms = this.eventData.data.alarmDescription?this.eventData.data.alarmDescription:''
+							let content = this.eventData.data.alarmContent?this.eventData.data.alarmContent:''
 							this.incidentModel.description =
-							'告警id：' + this.eventData.data.alarmId + ';' +
-							'告警来源：' + this.eventData.data.alarmSource + ';' +
+							'告警id：' + id + ';' +
+							'告警来源：' + ly + ';' +
 							'\n' +
-							'告警地点：' + this.eventData.data.alarmLocation + ';' +
+							'告警地点：' + dd + ';' +
 							'\n' +
-							'紧急度：' + this.eventData.data.alarmUrgency.name + ';' +
-							'告警时间：' + format(new Date(this.eventData.data.alarmActiveTime), 'yyyy-MM-dd HH:mm:ss') + ';' +
+							'紧急度：' + jjd + ';' +
+							'告警时间：' + time + ';' +
 							'\n' +
-							'告警ip：' + this.eventData.data.alarmIp + ';' +
+							'告警ip：' + ip + ';' +
 							'\n' +
-							'告警描述：' + this.eventData.data.alarmDescription + ';' +
+							'告警描述：' + ms + ';' +
 							'\n' +
-							'告警内容：' + this.eventData.data.alarmContent
+							'告警内容：' + content
 						}
 	          this.applicationDeptList = data.list;
 	          let ids = this.applicationDeptList.map(v => v.id);

src/app/views/main/main.module.ts

@@ -7,6 +7,7 @@ import { ShareModule } from 'src/app/share/share.module';
 import { SelectMenuComponent } from 'src/app/components/select-menu/select-menu.component';
 import { IncidentDicrectOrderModule } from 'src/app/components/incidentManagement/incident-direct-order/incident-direct-order.module';
 import { QueryRangeModule } from '../new-statistics/components/query-range/query-range.module';
+import { KnowledgeLookModule } from 'src/app/components/knowledge-look/knowledge-look.module';
 
 @NgModule({
   declarations: [
@@ -19,6 +20,7 @@ import { QueryRangeModule } from '../new-statistics/components/query-range/query
     ShareModule,
 		IncidentDicrectOrderModule,
     QueryRangeModule,
+		KnowledgeLookModule
   ]
 })
 export class MainModule { }

src/app/views/new-statistics/new-statistics.component.ts

@@ -2,6 +2,7 @@ import { Component, OnInit, OnDestroy } from "@angular/core";
 import { ToolService } from 'src/app/services/tool.service';
 import { ActivatedRoute, Router } from '@angular/router';
 import { TabService } from './services/tab.service';
+import { NzMessageService } from "ng-zorro-antd/message";
 import { SimpleReuseStrategy } from 'src/app/SimpleReuseStrategy';
 @Component({
   selector: "app-new-statistics",
@@ -12,6 +13,7 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
   constructor(
     public tool: ToolService,
     public route: ActivatedRoute,
+		public msg: NzMessageService,
     public router: Router,
     public tabService: TabService,
   ) {}
@@ -121,7 +123,43 @@ export class NewStatisticsComponent implements OnInit, OnDestroy {
 
   // 返回
   goBack(){
-    this.router.navigate(['/main/home']);
+		let roleMenus = JSON.parse(localStorage.getItem("user")).menu;
+		let sy = false;
+		let gglb = false;
+		let gzgd = false;
 		sessionStorage.removeItem('maintenanceData')
+		roleMenus.forEach((e) => {
+			if (e.link == "home") {
+			  sy = true;
+			}else if (e.link == "orderManagement") {
+		    gglb = true;
+		  }else if (e.link == "incidentManagement") {
+		    gzgd = true;
+		  }
+		});
+		
+		if(!gglb && !gzgd && !sy){
+			this.msg.error("暂无权限进入系统！", {
+			  nzDuration: 2000,
+			});
+			return
+		}
+		if(sy){
+			this.router.navigateByUrl("main");
+			return
+		}else if(gglb){
+			this.router.navigateByUrl("/main/orderManagement");
+			return
+		}else if(gzgd){
+			this.router.navigateByUrl("/main/incidentManagement");
+			return
+		}
+		if(gglb && gzgd){
+			this.router.navigateByUrl("/main/orderManagement");
+		}
+		if(!gglb && !gzgd && sy){
+			this.router.navigateByUrl("main");
+		}
+    // this.router.navigate(['/main/home']);
   }
 }

src/app/views/users-management/users-management.component.html

@@ -96,8 +96,8 @@
                 <span *ngIf="coopBtns.look && !checkOptionsOne[0].checked" (click)="detail(data.id)">查看</span>
                 <span *ngIf="coopBtns.edit || checkOptionsOne[0].checked" (click)="edit(data)">编辑</span>
 								<span *ngIf="checkOptionsOne[0].checked" (click)="recover(data)">恢复</span>
-                <span *ngIf="coopBtns.unlock && data.accountStatus.value==2" (click)="unlock(data,1)">解锁</span>
-								<span *ngIf="coopBtns.lock && data.accountStatus.value==1" (click)="unlock(data,2)">锁定</span>
+                <span *ngIf="coopBtns.unlock && data.accountStatus && data.accountStatus.value==2" (click)="unlock(data,1)">解锁</span>
+								<span *ngIf="(coopBtns.lock && data.accountStatus && data.accountStatus.value==1) || (coopBtns.lock && !data.accountStatus)" (click)="unlock(data,2)">锁定</span>
 								<span *ngIf="coopBtns.del && !checkOptionsOne[0].checked" (click)="del(data)">删除</span>
                 <span *ngIf="coopBtns.resetPwd && !checkOptionsOne[0].checked" (click)="resetPwd(data)">重置密码</span>
               </div>