bug修改

src/app/components/incidentManagement/incident-ser-visit/incident-ser-visit.component.ts

@@ -24,9 +24,6 @@ export class IncidentSerVisitComponent implements OnInit {
     private fb: FormBuilder,
   ) {}
 
-  loginUser: any = localStorage.getItem("user")
-    ? JSON.parse(localStorage.getItem("user")).user
-    : null; //登录人信息
   listOfData: any[] = []; //表格数据
   coopId: string; //表格中执行操作的id
   hospital: string; //选中院区
@@ -81,7 +78,7 @@ export class IncidentSerVisitComponent implements OnInit {
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     if(this.itsmData.allDuty == 1){
-      this.getMaintainDeptList();
+      this.maintainDept = this.tool.getUserInfoPermission().dutyList || [];
     }else{
       this.maintainDept = this.itsmData.checkedHos || [];
       // if(this.coopBtns.strideLook){
@@ -405,4 +402,4 @@ export class IncidentSerVisitComponent implements OnInit {
   hideModal() {
     this.closeModelHs.emit(JSON.stringify({ show: false }));//emits(向上弹射)事件
   }
-}
+}

src/app/services/tool.service.ts

@@ -43,7 +43,7 @@ export class ToolService {
   }
 	// 获取权限中的信息
 	getUserInfoPermission() {
-	  return JSON.parse(localStorage.getItem("user")).infoPermission || [];
+	  return JSON.parse(localStorage.getItem("user")).infoPermission || {};
 	}
   // 获取权限中的分组
   getGroupList() {

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

@@ -1136,7 +1136,7 @@
                           <nz-form-item>
                             <nz-form-label class="label" [nzSm]="24" [nzXs]="24" nzRequired nzFor="endDepts">终点科室</nz-form-label>
                             <nz-form-control class="control" [nzSm]="24" [nzXs]="24" nzErrorTip="请选择终点科室！">
-                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange(e)">
+                              <nz-select formControlName="endDepts" [nzDisabled]="deptZyList.endStatus == 201 || deptZyList.endStatus == 203 || deptZyList.endStatus == 206" [nzDropdownMatchSelectWidth]="false" nzServerSearch nzShowSearch (nzOnSearch)="searchHosDepartment(checkedHos, 'end', $event)" nzAllowClear nzPlaceHolder="请选择终点科室" [(ngModel)]="endDeptZy" (ngModelChange)="endDeptZyChange()">
                                 <ng-container *ngFor="let option of deptZyList.endDept">
                                   <nz-option *ngIf="!isLoading" [nzLabel]="option.dept" [nzValue]="option.id"></nz-option>
                                 </ng-container>

src/app/views/realtime-broadcast/realtime-broadcast.component.html

@@ -125,17 +125,16 @@
                   </span>
                 </div>
 
-                <div class="didian" *ngIf="data.overtimeRemark">
+                <div class="didian">
                   <span class="left">
-                    <span [innerHTML]="data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.overtimeRemark"></span>
+                    <span *ngIf="data.overtimeRemark" [innerHTML]="data.overtimeRemark" nz-tooltip [nzTooltipTitle]="data.overtimeRemark"></span>
+                    <span *ngIf="!data.overtimeRemark">无</span>
                   </span>
                 </div>
                 <!-- 时间 -->
                 <div class="shijian">
                   <span class="left">
-                    <span>
-                      申请人：{{ data.requester?.name }}
-                    </span>
+                    <span>处理人/组：{{ transferSynergetic(data) }}</span>
                   </span>
                   <span class="right">
                     {{ data.startDate | date: 'yyyy-MM-dd HH:mm'}}

src/app/views/realtime-broadcast/realtime-broadcast.component.less

@@ -44,7 +44,7 @@
 
       .content {
         width: 100%;
-        height: 117px;
+        height: 145px;
         background: #f9fafb;
         border: 1px solid #e5e9ed;
         border-radius: 5px;
@@ -390,7 +390,7 @@
 
   /* 未分派 */
   .weifenpai .list {
-    height: 117px;
+    height: 145px;
     border-bottom: 1px solid #7D7D7D;
     position: relative;
     overflow: hidden;

src/app/views/realtime-broadcast/realtime-broadcast.component.ts

@@ -231,6 +231,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
 
           // 初始化故障工单列表
           if(this.config.showOvertime == 1){
+            this.incidentList['2handler'].name = '待处理（不含延期处理）';
             this.incidentList['3overtime'] = {
               name: '延期处理',
               list: [],
@@ -239,6 +240,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
             this.getIncidentList('2handler');
             this.getIncidentList('3overtime');
           }else{
+            this.incidentList['2handler'].name = '待处理';
             delete this.incidentList['3overtime'];
             this.getIncidentList('1pending');
             this.getIncidentList('2handler');
@@ -253,7 +255,7 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
   pageSize = 0;
   computedNum(){
     let h = (document.querySelector('.lists_box') as HTMLElement).offsetHeight;
-    this.pageSize = Math.floor((h / 117));
+    this.pageSize = Math.floor((h / 145));
   }
 
   // 刷新故障工单列表
@@ -299,18 +301,17 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
       idx: 0,
       sum: 99999,
       incident: {
-        assignee: this.tool.getCurrentUserId(),
         deleteFlag: 0,
 				candidateGroups: this.config.groupIds ? this.config.groupIds.toString() : undefined,
 				dutyIds: this.config.deptIds.toString(),
-        queryTask: 'all',
+        queryTask: 'queryAll',
       },
     };
     if(type == '1pending'){
       postData.incident.statusId = this.incidentStatusList.find(v => v.value === 'pending').id;
     }else if(type == '2handler'){
       postData.incident.statusId = this.incidentStatusList.find(v => v.value === 'handler').id;
-      postData.incident.overtime = this.config.showOvertime;
+      postData.incident.overtime = this.config.showOvertime == 1 ? 0 : undefined;
     }else if(type == '3overtime'){
       postData.incident.statusId = this.incidentStatusList.find(v => v.value === 'handler').id;
       postData.incident.overtime = 1;
@@ -424,4 +425,13 @@ export class RealtimeBroadcastComponent implements OnInit,AfterViewInit {
       }
     });
   }
+
+  // 处理人+协同人
+  transferSynergetic(incidentData){
+    let str = incidentData.groupORHandlerUser || "";
+    if(incidentData.synergetic && incidentData.synergetic.length){
+        str += '，' + incidentData.synergetic.map(v => v.name).join('，');
+    }
+    return str;
+  }
 }