修复BUG

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

@@ -19,6 +19,7 @@ export class IncidentSerCallComponent implements OnInit {
   searchDTO: any = {};
 
   @Input() itsmData:any;
+  @Input() hsmsData:any;
   @Output() closeModelHs = new EventEmitter<any>();//1.组件暴露一个 EventEmitter 属性，当事件发生时，子组件利用该属性 emits(向上弹射)事件
 
   constructor(
@@ -77,11 +78,32 @@ export class IncidentSerCallComponent implements OnInit {
     if (idx) {
       this.pageIndex = 1;
     }
+    console.log(this.itsmData)
+    console.log(this.hsmsData)
+    let hosIds;
+    if(this.itsmData.mdv2Switch){
+      if(this.itsmData.allDuty == 1){
+        hosIds = undefined;
+      }else{
+        hosIds = this.itsmData.checkedHos.map(v => v.id).toString();
+      }
+    }
+    if(this.hsmsData.hsmsSwitch){
+      if(this.itsmData.mdv2Switch){
+        if(this.itsmData.allDuty == 1){
+          hosIds = undefined;
+        }else{
+          hosIds += ',' + this.hsmsData.checkedHos;
+        }
+      }else{
+        hosIds = this.hsmsData.checkedHos.toString();
+      }
+    }
     let postData = {
       idx: this.pageIndex - 1,
       sum: this.pageSize,
       callLog: {
-        "hosIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.checkedHos.map(v => v.id).toString() || undefined),
+        hosIds,
         dTMFA: this.searchDTO.dTMFA || undefined,
         dTMFB: this.searchDTO.dTMFB || undefined,
         responseTime: this.searchDTO.responseTime ? format(this.searchDTO.responseTime, 'yyyy-MM-dd HH:mm:ss') : undefined,

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

@@ -121,7 +121,7 @@ export class IncidentSerVisitComponent implements OnInit {
       idx: 0,
       sum: 9999,
       incident: {
-        "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.map(v => v.id).toString() || undefined),
+        // "groupIds": this.itsmData.allDuty == 1 ? undefined : (this.itsmData.scopeGroups.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",

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

@@ -49,11 +49,13 @@ export class IncidentSubstitutionAssignComponent implements OnInit {
     let { hospital, type } = this.tool.getHospitalOrDuty();
     if(type === 'duty'){
       // 是责任部门
-      this.validateForm.controls.hosId.setValue(hospital.parent.id);
       this.changeHospital(hospital.parent.id);
+      this.validateForm.controls.hosId.setValue(hospital.parent.id);
       this.validateForm.controls.dutyId.setValue(hospital.id);
+      this.changeDuty(hospital.id);
     }else{
       // 不是责任部门
+      this.changeHospital(hospital.id);
       this.validateForm.controls.hosId.setValue(hospital.id);
     }
   }

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

@@ -1030,7 +1030,7 @@
   </div>
 
   <!-- 左侧悬浮框 -->
-  <div id="fixedMenuLeft" class="fixedLeft">
+  <div id="fixedMenuLeft" class="fixedLeft" [hidden]="!itsmData.mdv2Switch && !hsmsData.hsmsSwitch">
     <div class="right">
       <div class="fixedMenu">
         <div class="menuItems">
@@ -2182,14 +2182,9 @@
                     <!-- 时间 -->
                     <div class="shijian">
                       <span class="left"></span>
-                      <span class="right" *ngIf="data.state.value === 'accept' || data.state.value === 'cancel' || data.state.value === 'reject';else notReq">
-                        {{ data.startDate | date: "MM-dd HH:mm" }}
+                      <span class="right">
+                        {{ data.acceptDate | date: "MM-dd HH:mm" }}
                       </span>
-                      <ng-template #notReq>
-                        <span class="right" *ngIf="data.state.value !== 'accept'">
-                          {{ data.acceptDate | date: "MM-dd HH:mm" }}
-                        </span>
-                      </ng-template>
                     </div>
                   </div>
                 </div>
@@ -2421,4 +2416,4 @@
 <app-incident-ser-message [itsmData]="itsmData" *ngIf="messageShow" (closeModelHs)="closeMessage($event)"></app-incident-ser-message>
 
 <!-- 通话列表 -->
-<app-incident-ser-call [itsmData]="itsmData" *ngIf="callShow" (closeModelHs)="closeCall($event)"></app-incident-ser-call>
+<app-incident-ser-call [itsmData]="itsmData" [hsmsData]="hsmsData" *ngIf="callShow" (closeModelHs)="closeCall($event)"></app-incident-ser-call>

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

@@ -1616,9 +1616,9 @@ export class FuwutaiComponent implements OnInit {
 
     let postData = {
       incident: {
+        queryTask: 'all',
         department: {
           id,
-          queryTask: 'all',
         },
       },
       idx: 0,

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

@@ -87,8 +87,8 @@ export class IncidentManagementComponent implements OnInit {
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.initTabs();
     this.getDeparts();
-    this.getUsers('', null, 'handle');
-    this.getUsers('', null, 'acceptUser');
+    this.getUsers('', 'handle');
+    this.getUsers('', 'acceptUser');
     this.getGdStates();
     this.getOverdueStates();
     this.getIncidentCategoryList();
@@ -150,12 +150,13 @@ export class IncidentManagementComponent implements OnInit {
   }
 
   // 获取处理人
-  getUsers(e?, those?, type?) {
-    let that = those || this;
+  getUsers(e?, type?) {
+    let that = this;
     let postData = {
       user: {
         name: e || "",
-        hospital: { id: that.hospital },
+        hospital: { id: that.tool.getCurrentHospital().id },
+        engineer: 1,
         simpleQuery: true,
       },
       idx: 0,