Merge branch 'master' into develop

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

@@ -6,12 +6,15 @@
     </div>
     <div class="content">
       <div class="scopeTab">
-        <div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
-          <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="changeFlag($event, item)">{{item.name}}</label>
-        </div>
+				<div *ngIf="scopeTabs.length>0" class="scopeBox">
+					<div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
+					  <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="changeFlag($event, item)">{{item.name}}</label>
+					</div>
+				</div>
+				<div class="tips" *ngIf="scopeTabs.length == 0">您没有分机绑定或呼叫中心调度权限，请联系管理员！</div>
       </div>
       <!-- 分机绑定 -->
-      <div class="conditions" *ngIf="activeScopeTab.value == 1">
+      <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 1">
         <div nz-row class="row">
           <div nz-col nzSpan="3" class="name">院区：</div>
           <div nz-col nzSpan="21">
@@ -40,7 +43,7 @@
         </div>
       </div>
       <!-- 呼叫中心 -->
-      <div class="conditions" *ngIf="activeScopeTab.value == 2">
+      <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 2">
         <div nz-row class="row">
           <div nz-col nzSpan="3" class="name">分机号：</div>
           <div nz-col nzSpan="21">
@@ -57,7 +60,7 @@
       </div>
     </div>
     <div class="btns display_flex justify-content_flex-center">
-      <button class="btn" nz-button nzType="primary" [nzLoading]="websocketLoading" (click)="saveOrderScope()">
+      <button *ngIf="scopeTabs.length>0" class="btn" nz-button nzType="primary" [nzLoading]="websocketLoading" (click)="saveOrderScope()">
         {{activeScopeTab.value == 1 ? '绑定' : '签入'}}
       </button>
       <button class="btn cancel" nz-button nzType="default" (click)="cancelInit()">

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

@@ -145,23 +145,30 @@
         height: auto;
 
         .scopeTab{
-          display: flex;
-          height: 60px;
-          border-bottom: 1px solid #D9D9D9;
-          .scopeTabItem{
-            flex: 1;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            border-right: 1px solid #D9D9D9;
-            background-color: #fff;
-            cursor: pointer;
-            &:last-of-type{
-              border-right: none;
-            }
-            &.active{
-              background-color: #F0F6ED;
-            }
+          .tips{
+          	width: 100%;
+          	margin: 20px 0;
+          	font-weight: 500;
+          }
+          .scopeBox{
+          	display: flex;
+          	height: 60px;
+          	border-bottom: 1px solid #D9D9D9;
+          	.scopeTabItem{
+          	  flex: 1;
+          	  display: flex;
+          	  justify-content: center;
+          	  align-items: center;
+          	  border-right: 1px solid #D9D9D9;
+          	  background-color: #fff;
+          	  cursor: pointer;
+          	  &:last-of-type{
+          	    border-right: none;
+          	  }
+          	  &.active{
+          	    background-color: #F0F6ED;
+          	  }
+          	}
           }
         }
 

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

@@ -4,6 +4,7 @@ import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
 import { WebsocketIncomingService } from 'src/app/services/websocket-incoming.service';
+import { Router } from "@angular/router";
 
 @Component({
   selector: 'app-bind-extension-number',
@@ -24,11 +25,13 @@ export class BindExtensionNumberComponent implements OnInit {
   }
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
+	@Input() coopBtns:any;
   constructor(
     private mainService: MainService,
     private tool: ToolService,
     private message: NzMessageService,
     private icomingService: WebsocketIncomingService,
+		public router: Router
   ) { }
 
   user = JSON.parse(localStorage.getItem("user")); //用户信息
@@ -38,20 +41,41 @@ export class BindExtensionNumberComponent implements OnInit {
   hospitalList:any[] = [];
 
   // 工单范选项卡
-  scopeTabs:any[] = [
-    { name: '分机绑定', value: 1, checked: false },
-    { name: '呼叫中心', value: 2, checked: false },
-  ];
-  activeScopeTab = this.scopeTabs[0];
-
+  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();
     this.getCallCenterConfig();
   }
-
+	
+	init(){
+		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]
+		}
+		if(this.scopeTabs.length == 1){
+			this.scopeTabs[0].checked = true
+		}
+	}
+	
   // 获取院区列表
   getHospitalList() {
     // 工单范围

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

@@ -6,12 +6,15 @@
     </div>
     <div class="content">
       <div class="scopeTab">
-        <div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
-          <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="activeScopeTab = item">{{item.name}}</label>
-        </div>
+				<div *ngIf="scopeTabs.length>0" class="scopeBox">
+					<div class="scopeTabItem" [ngClass]="{ active: item.value == activeScopeTab.value }" *ngFor="let item of scopeTabs" (click)="activeScopeTab = item">
+					  <label nz-checkbox [(ngModel)]="item.checked" (ngModelChange)="activeScopeTab = item">{{item.name}}</label>
+					</div>
+				</div>
+				<div class="tips" *ngIf="scopeTabs.length == 0">您没有运维或配送陪检调度权限，请联系管理员！</div>
       </div>
       <!-- 运维 -->
-      <div class="conditions" *ngIf="activeScopeTab.value == 1">
+      <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 1">
         <div nz-row>
           <div nz-col nzSpan="4">是否不限制部门：</div>
           <div nz-col nzSpan="20">
@@ -48,7 +51,7 @@
         </div>
       </div>
       <!-- 配送 -->
-      <div class="conditions" *ngIf="activeScopeTab.value == 2">
+      <div class="conditions" *ngIf="scopeTabs.length>0 && activeScopeTab.value == 2">
         <div nz-row>
           <div nz-col nzSpan="3" class="required">院区：</div>
           <div nz-col nzSpan="21">

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

@@ -137,24 +137,32 @@
         height: auto;
 
         .scopeTab{
-          display: flex;
-          height: 60px;
-          border-bottom: 1px solid #D9D9D9;
-          .scopeTabItem{
-            flex: 1;
-            display: flex;
-            justify-content: center;
-            align-items: center;
-            border-right: 1px solid #D9D9D9;
-            background-color: #fff;
-            cursor: pointer;
-            &:last-of-type{
-              border-right: none;
-            }
-            &.active{
-              background-color: #F0F6ED;
-            }
-          }
+          
+					.tips{
+						width: 100%;
+						margin-top: 20px;
+						font-weight: 500;
+					}
+					.scopeBox{
+						display: flex;
+						height: 60px;
+						border-bottom: 1px solid #D9D9D9;
+						.scopeTabItem{
+						  flex: 1;
+						  display: flex;
+						  justify-content: center;
+						  align-items: center;
+						  border-right: 1px solid #D9D9D9;
+						  background-color: #fff;
+						  cursor: pointer;
+						  &:last-of-type{
+						    border-right: none;
+						  }
+						  &.active{
+						    background-color: #F0F6ED;
+						  }
+						}
+					}
         }
 
         .remin {

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

@@ -3,6 +3,7 @@ import { EventEmitter } from '@angular/core';
 import { MainService } from 'src/app/services/main.service';
 import { ToolService } from 'src/app/services/tool.service';
 import { NzMessageService } from 'ng-zorro-antd';
+import { Router } from "@angular/router";
 
 @Component({
   selector: 'app-order-scope',
@@ -20,12 +21,15 @@ export class OrderScopeComponent implements OnInit {
     scopeGroups: [],
     orderScopeRadio: undefined,
   }
+	@Input() coopBtns:any;
+	
   @Output() confirmModal = new EventEmitter();
   @Output() cancelModal = new EventEmitter();
   constructor(
     private mainService: MainService,
     private tool: ToolService,
     private message: NzMessageService,
+		public router: Router
   ) { }
 
   user = JSON.parse(localStorage.getItem("user")); //用户信息
@@ -36,16 +40,25 @@ export class OrderScopeComponent implements OnInit {
   itsmCheckedGroup:any[] = [];//运维-分组
   itsmOrderScopeRadio:any = '0';//运维-工单范围
   isAllItsmGroupChecked:boolean = false;//运维-是否全选分组
-
+	// 工单范选项卡
+	scopeTabs:any[] = [];
+	activeScopeTab:any;
+	//#region 工单范围-运维start
+	allDuty:number = 1;
+	menuList:any;
+	
   ngOnInit() {
-    this.initHsms();
+		let menuItem = JSON.parse(localStorage.getItem("menuItem"))
+		this.menuList = menuItem.find(i=>i.link=='gongdanfanwei')
     this.initItsm();
   }
 
   initHsms(){
     console.log('hsmsData：', this.hsmsData);
     let index = this.scopeTabs.findIndex(v => v.value === 2);
-    this.scopeTabs[index].checked = this.hsmsData.hsmsSwitch;
+		if(index!=-1){
+			this.scopeTabs[index].checked = this.hsmsData.hsmsSwitch;
+		}
     this.checkedHos = this.hsmsData.checkedHos;
     this.orderScopeRadio = this.hsmsData.orderScopeRadio;
     this.initOrderScope();
@@ -53,24 +66,34 @@ export class OrderScopeComponent implements OnInit {
   }
 
   initItsm(){
+		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]
+		}
+		this.initHsms();
+		this.itsmInitOrderScope();
     console.log('itsmData', this.itsmData);
-    let index = this.scopeTabs.findIndex(v => v.value === 1);
-    this.scopeTabs[index].checked = this.itsmData.mdv2Switch;
-    this.itsmOrderScopeRadio = this.itsmData.orderScopeRadio;
-    this.itsmInitOrderScope();
-    this.itsmGetOrderScope();
   }
 
-    // 工单范选项卡
-    scopeTabs:any[] = [
-      { name: '运维', value: 1, checked: false },
-      { name: '配送', value: 2, checked: false },
-    ];
-    activeScopeTab = this.scopeTabs[0];
-    //#region 工单范围-运维start
-    allDuty:number = 1;
     itsmInitOrderScope(){
-
+			if(this.scopeTabs.length == 1){
+				this.scopeTabs[0].checked = true
+			}else if(this.scopeTabs.length == 2){
+				let index = this.scopeTabs.findIndex(v => v.value === 1);
+				this.scopeTabs[index].checked = this.itsmData.mdv2Switch;
+			}
+			this.itsmOrderScopeRadio = this.itsmData.orderScopeRadio;
+			this.itsmGetOrderScope();
     }
     // 工单范围数据
     itsmGetOrderScope() {
@@ -287,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 = [];
@@ -347,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

@@ -112,6 +112,7 @@ export class ToolService {
     }
     let secondMenus = []; // 二级菜单
     let jurisdiction = []; //当前菜单的权限列表
+		let menuItem = null;
     let coopBtns: any = {}; // 初始化权限
     menu.forEach((e) => {
       if (e.childrens) {
@@ -133,6 +134,8 @@ export class ToolService {
         }
       })
     }
+		menuItem = jurisdiction
+		localStorage.setItem("menuItem", JSON.stringify(menuItem))
     jurisdiction.forEach((e) => {
       switch (e.link) {
         case "look":
@@ -297,6 +300,18 @@ export class ToolService {
 				case "crossHospital":
 				  coopBtns.crossHospital = true; //跨部门选组
 				  break;
+				case "maintenance":
+				  coopBtns.maintenance = true; //运维
+				  break;
+				case "distributionPj":
+				  coopBtns.distributionPj = true; //配送陪检
+				  break;
+				case "extension":
+				  coopBtns.extension = true; //分机绑定
+				  break;
+				case "callCenter":
+				  coopBtns.callCenter = true; //呼叫中心
+				  break;
       }
     });
     console.log(coopBtns);

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

@@ -1225,7 +1225,10 @@
                   >
                     查看图片</button
                   > -->
-									<img *ngIf="item.attachments" (click)="previewImageHandler(item.attachments[0])" width="50" height="50" [src]="imgUrl + item.attachments[0].relativeFilePath" alt="">
+									<div class="img-box" *ngIf="item.attachments && item.attachments.length>0">
+										<img (click)="previewImageHandler(i, index)"
+										width="50" height="50" *ngFor="let i of item.attachments; let index = index;" [src]="imgUrl + i.relativeFilePath" alt="">
+									</div>
 									<span *ngIf="!item.attachments">无</span>
                 </td>
                 <td>

src/app/share/order-detail/order-detail.component.less

@@ -4,6 +4,13 @@ img{
 	cursor: pointer;
 }
 
+.img-box{
+	display: flex;
+	img{
+		margin: 0 2px;
+	}
+}
+
 :host {
   width: 100%;
   height: 100%;
@@ -201,7 +208,7 @@ img{
           min-height: 160px;
           background: #fff;
           border-radius: 5px;
-
+					
           .thead {
             background-image: repeating-linear-gradient(
               to right,

src/app/share/order-detail/order-detail.component.ts

@@ -129,11 +129,16 @@ export class OrderDetailComponent implements OnInit {
   // 预览图片
   imgs = [];
   isPreview = false;
-  previewImageHandler(data) {
+  previewImageHandler(data,index) {
+		// this.imgs = data.map((v) => location.origin + '/file' + v.relativeFilePath)
+		// console.log(9999,this.imgs)
+		// this.isPreview = true;
     this.isPreview = false;
     this.mainService.getPreviewImage(data.bindType,data.bindId).subscribe((result:any)=>{
       if (result.status == 200) {
-        this.imgs = result.data.map((v) => location.origin + '/file' + v.relativeFilePath);
+				this.imgs = [location.origin + '/file' + result.data[index].relativeFilePath]
+				// console.log(898988,result)
+        // this.imgs = result.data.map((v) => location.origin + '/file' + v.relativeFilePath);
         this.isPreview = true;
       } else {
         this.imgs = [];

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

@@ -106,9 +106,13 @@
       <div class="cots_body weifenpai" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag1 && !flagList.itsmFlag1) || flagList.itsmFlag1" [ngClass]="{ top185: hurseInfoHiding != 1, top185_1: flagList.itsmFlag1 }">
         <virtual-scroller [items]="unassignedList" #osComponentRef2 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="unassignedList.length && !loading1">
-            <div class="list listsTypeColor" *ngFor="let data of osComponentRef2.viewPortItems;trackBy:trackById">
-              <!-- 配送 -->
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef2.viewPortItems;trackBy:trackById;let index = index;">
+              <!-- 配送 绿色-->
               <ng-container *ngIf="data.type === 'hsms'">
+								<div class="top-border2" *ngIf="index == 0"></div>
+								<div class="top-border2 top-border3" *ngIf="index == 1"></div>
+								<div class="top-border2" *ngIf="index > 1" [ngClass]="{'top-border3': data.data.timeOut == true}"></div>
+								<div class="left-border2"></div>
                 <div class="left_cots" (click)="openDetails(data.data)">
                   <!-- 工单 -->
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
@@ -194,9 +198,15 @@
                 </div>
                 <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
                 <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
-              </ng-container>
-              <!-- 运维 -->
+								<div class="bottom-border2"></div>
+								<div class="right-border2"></div>
+							</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>
                 <div class="left_cots" (click)="openItsmDetails(data.data)">
                   <div class="gongdan">
                     <span class="left gongdan_name">
@@ -250,7 +260,9 @@
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
                 <div *ngIf="data.data.overtimePercent > 100" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
-              </ng-container>
+								<div class="bottom-border"></div>
+								<div class="right-border"></div>
+							</ng-container>
             </div>
           </ng-container>
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading1">
@@ -290,9 +302,12 @@
       <div class="cots_body daidaoda" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag2 && !flagList.itsmFlag2) || flagList.itsmFlag2" [ngClass]="{ top185: hurseInfoHiding != 1, top185_1: flagList.itsmFlag2 }">
         <virtual-scroller [items]="arriveList" #osComponentRef3 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="arriveList.length && !loading2">
-            <div class="list listsTypeColor" *ngFor="let data of osComponentRef3.viewPortItems;trackBy:trackById">
+            <div class="list listsTypeColor" *ngFor="let data of osComponentRef3.viewPortItems;trackBy:trackById;let index = index;">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
+								<div class="top-border2" *ngIf="index == 0"></div>
+								<div class="top-border2" *ngIf="index > 0" [ngClass]="{'top-border3': data.data.timeOut == true}"></div>
+								<div class="left-border2"></div>
                 <div class="left_cots" (click)="openDetails(data.data)">
                   <!-- 工单 -->
                   <div class="gongdan" (click)="batchWithdrawalSelect(!data.checked, data.data.id, $event)">
@@ -376,9 +391,14 @@
                 </div>
                 <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
                 <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
-              </ng-container>
+								<div class="bottom-border2"></div>
+								<div class="right-border2"></div>
+							</ng-container>
               <!-- 运维 -->
               <ng-container *ngIf="data.type === 'mdv2'">
+								<div class="top-border" *ngIf="index == 0"></div>
+								<div class="top-border" *ngIf="index > 0" [ngClass]="{'top-border3': data.data.overtimePercent > 100}"></div>
+								<div class="left-border"></div>
                 <div class="left_cots" (click)="openItsmDetails(data.data)">
                   <div class="gongdan">
                     <span class="left gongdan_name">
@@ -430,7 +450,9 @@
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
                 <div *ngIf="data.data.overtimePercent > 100" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
-              </ng-container>
+								<div class="bottom-border"></div>
+								<div class="right-border"></div>
+							</ng-container>
             </div>
           </ng-container>
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center"  *ngIf="loading2">
@@ -465,9 +487,12 @@
       <div class="cots_body zhixingzhong" *ngIf="(txtLabelCol == 1 && flagList.hsmsFlag3 && !flagList.itsmFlag3) || flagList.itsmFlag3" [ngClass]="{ top185: hurseInfoHiding != 1, top185_1: flagList.itsmFlag3 }">
         <virtual-scroller [items]="executionList" #osComponentRef5 [ngStyle]="{ height: '100%' }">
           <ng-container *ngIf="executionList.length && !loading3">
-            <div class="list" *ngFor="let data of osComponentRef5.viewPortItems;trackBy:trackById">
+            <div class="list" *ngFor="let data of osComponentRef5.viewPortItems;trackBy:trackById;let index = index;">
               <!-- 配送 -->
               <ng-container *ngIf="data.type === 'hsms'">
+								<div class="top-border2" *ngIf="index == 0"></div>
+								<div class="top-border2" *ngIf="index > 0" [ngClass]="{'top-border3': data.data.timeOut == true}"></div>
+								<div class="left-border2"></div>
                 <div class="left_cots" (click)="openDetails(data.data)">
                   <!-- 工单 -->
                   <div class="gongdan">
@@ -550,9 +575,14 @@
                 </div>
                 <div *ngIf="data.data.timeOut != true" class="slider sgreen" [ngStyle]="{ width: data.data.percent + '%' }"></div>
                 <div *ngIf="data.data.timeOut == true" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
-              </ng-container>
+								<div class="bottom-border2"></div>
+								<div class="right-border2"></div>
+							</ng-container>
               <!-- 运维 -->
               <ng-container *ngIf="data.type === 'mdv2'">
+								<div class="top-border" *ngIf="index == 0"></div>
+								<div class="top-border" *ngIf="index > 0" [ngClass]="{'top-border3': data.data.overtimePercent > 100}"></div>
+								<div class="left-border"></div>
                 <div class="left_cots" (click)="openItsmDetails(data.data)">
                   <div class="gongdan">
                     <span class="left gongdan_name">
@@ -604,7 +634,9 @@
                 </div>
                 <div *ngIf="data.data.overtimePercent <= 100" class="slider sgreen" [ngStyle]="{ width: data.data.overtimePercent + '%' }"></div>
                 <div *ngIf="data.data.overtimePercent > 100" class="slider sred" [ngStyle]="{ width: '100%' }"></div>
-              </ng-container>
+								<div class="bottom-border"></div>
+								<div class="right-border"></div>
+							</ng-container>
             </div>
           </ng-container>
           <div class="loading display_flex col-flex justify-content_flex-center align-items_center" *ngIf="loading3">
@@ -1817,9 +1849,9 @@
   ></app-dialog-delete>
 </div>
 <!-- 绑定分机 -->
-<app-bind-extension-number [hsmsData]="hsmsData" [itsmData]="itsmData" [websocketLoading]="websocketLoading" *ngIf="showBindExtensionNumberModal" (confirmModal)="checkIn($event)" (cancelModal)="cancelBindExtensionNumber($event)"></app-bind-extension-number>
+<app-bind-extension-number [hsmsData]="hsmsData" [itsmData]="itsmData" [coopBtns]="coopBtns" [websocketLoading]="websocketLoading" *ngIf="showBindExtensionNumberModal" (confirmModal)="checkIn($event)" (cancelModal)="cancelBindExtensionNumber($event)"></app-bind-extension-number>
 <!-- 工单范围 -->
-<app-order-scope *ngIf="showInitModal" [hsmsData]="hsmsData" [itsmData]="itsmData" (confirmModal)="confirmOrderScope($event)" (cancelModal)="cancelOrderScope($event)"></app-order-scope>
+<app-order-scope *ngIf="showInitModal" [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>
 <!-- 消息弹框模板 -->

src/app/views/fuwutai/fuwutai.component.less

@@ -593,15 +593,80 @@
     justify-content: center;
     align-items: center;
   }
-
+	
+	.top-border2{
+		width: 15px;
+		height: 2px;
+		background: #49B856;
+		position: absolute;
+		top: 0;
+	}
+	.top-border3{
+		top: -2px !important;
+	}
+	.left-border2{
+		width: 2px;
+		height: 15px;
+		background: #49B856;
+		position: absolute;
+		left: 0;
+	}
+	.bottom-border2{
+		width: 15px;
+		height: 2px;
+		background: #49B856;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+	}
+	.right-border2{
+		width: 2px;
+		height: 15px;
+		background: #49B856;
+		position: absolute;
+		right: 0;
+		bottom: 0;
+	}
+	.top-border{
+		width: 15px;
+		height: 2px;
+		background: #0F70BB;
+		position: absolute;
+		top: 0;
+	}
+	.left-border{
+		width: 2px;
+		height: 15px;
+		background: #0F70BB;
+		position: absolute;
+		left: 0;
+	}
+	.bottom-border{
+		width: 15px;
+		height: 2px;
+		background: #0F70BB;
+		position: absolute;
+		bottom: 0;
+		right: 0;
+	}
+	.right-border{
+		width: 2px;
+		height: 15px;
+		background: #0F70BB;
+		position: absolute;
+		right: 0;
+		bottom: 0;
+	}
+	
   /* 未分派 */
   .weifenpai .list {
     // height: 100px;
     border-bottom: 1px rgb(225, 229, 232) solid;
     position: relative;
-    overflow: hidden;
+    // overflow: hidden;
     display: flex;
   }
+	
   // 转出院记录
   .patientLog .list {
     height: auto !important;
@@ -815,7 +880,7 @@
   /* 待到达 */
   .daidaoda .list {
     // height: 100px;
-    overflow: hidden;
+    // overflow: hidden;
     border-bottom: 1px rgb(225, 229, 232) solid;
     position: relative;
     display: flex;
@@ -963,7 +1028,7 @@
     border-bottom: 1px rgb(225, 229, 232) solid;
     cursor: pointer;
     position: relative;
-    overflow: hidden;
+    // overflow: hidden;
     display: flex;
   }
 
@@ -1476,7 +1541,6 @@
       height: 56px;
       border-right: 1px solid #e5e9ed;
       padding: 0;
-
       &:nth-child(4n-2) {
         background: #f9fafb;
       }

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]);

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

@@ -535,7 +535,8 @@
                         </div>
                         <overlay-scrollbars #osComponentRef2 class="otherBox-nav__main" [ngStyle]="{ height: '100%' }">
                           <div class="otherBox-nav__mainInner" *ngIf="!oLoading && othersList[checkedTableType]?.length > 0">
-                            <div [sortablejs]="othersList[checkedTableType]" [sortablejsOptions]="othersListOptions" class="w100">
+                            <!-- <div [sortablejs]="othersList[checkedTableType]" [sortablejsOptions]="othersListOptions" class="w100"> -->
+                            <div class="w100">
                               <div class="otherBox-nav__mainItem" *ngFor="let item of othersList[checkedTableType]" (click)="otherClick(item)" [ngClass]="{ active: selectOtherId == item.id }" [title]="item.taskName">
                                 {{ item.taskName }}
                               </div>
@@ -2387,11 +2388,11 @@
 				<nz-form-item>
 					<nz-form-label [nzSm]="4" [nzXs]="4" nzFor="description">图片上传</nz-form-label>
 					<nz-form-control style="display: inline-block;" *ngIf="repairImgs.length === 0">
-					  <nz-upload nzListType="picture-card" [(nzFileList)]="fileList" 
-						[nzShowUploadList]="showUploadList" [nzPreview]="handlePreview" 
-						nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png" 
-						[nzShowButton]="fileList.length < 3" 
-						[nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl" 
+					  <nz-upload nzListType="picture-card" [(nzFileList)]="fileList"
+						[nzShowUploadList]="showUploadList" [nzPreview]="handlePreview"
+						nzFileType="image/jpeg,image/png" nzAccept="image/jpeg,image/png"
+						[nzShowButton]="fileList.length < 3"
+						[nzBeforeUpload]="beforeUpload" [nzAction]="temporarilyUrl"
 						[nzSize]="10240">
 					    <i nz-icon nzType="plus"></i>
 					    <div class="ant-upload-text">上传照片</div>

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.html

@@ -23,24 +23,28 @@
 				<div class="sign-describe">待接单: <span class="sign-num">{{workData.gd_todo || 0}}</span></div>
 				<div class="sign-describe">处理中: <span class="sign-num">{{workData.gd_doing || 0}}</span></div>
 			</div>
+			<div class="border"></div>
 		</div>
 		<div class="top-list">
 			<div class="special-box">
 				<div class="num">{{workData.sum_price || 0}}</div>
 				<div class="describe">总费用 (元)</div>
 			</div>
+			<div class="border"></div>
 		</div>
 		<div class="top-list">
 			<div class="special-box">
 				<div class="num">{{workData.gd_postpone || 0}}</div>
 				<div class="describe">挂起单数</div>
 			</div>
+			<div class="border"></div>
 		</div>
 		<div class="top-list">
 			<div class="special-box">
 				<div class="num">{{workData.gd_overtime || 0}}</div>
 				<div class="describe">超时单数</div>
 			</div>
+			<div class="border"></div>
 		</div>
 		<div class="top-list">
 			<div class="special-box">

src/app/views/new-statistics/maintenance-statistics/synthesize-statistics/synthesize-statistics.component.less

@@ -36,9 +36,13 @@
 				align-items: center;
 				justify-content: center;
 				width: 20%;
-				border-right: 1px solid #D9D9D9;
-				&:last-child{
-					border-right:none;
+				position: relative;
+				.border{
+					width: 1px;
+					height: 42px;
+					background: #D9D9D9;
+					position: absolute;
+					right: 0;
 				}
 				.special-box{
 					text-align: center;

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

@@ -116,20 +116,30 @@ export class SynthesizeStatisticsComponent implements OnInit {
 									show: true,
 									formatter: '{b}: {c} {d}%'
 							},
-				      // itemStyle: {
-				      //   normal: {
-				      //     //每根柱子颜色设置
-				      //     color: function (params) {
-				      //       let colorList = [
-				      //         "#33CC85",
-				      //         "#72C0DD",
-				      //         "#FAC958",
-										// 	"#546FC6",
-				      //       ];
-				      //       return colorList[params.dataIndex];
-				      //     },
-				      //   },
-				      // },
+				      itemStyle: {
+				        normal: {
+				          //每根柱子颜色设置
+				          color: function (params) {
+				            let colorList = [
+				              "#33CC85",
+				              "#72C0DD",
+				              "#FAC958",
+											"#546FC6",
+											"#d35b7e",
+											"#778ccC",
+											"#fad354",
+											"#aldee0",
+											"#ee84a8",
+											"#8475c5",
+											"#b0d097",
+											"#ffadbb",
+											"#fd8c67",
+											"#d495e0",
+				            ];
+				            return colorList[params.dataIndex];
+				          },
+				        },
+				      },
 				    },
 				  ],
 				};

src/app/views/new-statistics/maintenance-statistics/tripartite-company-statistics/tripartite-company-statistics.component.ts

@@ -26,7 +26,6 @@ export class TripartiteCompanyStatisticsComponent implements OnInit, AfterViewIn
   listLength: number = 0; //表格总数据量
 
   repairDeptId;//报修科室id
-
   searchTimerSubject = new Subject();
 
   ngOnInit() {

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>
@@ -75,6 +75,17 @@
               {{coopData.code}}
             </nz-form-control>
           </nz-form-item>
+					<nz-form-item>
+					  <nz-form-label [nzSpan]="5" nzRequired nzFor="name">使用范围</nz-form-label>
+					  <nz-form-control [nzSpan]="19" nzErrorTip="请输入使用范围!">
+					    <nz-radio-group formControlName="employScope">
+					    	<label nz-radio [nzValue]="i.id" *ngFor="let i of scopeList" [nzDisabled]="i.disabled">{{i.name}}</label>
+					    	<!-- <label nz-radio nzValue="1">院区内使用</label> -->
+					    	<!-- <label nz-radio nzValue="2" *ngIf="currentHospital.parentDeptId">部门内使用</label> -->
+					    	<!-- <label nz-radio nzValue="3" *ngIf="currentHospital.parent || currentHospital.parentDeptId">垂直部门使用</label> -->
+					    </nz-radio-group>
+					  </nz-form-control>
+					</nz-form-item>
           <nz-form-item>
             <nz-form-label [nzSpan]="5" nzRequired nzFor="name">公司全称</nz-form-label>
             <nz-form-control [nzSpan]="19" nzErrorTip="请输入公司全称!">

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

@@ -71,7 +71,7 @@ export class TripartiteCompanyComponent implements OnInit {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       company: {
-        hosId: this.currentHospital.id,
+        statisticalHosId: this.currentHospital.id,
         busiType: { key: 'company_busi_type', value: '2' },
         ...this.searchDto,
       },
@@ -102,10 +102,39 @@ export class TripartiteCompanyComponent implements OnInit {
     this.modal = false;
     this.initForm();
   }
-
+	
+	// 使用范围选择
+	scopeValue:any;
+	// 格式化使用范围
+	setScopeRadio(){
+		let value = this.validateForm.value.employScope
+		let list = this.scopeList.find(i=>i.id == value)
+		if(list.value=='-1'){
+			this.scopeValue = ''
+		}else if(list.value=='1'){
+			if(this.currentHospital.parent){
+				this.scopeValue = this.currentHospital.parent.id
+			}else{
+				this.scopeValue = this.currentHospital.id
+			}
+		}else if(list.value=='2'){
+			if(this.currentHospital.parent && this.currentHospital.parentDeptId){
+				this.scopeValue = this.currentHospital.id
+			}
+		}else{
+			if(this.currentHospital.parent && this.currentHospital.parentDeptId){
+				this.scopeValue = this.currentHospital.parentDeptId
+			}else{
+				this.scopeValue = this.currentHospital.id
+			}
+		}
+		console.log(111,this.scopeValue)
+	}
+	
   // 初始化新增form表单
   initForm() {
     this.validateForm = this.fb.group({
+			employScope: ['', [Validators.required]],
       name: ['', [Validators.required, Validators.pattern(/\S/)]],
       nickName: ['', [Validators.required]],
       companyTypeIds: [this.companyTypeList.map(v => ({ label: v.name, value: v.id, checked: false })), [Validators.required]],
@@ -117,12 +146,32 @@ export class TripartiteCompanyComponent implements OnInit {
   //获取公司分类
   isLoading:boolean = false;
   companyTypeList:any[] = [];
+	scopeList:any[] = [];
   getCompanyType() {
     this.isLoading = true;
     this.mainService.getDictionary("list", "company_type").subscribe((data) => {
-      this.isLoading = false;
       this.companyTypeList = data || [];
     });
+		this.mainService.getDictionary("list", "select_range").subscribe((data) => {
+		  this.isLoading = false;
+			for(let i of data){
+				i.disabled = false
+			}
+			for(let i of data){
+				if((this.currentHospital || this.currentHospital.parent) && !this.currentHospital.parentDeptId){
+					if(i.value=='2'){
+						i.disabled = true
+					}
+				}
+				if (!this.currentHospital.parent && !this.currentHospital.parentDeptId){
+					if(i.value=='3'){
+						i.disabled = true
+					}
+				}
+			}
+		  this.scopeList = data;
+			console.log(9999,this.scopeList)
+		});
   }
 
   // 新增/编辑表单提交
@@ -134,7 +183,7 @@ export class TripartiteCompanyComponent implements OnInit {
     if (this.validateForm.invalid) {
       return;
     }
-
+		this.setScopeRadio()
     console.log(this.validateForm.value)
     let companyList = this.validateForm.value.companyTypeIds.filter(v => v.checked);
     if(!companyList.length){
@@ -149,7 +198,10 @@ export class TripartiteCompanyComponent implements OnInit {
       //增加
       postData = {
         company: {
-          hosId: this.currentHospital.id,
+          hosId: this.scopeValue,
+					selectRange:{
+						id:this.validateForm.value.employScope
+					},
           name: this.validateForm.value.name,
           nickName: this.validateForm.value.nickName,
           companyTypeIds: companyList.map(v => v.value).toString(),
@@ -164,7 +216,10 @@ export class TripartiteCompanyComponent implements OnInit {
         company:{
           ...this.coopData,
           ...{
-            hosId: this.currentHospital.id,
+            hosId: this.scopeValue,
+						selectRange:{
+							id:this.validateForm.value.employScope
+						},
             name: this.validateForm.value.name,
             nickName: this.validateForm.value.nickName,
             companyTypeIds: this.validateForm.value.companyTypeIds.filter(v => v.checked).map(v => v.value).toString(),
@@ -204,6 +259,7 @@ export class TripartiteCompanyComponent implements OnInit {
     this.add = false;
     this.modal = true;
     this.coopData = data;
+		this.validateForm.controls.employScope.setValue(data.selectRange.id);
     this.validateForm.controls.name.setValue(data.name);
     this.validateForm.controls.nickName.setValue(data.nickName);
     this.validateForm.controls.companyTypeIds.setValue(this.companyTypeList.map(v => ({label: v.name, value: v.id, checked: data.companyTypeIds.includes(v.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,
@@ -486,7 +486,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,