支助一站式优化

src/app/components/bind-extension-number/bind-extension-number.component.ts

@@ -43,10 +43,14 @@ export class BindExtensionNumberComponent implements OnInit {
   // 工单范选项卡
   scopeTabs:any[] = [];
   activeScopeTab:any;
-
+	menuList:any;
+	
   ngOnInit() {
-    console.log('itsmData', this.itsmData);
-    console.log('hsmsData', this.hsmsData);
+    // console.log('itsmData', this.itsmData);
+    // console.log('hsmsData', this.hsmsData);
+		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
+		this.menuList = menuItem.find(i=>i.link=='bangdingfenji')
+		// console.log(111, this.menuList);
 		this.init()
     this.getHospitalList();
     this.getHjzxCornetList();
@@ -54,11 +58,15 @@ export class BindExtensionNumberComponent implements OnInit {
   }
 	
 	init(){
-		if(this.coopBtns.extension){
-			this.scopeTabs.push({ name: '分机绑定', value: 1, checked: false })
-		}
-		if(this.coopBtns.callCenter){
-			this.scopeTabs.push({ name: '呼叫中心', value: 2, checked: false })
+		if(this.menuList && this.menuList.childrens){
+			for(let i of this.menuList.childrens){
+				if(i.link=='extension'){
+					this.scopeTabs.push({ name: '分机绑定', value: 1, checked: false })
+				}
+				if(i.link=='callCenter'){
+					this.scopeTabs.push({ name: '呼叫中心', value: 2, checked: false })
+				}
+			}
 		}
 		if(this.scopeTabs.length>0){
 			this.activeScopeTab = this.scopeTabs[0]

src/app/components/order-scope/order-scope.component.ts

@@ -45,8 +45,11 @@ export class OrderScopeComponent implements OnInit {
 	activeScopeTab:any;
 	//#region 工单范围-运维start
 	allDuty:number = 1;
+	menuList:any;
 	
   ngOnInit() {
+		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
+		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
     this.initItsm();
   }
 
@@ -63,12 +66,17 @@ export class OrderScopeComponent implements OnInit {
   }
 
   initItsm(){
-		if(this.coopBtns.maintenance){
-			this.scopeTabs.push({ name: '运维', value: 1, checked: false })
-		}
-		if(this.coopBtns.distributionPj){
-			this.scopeTabs.push({ name: '配送陪检', value: 2, checked: false })
+		if(this.menuList && this.menuList.childrens){
+			for(let i of this.menuList.childrens){
+				if(i.link=='maintenance'){
+					this.scopeTabs.push({ name: '运维', value: 1, checked: false })
+				}
+				if(i.link=='distributionPj'){
+					this.scopeTabs.push({ name: '配送陪检', value: 2, checked: false })
+				}
+			}
 		}
+		
 		if(this.scopeTabs.length>0){
 			this.activeScopeTab = this.scopeTabs[0]
 		}
@@ -302,17 +310,21 @@ export class OrderScopeComponent implements OnInit {
     saveOrderScope() {
       // 配送的院区必填
       let value2 = this.scopeTabs.find(v => v.value == 2 );
-      if(value2.checked && !this.checkedHos){
-        this.message.warning('【配送】的院区必填！')
-        return;
-      }
+			if(value2){
+				if(value2.checked && !this.checkedHos){
+				  this.message.warning('【配送】的院区必填！')
+				  return;
+				}
+			}
 
       // 运维限制部门的时候，部门必填
       let value1 = this.scopeTabs.find(v => v.value == 1 );
-      if(value1.checked && !this.itsmCheckedHos.filter(v => v.checked).length && this.allDuty != 1){
-        this.message.warning('【运维】的部门必填！')
-        return;
-      }
+			if(value1){
+				if(value1.checked && !this.itsmCheckedHos.filter(v => v.checked).length && this.allDuty != 1){
+				  this.message.warning('【运维】的部门必填！')
+				  return;
+				}
+			}
 
       this.saveLoading = true;
       let types = [];
@@ -362,20 +374,20 @@ export class OrderScopeComponent implements OnInit {
       let postData:any = {
         workerOrderScope: {
           userId: this.user.user.id,
-          mdv2Switch: Number(itsm.checked),
-          hsmsSwitch: Number(hsms.checked),
+          mdv2Switch: itsm?Number(itsm.checked):null,
+          hsmsSwitch: hsms?Number(hsms.checked):null,
           range: 0,
           dutyRange: 0,
         },
       };
 
-      if(itsm.checked){
+      if(itsm && itsm.checked){
         postData.workerOrderScope.allDuty = this.allDuty;
         postData.workerOrderScope.dutyIds = this.itsmCheckedHos.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyGroupIds = this.itsmCheckedGroup.filter(v => v.checked).map(v => v.value).toString() || undefined;
         postData.workerOrderScope.dutyRange = this.itsmOrderScopeRadio - 0;
       }
-      if(hsms.checked){
+      if(hsms && hsms.checked){
         postData.workerOrderScope.hospitalId = this.checkedHos ? { id: this.checkedHos - 0 } : undefined;
         postData.workerOrderScope.typeIds = typesId || undefined;
         postData.workerOrderScope.groupIds = groupsId || undefined;

src/app/services/tool.service.ts

@@ -114,6 +114,7 @@ export class ToolService {
     }
     let secondMenus = []; // 二级菜单
     let jurisdiction = []; //当前菜单的权限列表
+		let menuItem = null;
     let coopBtns: any = {}; // 初始化权限
     menu.forEach((e) => {
       if (e.childrens) {
@@ -135,6 +136,8 @@ export class ToolService {
         }
       })
     }
+		menuItem = jurisdiction
+		localStorage.setItem("menuItem", JSON.stringify(menuItem))
     jurisdiction.forEach((e) => {
       switch (e.link) {
         case "look":

src/app/views/assets-product-management/assets-product-management.component.ts

@@ -174,7 +174,7 @@ export class AssetsProductManagementComponent implements OnInit {
       company: {
         name: keyword,
         busiType: {key: "company_busi_type", value: "2"},
-        hosId: this.currentHospital.id,
+        statisticalHosId: this.currentHospital.id,
       },
       idx: 0,
       sum: 20,

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

@@ -203,6 +203,7 @@
 							</ng-container>
               <!-- 运维 蓝色-->
               <ng-container *ngIf="data.type === 'mdv2'">
+								<div class="top-border" *ngIf="!osComponentRef2.viewPortItems[index-1]"></div>
 								<div class="top-border top-border3" *ngIf="osComponentRef2.viewPortItems[index-1] && osComponentRef2.viewPortItems[index-1].type=='hsms'"></div>
 								<div class="top-border" *ngIf="osComponentRef2.viewPortItems[index-1] && osComponentRef2.viewPortItems[index-1].type!='hsms'" [ngClass]="{'top-border3': data.data.overtimePercent > 100}"></div>
 								<div class="left-border"></div>

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

@@ -806,6 +806,7 @@ export class FuwutaiComponent implements OnInit {
   ngOnInit() {
     this.websocketLoading = true;
     this.coopBtns = this.tool.initCoopBtns(this.route);
+		// console.log(8989899,this.coopBtns)
     //防抖
     this.changeInpSubject.pipe(debounceTime(500)).subscribe((v) => {
       this.searchApplicationDepartment(v[0], v[1]);
@@ -861,7 +862,7 @@ export class FuwutaiComponent implements OnInit {
     this.initRole();
     this.initLogin();
     this.retract();
-    // this.refresh();
+    this.refresh();
     this.initOrderScope();
     this.getVisitList();
     this.getMessageList();

src/app/views/tripartite-company/tripartite-company.component.html

@@ -49,7 +49,7 @@
             <td>
               <div class="coop">
                 <span *ngIf="coopBtns.edit" (click)="edit($event, data)">编辑</span>
-                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'删除后您配置的相关巡检计划，下次执行时不在生成巡检任务，您确认要删除吗？','删除','del')">删除</span>
+                <span *ngIf="coopBtns.del" (click)="showDelModal($event, data,'您确认要删除吗？','删除','del')">删除</span>
               </div>
             </td>
           </tr>

src/app/views/tripartite-company/tripartite-company.component.ts

@@ -123,7 +123,7 @@ export class TripartiteCompanyComponent implements OnInit {
 			}
 		}else{
 			if(this.currentHospital.parent && this.currentHospital.parentDeptId){
-				this.scopeValue = this.currentHospital.parent.id
+				this.scopeValue = this.currentHospital.parentDeptId
 			}else{
 				this.scopeValue = this.currentHospital.id
 			}

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

@@ -267,7 +267,7 @@ export class UsersManagementComponent implements OnInit {
     let companyData = {
       company: {
         busiType: {key: "company_busi_type", value: "2"},
-        hosId: hid,
+        statisticalHosId: hid,
       },
       idx: 0,
       sum: 20,
@@ -737,7 +737,7 @@ export class UsersManagementComponent implements OnInit {
       company: {
         name: keyword,
         busiType: {key: "company_busi_type", value: "2"},
-        hosId,
+        statisticalHosId: hosId,
       },
       idx: 0,
       sum: 20,