Merge branch 'master' into develop

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

@@ -1,6 +1,6 @@
 <div class="modal display_flex justify-content_flex-center align-items_center" *ngIf="incidentData">
   <div class="modalBody">
-    <div class="title">详细处理<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
+    <div class="title">{{itsmSimpleHandle.value == 1 ? '简单处理' : '详细处理'}}<i class="icon_transport transport-guanbi" (click)="hideModal()"></i></div>
     <div class="content">
       <overlay-scrollbars #osComponentRef1 class="detail">
         <app-incident-handle-repair [incidentData]="incidentData"></app-incident-handle-repair>

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

@@ -127,8 +127,10 @@ export class OrderScopeComponent implements OnInit {
     hosTaskTypes = {}; //当前权限下所有院区对应的任务类型
     hosGroups = {}; //当前权限下所有院区对应的人员分组
     getOrderScope() {
-      this.hosList = this.user.infoPermission.hospitals.filter(v => !this.tool.isDuty(v));
-      this.taskTypes = this.user.infoPermission.taskTypes;
+      let hospitals = this.user.infoPermission.hospitals || []
+      this.hosList = hospitals.filter(v => !this.tool.isDuty(v));
+      this.taskTypes = this.user.infoPermission.taskTypes || [];
+      let userGroups = this.user.infoPermission.groups || [];
       this.userGroups = this.user.infoPermission.groups.filter(v => v.type !== 3);
       this.hosList.forEach((e) => {
         let arrT = [],

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

@@ -1966,6 +1966,7 @@ export class FuwutaiComponent implements OnInit {
           "queryTask": "doing",
           "assignee": this.tool.getCurrentUserId(),
           "deleteFlag": 0,
+          "platform": 3,
         }
       }
     }