bug修复

src/app/components/incidentManagement/incident-detail/incident-detail.component.ts

@@ -59,7 +59,7 @@ export class IncidentDetailComponent implements OnInit {
     this.activeTabValue = item.value;
 
     if(this.activeTabValue == 1){
-      this.incidentData.callID && this.getCallrecord();
+      this.incidentData.callID && this.getCallLog();
       this.incidentData.reqAttachment && this.getRepairImgs();
     }else if(this.activeTabValue == 2){
       this.getHandleImgs();
@@ -173,19 +173,30 @@ export class IncidentDetailComponent implements OnInit {
 
   // 获取通话音频
   audioSrc =  '';//音频
-  getCallrecord() {
+  getCallLog() {
     let postData = {
       idx: 0,
       sum: 1,
-      callrecord: {callAccept: this.incidentData.callID},
+      callLog: {callAccept: this.incidentData.callID},
     };
     this.mainService
-      .getFetchDataList('simple/data', 'callrecord', postData)
+      .getFetchDataList('simple/data', 'callLog', postData)
       .subscribe((result) => {
         if(result.status == 200){
           result.list = result.list || [];
           if(result.list.length){
             this.audioSrc = location.origin + result.list[0].recordingFileName;
+            if(result.list[0].path){
+              this.mainService.getCallLogPath({ path: result.list[0].path, hosId: result.list[0].hosId }).subscribe((result) => {
+                if (result["state"] == 200) {
+                  this.audioSrc = location.origin + result["relativePath"];
+                }else{
+                  this.audioSrc = '';
+                }
+              });
+            }else{
+              this.audioSrc = '';
+            }
           }else{
             this.audioSrc = '';
           }

src/app/components/incidentManagement/incident-handle-repair/incident-handle-repair.component.ts

@@ -21,25 +21,36 @@ export class IncidentHandleRepairComponent implements OnInit {
 
   ngOnInit() {
     this.hosId = this.tool.getCurrentHospital().id;
-    this.incidentData.callID && this.getCallrecord();
+    this.incidentData.callID && this.getCallLog();
     this.incidentData.reqAttachment && this.getRepairImgs();
   }
 
   // 获取通话音频
   audioSrc =  '';//音频
-  getCallrecord() {
+  getCallLog() {
     let postData = {
       idx: 0,
       sum: 1,
-      callrecord: {callAccept: this.incidentData.callID},
+      callLog: {callAccept: this.incidentData.callID},
     };
     this.mainService
-      .getFetchDataList('simple/data', 'callrecord', postData)
+      .getFetchDataList('simple/data', 'callLog', postData)
       .subscribe((result) => {
         if(result.status == 200){
           result.list = result.list || [];
           if(result.list.length){
             this.audioSrc = location.origin + result.list[0].recordingFileName;
+            if(result.list[0].path){
+              this.mainService.getCallLogPath({ path: result.list[0].path, hosId: result.list[0].hosId }).subscribe((result) => {
+                if (result["state"] == 200) {
+                  this.audioSrc = location.origin + result["relativePath"];
+                }else{
+                  this.audioSrc = '';
+                }
+              });
+            }else{
+              this.audioSrc = '';
+            }
           }else{
             this.audioSrc = '';
           }

src/app/components/incidentManagement/incident-handle/incident-handle.component.less

@@ -114,10 +114,8 @@
         height: 100%;
         border-left: 1px solid #E9E9E9;
         .knowageItem{
-          padding: 16px 16px 0;
-          &:last-of-type{
-            padding-bottom: 16px;
-          }
+          padding: 16px;
+          border-bottom: 1px solid #E9E9E9;
         }
         .knowageTitle{
           font-size: 16px;

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

@@ -6,15 +6,14 @@
       <ng-container *ngIf="!loading">
         <div class="items" *ngFor="let item of visitList">
           <div class="row">
-            <div class="col">单号：{{item.incidentsign}}</div>
-            <div class="col">优先级：<span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span></div>
-            <div class="col">院区-科室名称：{{item.hosName}}-{{item.department?.dept}}</div>
+            <div class="col"><span [ngClass]="priorityColor(item.priorityId)">{{item.priorityDTO?.name}}</span> {{item.incidentsign}}</div>
+            <div class="col">{{item.hosName}} {{item.department?.dept}}</div>
           </div>
           <div class="row">
             <div class="col">故障描述：{{item.description}}</div>
           </div>
           <div class="row">
-            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }}</div>
+            <div class="col">详细地址：{{ item.place ? item.place.building.buildingName : '' }}{{ item.place ? item.place.floorName : '' }}{{ item.houseNumber }} <span [innerHTML]="transferHandlerLog(item.currentLog)"></span></div>
           </div>
           <div class="row">
             <div class="col">申请时间：{{ item.startDate | date: 'yyyy-MM-dd HH:mm'}}</div>

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

@@ -2,6 +2,8 @@ import { Component, OnInit, Input, Output, EventEmitter, ViewChild } from '@angu
 import { ToolService } from 'src/app/services/tool.service';
 import { MainService } from 'src/app/services/main.service';
 import { OverlayScrollbarsComponent } from 'overlayscrollbars-ngx';
+import cloneDeep from 'lodash-es/cloneDeep'
+import { format, addHours, addDays } from 'date-fns';
 @Component({
   selector: 'app-incident-ser-visit',
   templateUrl: './incident-ser-visit.component.html',
@@ -94,6 +96,24 @@ export class IncidentSerVisitComponent implements OnInit {
     this.getVisitList();
   }
 
+  // 延期记录
+  transferHandlerLog = function (currentLog) {
+    if(!currentLog){
+        return '';
+    }
+    currentLog = cloneDeep(currentLog);
+    if(currentLog.extra1DTO && currentLog.extra2 && currentLog.startTime){
+        if(currentLog.extra2==0.5){
+          currentLog.extra2 = 4;
+          return currentLog.extra1DTO.name+" "+ format(addHours(currentLog.startTime, +currentLog.extra2), "MM月dd日") + format(addDays(currentLog.startTime, +currentLog.extra2), "HH时mm分前完成");
+        }else{
+          return currentLog.extra1DTO.name+" "+ format(addDays(currentLog.startTime, +currentLog.extra2), "MM月dd日前完成");
+        }
+    }else{
+        return '';
+    }
+  }
+
   // 获取回访列表
   getVisitList(){
     this.loading = true;
@@ -102,7 +122,7 @@ export class IncidentSerVisitComponent implements OnInit {
       sum: 9999,
       incident: {
         "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
-        "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        "dutyIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
         "urgentType": +this.itsmData.orderScopeRadio + 1,
         "queryTask": "callback",
         "assignee": this.tool.getCurrentUserId(),

src/app/components/incidentManagement/incident-substitutio-assign/incident-substitution-assign.component.ts

@@ -171,7 +171,7 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
       group2: {
         groupName: keyword,
         hospitals: this.validateForm.value.dutyId,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/components/incidentManagement/incident-substitutio-redeploy/incident-substitution-redeploy.component.ts

@@ -117,7 +117,7 @@ export class IncidentSubstitutionRedeployComponent implements OnInit {
       group2: {
         groupName: keyword,
         hospitals: this.duty.id,
-        type: 1,
+        type: 3,
       },
       idx: 0,
       sum: 10,

src/app/components/knowledge-look/knowledge-look.component.less

@@ -128,7 +128,7 @@
 					z-index:9999;
 				}
 			.view-box{
-				height: 400px;
+				height: 628px;
 				display: flex;
 				border: 1px solid #eee;
 				.left-box{

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

@@ -118,7 +118,7 @@
                   <div class="gongdan" (click)="batchDispatchSelect(!data.checked, data.data.id, $event)">
                     <span class="left mr8" *ngIf="!flagList.itsmFlag1 && flagList.hsmsFlag1"><label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchDispatchSelect($event, data.data.id)"></label></span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -333,7 +333,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -445,7 +445,7 @@
                   <div class="shijian">
                     <span class="left">
                       <span>
-                        申请人：{{ data.data.requester?.name }}
+                        处理人：{{ computedHandlerUser(data.data) }}
                       </span>
                     </span>
                     <span class="right">
@@ -537,7 +537,7 @@
                       <label nz-checkbox [ngModel]="data.checked" (ngModelChange)="batchWithdrawalSelect($event, data.data.id)"></label>
                     </span>
                     <span class="left gongdan_name" nz-tooltip [nzTooltipTitle]="data.data.taskType.taskName + (data.data.goodsRemark?'-'+data.data.goodsRemark:'')+'(' + data.data.gdcode + ')'">
-                      {{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}<ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
+                      <strong>{{ data.data.isHalfInspect === 1 ? "半程陪检" : data.data.taskType.taskName }}</strong><ng-container *ngIf="data.data.goodsRemark">-{{data.data.goodsRemark}}</ng-container>({{ data.data.gdcode }})
                     </span>
                     <div class="right_all">
                       <span nz-tooltip [nzTooltipTitle]="data.data.worker ? data.data.worker.phone : ''" class="right_all_name">{{ data.data.worker ? data.data.worker.name : "" }}</span>
@@ -649,7 +649,7 @@
                   <div class="shijian">
                     <span class="left">
                       <span>
-                        申请人：{{ data.data.requester?.name }}
+                        处理人：{{ computedHandlerUser(data.data) }}
                       </span>
                     </span>
                     <span class="right">
@@ -917,57 +917,6 @@
       </div>
     </div>
     <div class="right">
-      <div class="fixedMenuWrap" *ngIf="!websocketLoading">
-        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
-          <div class="menuItems">
-            <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip [nzTooltipTitle]="incomingService.getPhoneNumber()">
-              {{incomingService.getPhoneNumber()}}
-            </div>
-          </div>
-        </div>
-        <!-- 录音盒状态 -->
-        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber() && incomingService.getSign() === 'box'">
-          <div class="menuItems">
-            <i class="icon_transport transport-shixian call-icon"></i>
-          </div>
-        </div>
-        <!-- 呼叫中心状态 -->
-         <!-- 来电 -->
-        <div class="fixedMenu" *ngIf="jry_state=='laidian' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-laidian call-icon"></i>
-          </div>
-        </div>
-        <!-- 示忙  -->
-        <div class="fixedMenu" *ngIf="jry_state=='shimang' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-shimang1 call-icon"></i>
-          </div>
-        </div>
-        <!-- 示闲  -->
-        <div class="fixedMenu" *ngIf="jry_state=='shixian' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-shixian call-icon"></i>
-          </div>
-        </div>
-        <!-- 通话中  -->
-        <div class="fixedMenu" *ngIf="jry_state=='tonghuazhong' && incomingService.getSign() === 'callCenter'">
-          <div class="menuItems">
-            <i class="icon_transport transport-tonghuazhong call-icon"></i>
-          </div>
-        </div>
-
-        <div class="fixedMenu" *ngIf="incomingService.getSign() === 'callCenter' && ((jry_state == 'shimang' && isShixian) || jry_state == 'shixian')">
-          <div class="menuItems">
-            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shixian($event)" *ngIf="jry_state=='shimang' && isShixian">
-              示闲
-            </button>
-            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shimang($event)" *ngIf="jry_state == 'shixian'">
-              示忙
-            </button>
-          </div>
-        </div>
-      </div>
       <div class="fixedMenu" *ngIf="hsmsData.hsmsSwitch || itsmData.mdv2Switch">
         <div class="menuItems">
           <button nz-button nzType="link" class="item itemLink" (click)="showNewOrder()" [nzLoading]="getConfigTasktypeLoading || patientLogTasktypeLoading">
@@ -1023,14 +972,71 @@
     <div *ngIf="showLastItems && fixedTab != '' && fixedTab != 'logout' && fixedTab != 'toSystem' && fixedTab != 'newOrder'" (click)="fixedMenuShangla()" class="fixedMark"></div>
   </div>
 
+  <!-- 右侧悬浮框-录音盒或呼叫中心状态 -->
+  <div id="fixedMenuAll" class="fixedAll">
+    <div class="right">
+      <div class="fixedMenuWrap" *ngIf="!websocketLoading">
+        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber()">
+          <div class="menuItems">
+            <div class="item itemLink ellipsis-oneline cursorDefault w100" nz-tooltip [nzTooltipTitle]="incomingService.getPhoneNumber()">
+              {{incomingService.getPhoneNumber()}}
+            </div>
+          </div>
+        </div>
+        <!-- 录音盒状态 -->
+        <div class="fixedMenu" *ngIf="incomingService.getPhoneNumber() && incomingService.getSign() === 'box'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shixian call-icon"></i>
+          </div>
+        </div>
+        <!-- 呼叫中心状态 -->
+         <!-- 来电 -->
+        <div class="fixedMenu" *ngIf="jry_state=='laidian' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-laidian call-icon"></i>
+          </div>
+        </div>
+        <!-- 示忙  -->
+        <div class="fixedMenu" *ngIf="jry_state=='shimang' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shimang1 call-icon"></i>
+          </div>
+        </div>
+        <!-- 示闲  -->
+        <div class="fixedMenu" *ngIf="jry_state=='shixian' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-shixian call-icon"></i>
+          </div>
+        </div>
+        <!-- 通话中  -->
+        <div class="fixedMenu" *ngIf="jry_state=='tonghuazhong' && incomingService.getSign() === 'callCenter'">
+          <div class="menuItems">
+            <i class="icon_transport transport-tonghuazhong call-icon"></i>
+          </div>
+        </div>
+
+        <div class="fixedMenu" *ngIf="incomingService.getSign() === 'callCenter' && ((jry_state == 'shimang' && isShixian) || jry_state == 'shixian')">
+          <div class="menuItems">
+            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shixian($event)" *ngIf="jry_state=='shimang' && isShixian">
+              示闲
+            </button>
+            <button nz-button nzType="link" class="item itemLink call-status" (click)="jry_shimang($event)" *ngIf="jry_state == 'shixian'">
+              示忙
+            </button>
+          </div>
+        </div>
+      </div>
+    </div>
+  </div>
+
   <!-- 左侧悬浮框 -->
   <div id="fixedMenuLeft" class="fixedLeft">
     <div class="right">
       <div class="fixedMenu">
         <div class="menuItems">
           <div class="others">
-            <div class="item" (click)="visitOrder()">回访<span *ngIf="visitNum !== undefined">-{{visitNum}}</span></div>
-            <div class="item" (click)="messageOrder()">留言<span *ngIf="messageNum !== undefined">-{{messageNum}}</span></div>
+            <div class="item" (click)="visitOrder()" *ngIf="itsmData.mdv2Switch">回访<span *ngIf="visitNum !== undefined" [ngClass]="{ red: visitNum > 0}">-{{visitNum}}</span></div>
+            <div class="item" (click)="messageOrder()" *ngIf="itsmData.mdv2Switch">留言<span *ngIf="messageNum !== undefined" [ngClass]="{ red: visitNum > 0}">-{{messageNum}}</span></div>
             <div class="item itemLink" (click)="callOrder()">通话</div>
           </div>
         </div>

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

@@ -1548,7 +1548,7 @@
   // 右侧悬浮菜单
   .fixed {
     position: fixed;
-    top: 40%;
+    top: calc(40% + 115px + 16px);
     right: 0;
     z-index: 9;
     border-radius: 5px 0 0 5px;
@@ -1776,6 +1776,238 @@
     }
   }
 
+  // 右侧悬浮菜单-录音盒或呼叫中心状态
+  .fixedAll {
+    position: fixed;
+    top: 40%;
+    right: 0;
+    z-index: 10;
+    border-radius: 5px 0 0 5px;
+
+    &.maskFull{
+      &::after{
+        content: '';
+        position: absolute;
+        top: 0;
+        left: 0;
+        width: 100%;
+        height: 100%;
+        z-index: 8;
+        cursor: move;
+      }
+    }
+
+    .fixedMark {
+      position: fixed;
+      left: 0;
+      top: 0;
+      width: 100%;
+      height: 100%;
+      background: rgba(0, 0, 0, 0.2);
+      z-index: 88;
+    }
+
+    // overflow: hidden;
+    & > .left {
+      width: 480px;
+      // height: 280px;
+      float: left;
+      background: #fff;
+      padding: 16px;
+      border-radius: 5px;
+      border: 1px solid #e5e9ed;
+      // box-shadow: -8px 5px 15px #eae9e9;
+      position: relative;
+      z-index: 98;
+
+      .con {
+        background: #f9fafb;
+        width: 100%;
+        // height: 300px;
+        // overflow: auto;
+        border-radius: 5px;
+        border: 1px solid #e5e9ed;
+        padding: 16px;
+        &.bindingExtension {
+          min-height: 246px;
+          .bindingExtension_content {
+            display: flex;
+            flex-wrap: wrap;
+          }
+          .noContentFlex {
+            display: flex;
+            justify-content: center;
+            align-items: center;
+            height: 136px;
+            flex-direction: column;
+            .noContent {
+              width: 128px;
+            }
+            p {
+              margin-top: 8px;
+            }
+          }
+          .ant-checkbox-wrapper {
+            font-size: 12px;
+            width: 100%;
+            display: flex;
+            margin-top: 8px;
+            justify-content: space-between;
+            align-items: center;
+            ::ng-deep .ant-checkbox {
+              font-size: 12px;
+              top: 0;
+            }
+            ::ng-deep .ant-checkbox + span {
+              flex: 1;
+            }
+          }
+        }
+
+        &.tableCon {
+          padding: 0;
+
+          .table {
+            font-size: 14px;
+
+            tr {
+              td {
+                padding: 15px 6px;
+                text-align: center;
+
+                & > .tdiv {
+                  overflow: hidden;
+
+                  .name {
+                    float: left;
+                  }
+
+                  .num {
+                    float: right;
+                    font-size: 12px;
+
+                    span {
+                      color: @primary-color;
+                      font-size: 14px;
+                    }
+                  }
+                }
+
+                .notOpen {
+                  color: #666;
+                  font-size: 12px;
+
+                  img {
+                    margin-bottom: 8px;
+                  }
+                }
+              }
+            }
+          }
+        }
+
+        .title {
+          color: #333;
+          text-align: center;
+        }
+
+        .conditions {
+          & > .ant-row {
+            margin: 8px 0;
+            display: flex;
+            align-items: center;
+
+            .ant-row {
+              .ant-col-6 {
+                margin: 2px 0;
+              }
+            }
+
+            .checkAll {
+              width: 100%;
+              border-bottom: 1px solid rgb(233, 233, 233);
+              color: @primary-color;
+            }
+          }
+        }
+
+        .btns {
+          padding: 5px 20px 0 20px;
+        }
+      }
+    }
+
+    .right {
+      // opacity: .5;
+      width: 80px;
+      float: left;
+      // background: rgba(255, 255, 255, 0.5);
+      border-radius: 5px 0 0 5px;
+      position: relative;
+      z-index: 8;
+
+      .fixedMenuWrap{
+        border-radius: 5px;
+        margin-bottom: 16px;
+        .fixedMenu{
+          border-radius: 0!important;
+        }
+      }
+
+      .fixedMenu {
+        border: 1px solid #e5e9ed;
+        color: @primary-color;
+        background: rgb(255, 255, 255);
+        text-align: center;
+        border-radius: 5px 0 0 5px;
+
+        .menuItems {
+          .call-icon{
+            font-size: 26px;
+            color: @primary-color;
+            padding: 16px 0;
+            &.transport-shimang1{
+              color: red;
+            }
+          }
+          .call-status{
+            background-color: @primary-color;
+            color: #fff;
+            width: 100%;
+          }
+          .item {
+            height: 35px;
+            line-height: 35px;
+            padding: 0 6px;
+            cursor: pointer;
+            border-bottom: 1px solid #e5e9ed;
+            user-select: none;
+            &.itemLink {
+              border-bottom: none;
+              border-radius: 0;
+            }
+
+            &.checked {
+              background: #fff;
+              color: #52ab77;
+              opacity: 1;
+              box-shadow: -3px 4px 7px #eae9e9;
+            }
+          }
+
+          .others {
+            transition: height 0.4s linear;
+            overflow: hidden;
+          }
+        }
+
+        .arrow {
+          cursor: pointer;
+        }
+      }
+    }
+  }
+
   // 左侧悬浮菜单
   .fixedLeft {
     position: fixed;

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

@@ -439,7 +439,7 @@ export class FuwutaiComponent implements OnInit {
             this.showPromptModal("建单", true, "", "closeGo");
           } else {
             if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
-              // this.jry_shixian();
+              this.jry_shixian();
             }
             this.showPromptModal("建单", true, "", "close");
           }
@@ -477,7 +477,7 @@ export class FuwutaiComponent implements OnInit {
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
-            // this.jry_shixian();
+            this.jry_shixian();
           }
           this.showPromptModal("建单", true, "", "close");
         }
@@ -539,7 +539,7 @@ export class FuwutaiComponent implements OnInit {
           this.showPromptModal("建单", true, "", "closeGo");
         } else {
           if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
-            // this.jry_shixian();
+            this.jry_shixian();
           }
           this.showPromptModal("建单", true, "", "close");
         }
@@ -713,6 +713,7 @@ export class FuwutaiComponent implements OnInit {
     this.initControlView();
     this.moveMenu("fixedMenu");
     this.moveMenu("fixedMenuLeft");
+    this.moveMenuAll("fixedMenuAll");
     if(this.incomingService.getSign() === 'box'){
       this.getPhoneNum();
     }else if(this.incomingService.getSign() === 'callCenter'){
@@ -975,6 +976,7 @@ export class FuwutaiComponent implements OnInit {
     //呼入回调函数
     TLWSA.onCallin = function (jso) {
       console.log(jso);
+      _this.incidentModel = {};
       _this.callNumber = _this.incidentModel.incomingPhone = jso.caller;//来电的电话
       _this.incidentModel.callID = jso.crs;//来电的话机id
       if (jso) {
@@ -1397,6 +1399,8 @@ export class FuwutaiComponent implements OnInit {
           } else {
             //没绑定科室
             console.log(this.newOrderShow);
+            console.log(this.incidentModel);
+            console.log(this.incidentMsg);
             if (!this.newOrderShow && !this.newOrderShowOpen) {
               this.applyDept = null;
               this.showNewOrder("no", this.incidentModel.incomingPhone, true, '来电弹屏');
@@ -1824,6 +1828,9 @@ export class FuwutaiComponent implements OnInit {
   // 获取回访列表
   visitNum:any;
   getVisitList(){
+    if(!this.itsmData.mdv2Switch){
+      return;
+    }
     let postData: any = {
       idx: 0,
       sum: 1,
@@ -1847,6 +1854,9 @@ export class FuwutaiComponent implements OnInit {
   // 获取留言列表
   messageNum:any;
   getMessageList(){
+    if(!this.itsmData.mdv2Switch){
+      return;
+    }
     let postData: any = {
       idx: 0,
       sum: 1,
@@ -2433,7 +2443,7 @@ export class FuwutaiComponent implements OnInit {
 
       let deptObj = this.applicationDepartmentList.find(v => v.id == this.applyDept);
 
-      if(this.incidentModel.department != this.applyDept && (!isInit || this.buildType !== '来电弹屏')){
+      if(this.incidentModel.department != this.applyDept && (!isInit || !this.buildType)){
         this.incidentModel.department = this.applyDept;
         this.searchApplicationDepartment('itsm', deptObj ? deptObj.dept : '', undefined, this.applyDept);
       }
@@ -3189,8 +3199,44 @@ export class FuwutaiComponent implements OnInit {
     }
     this.searchApplicationRequester();
 
-    // 回显维修人/组
-    this.showGroupOrUser();
+    // 根据院区和故障现象带出责任部门，优先级，维修人/组
+    if(this.incidentModel.category && this.incidentModel.hosId){
+      let postData = {
+        idx: 0,
+        sum: 9999,
+        incidentCategoryConfig: {
+          categoryId: this.incidentModel.category,
+          hosId: this.incidentModel.hosId,
+        },
+      };
+      console.log(postData);
+      // return;
+      this.isLoading = true;
+      this.mainService
+        .getFetchDataList("simple/data", "incidentCategoryConfig", postData)
+        .subscribe((data) => {
+          this.isLoading = false;
+          if (data.status == 200) {
+            let list = data.list || [];
+            if(list.length > 0){
+              console.log(list[0]);
+              this.incidentCategoryConfig = list[0];
+            }else{
+              this.incidentCategoryConfig = {};
+            }
+
+            // 根据院区和故障现象带出责任部门，优先级，维修人/组
+            this.incidentModel.duty = this.incidentCategoryConfig.dutyDTO;
+            this.incidentModel.priorityId = this.incidentCategoryConfig.priority;
+
+            // 回显维修人/组
+            this.showGroupOrUser();
+          }
+        });
+    }else{
+      // 回显维修人/组
+      this.showGroupOrUser();
+    }
   }
   // 申请科室列表（搜索）失去焦点的时候
   changeApplicationDepartment(phone?) {
@@ -3514,7 +3560,7 @@ export class FuwutaiComponent implements OnInit {
       this.showPromptModal("操作", true, "", "");
     }else{
       if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
-        // this.jry_shixian();
+        this.jry_shixian();
       }
       this.newOrderShow = false; //关闭弹窗
       this.newOrderShowOpen = false; //此时可出现新的弹窗
@@ -4028,7 +4074,7 @@ export class FuwutaiComponent implements OnInit {
   // 取消
   newOrderCancel(): void {
     if(this.incomingService.getSign() === 'callCenter' && this.incomingService.getPhoneNumber()){
-      // this.jry_shixian();
+      this.jry_shixian();
     }
     this.newOrderShow = false;
     this.newOrderShowOpen = false;
@@ -4357,7 +4403,7 @@ export class FuwutaiComponent implements OnInit {
     return timeStr;
   }
 
-  // 菜单拖拽
+  // 菜单拖拽-上下
   moveMenu(nodeId) {
     let fixedMenu = document.getElementById(nodeId);
     if (!fixedMenu) return;
@@ -4380,6 +4426,47 @@ export class FuwutaiComponent implements OnInit {
     };
   }
 
+  // 处理人
+  computedHandlerUser(incidentData){
+    if(incidentData.state.value == 'pending' && incidentData.currentLog){
+      return incidentData.currentLog.workerName;
+    }
+    if(incidentData.state.value != 'pending' && incidentData.handlingPersonnelUser){
+      return incidentData.handlingPersonnelUser.name;
+    }
+  }
+
+  // 菜单拖拽-自由
+  moveMenuAll(nodeId) {
+    let fixedMenu = document.getElementById(nodeId);
+    if (!fixedMenu) return;
+    fixedMenu.onmousedown = function (e) {
+      let x = e.clientX - fixedMenu.offsetLeft;
+      let y = e.clientY - fixedMenu.offsetTop;
+      document.onmousemove = function (ev) {
+        fixedMenu.classList.add('maskFull');
+        var _y = ev.clientY - y > 0 ? ev.clientY - y : 0;
+        var h = window.innerHeight;
+        if (_y > h - fixedMenu.clientHeight) {
+          _y = h - fixedMenu.clientHeight;
+        }
+        fixedMenu.style.top = _y + "px";
+
+        var _x = ev.clientX - x > 0 ? ev.clientX - x : 0;
+        var w = window.innerWidth;
+        if (_x > w - fixedMenu.clientWidth) {
+          _x = w - fixedMenu.clientWidth;
+        }
+        fixedMenu.style.right = w - _x - fixedMenu.clientWidth + "px";
+      };
+      document.onmouseup = function () {
+        fixedMenu.classList.remove('maskFull');
+        document.onmousemove = null;
+        document.onmouseup = null;
+      };
+    };
+  }
+
   @ViewChild("msgTemplate", { static: false }) msgTemplate: TemplateRef<any>; //消息通知模板
   // 消息提醒
   createBasicNotification(msgs): void {
@@ -4432,6 +4519,12 @@ export class FuwutaiComponent implements OnInit {
 
   // 运维、配送工单切换
   filterOrderList(type, state){
+    if(!this.itsmData.mdv2Switch && this.hsmsData.hsmsSwitch){
+      return;
+    }
+    if(this.itsmData.mdv2Switch && !this.hsmsData.hsmsSwitch){
+      return;
+    }
     this.flagList[`${type}Flag${state}`] = !this.flagList[`${type}Flag${state}`];
     this.getOrderList(state, state === 1);
   }