优化

src/app/share/dialog-delete/dialog-delete.component.html

@@ -4,7 +4,7 @@
     <div class="title">提示<i class="icon_transport transport-guanbi" (click)="hideDelModal('x')"></i></div>
     <div class="content">
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
-      <div class="defeat">{{content}}</div>
+      <div class="defeat" [innerHTML]="content | htmlTransform"></div>
       <div class="tips red" *ngIf="tips">（{{tips}}）</div>
     </div>
     <div class="operate">

src/app/share/dialog-delete/dialog-delete.component.less

@@ -69,6 +69,9 @@
         &.defeat {
           color: #333;
           font-size: 16px;
+          span {
+            color: red;
+          }
         }
         &.tips {
           font-size: 14px;

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

@@ -249,7 +249,7 @@
                   </div>
                   <div class="checkInfo" nz-row>
                     <span nz-col nzSpan="24">{{ item.applyDate | date:'HH:mm' }}（{{ item.orders }}）</span>
-                    <span nz-col nzSpan="24">{{ item.areaDept ? (deptDisplay == 2 ? item.areaDept.deptalias : item.areaDept.dept) : '' }}</span>
+                    <span nz-col nzSpan="24">{{ item.areaDeptDTO ? (deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : '' }}</span>
                     <span nz-col nzSpan="24">{{ item.surgeryName }}</span>
                   </div>
                   <div class="btn" (click)="pickUpPatient($event, item)">一键接患者</div>
@@ -3554,4 +3554,4 @@
 
 <!-- 是否一键接患者模态框 -->
 <app-dialog-delete [delModal]="pickUpModal" (hideDelModalEvent)="hidePickUpModal()" [btnLoading]="btnLoading"
-(confirmDelEvent)="confirmPickUp()" content="您本次需要从某某科室接某某患者到某某手术间进行手术，您确认接患者吗？"></app-dialog-delete>
+(confirmDelEvent)="confirmPickUp()" [content]="pickUpInfo"></app-dialog-delete>

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -1396,12 +1396,14 @@ export class HushijiandanComponent implements OnInit {
     }
   };
   pickUpModal: boolean = false; //模态框
+  pickUpInfo:string = '';
   pickUpItem: any = {};
   hidePickUpModal() {
     this.pickUpModal = false;
   }
   // 确认
   confirmPickUp() {
+    alert('建单，无接口')
     console.log(this.pickUpItem);
     return;
     this.showPromptModal("创建", true, "");
@@ -1442,6 +1444,7 @@ export class HushijiandanComponent implements OnInit {
     e.stopPropagation();
     this.pickUpModal = true;
     this.pickUpItem = item;
+    this.pickUpInfo = `您本次需要从<span style="color:red;">${item.areaDeptDTO ? (this.deptDisplay == 2 ? item.areaDeptDTO.deptalias : item.areaDeptDTO.dept) : ''}</span>科室接<span style="color:red;">${item.patientDTO ? item.patientDTO.patientName : ''}</span>患者到<span style="color:red;">${item.surgeryDeptDTO ? (this.deptDisplay == 2 ? item.surgeryDeptDTO.deptalias : item.surgeryDeptDTO.dept) : ''}</span>手术间进行手术，您确认接患者吗？`
   }
 
   // 患者信息一键建单

src/app/views/task-type-management/task-type-management.component.html

@@ -52,9 +52,9 @@
         </div>
         <nz-form-label class="label" nzRequired>关联类型</nz-form-label>
         <!-- 关联类型禁止修改 -->
-        <nz-select class="mb8 w100" nzShowSearch nzPlaceHolder="请选择关联类型" [(ngModel)]="association" [compareWith]="compareFn"
-          (ngModelChange)="asso(association)" [nzDisabled]="!add">
-          <nz-option [nzLabel]="data.name" [nzValue]="data" *ngFor="let data of allAssociation"></nz-option>
+        <nz-select class="mb8 w100" nzShowSearch nzPlaceHolder="请选择关联类型" [ngModel]="association.id"
+          (ngModelChange)="asso($event)" [nzDisabled]="!add">
+          <nz-option nzLabel="{{data.name}}" nzValue="{{data.id}}" *ngFor="let data of allAssociation"></nz-option>
         </nz-select>
         <ng-container *ngIf="association.value == 'ordinary'">
           <nz-form-label class="label" nzRequired>关联业务</nz-form-label>

src/app/views/task-type-management/task-type-management.component.ts

@@ -82,7 +82,10 @@ export class TaskTypeManagementComponent implements OnInit {
   allScheduleClass; //班次列表
   //基础信息详情字段
   taskName; //任务名称
-  association: any = {}; //关联类型
+  association: any = {
+    id: "",
+    value: "",
+  }; //关联类型
   relatedBusiness: any = {
     id: "",
     value: "",
@@ -564,12 +567,13 @@ export class TaskTypeManagementComponent implements OnInit {
     this.createRuleConfiguration[index] = data;
   }
   //类型选择
-  asso(data): void {
+  asso(id): void {
+    this.association = this.allAssociation.find(v=>v.id == id);
     this.relatedBusiness = {
       id:'',
       value:''
     }
-    if (data.id == 260) {
+    if (id == 260) {
       this.carryingCourses = [
         {
           nodeId: { id: 261 },
@@ -603,7 +607,6 @@ export class TaskTypeManagementComponent implements OnInit {
       this.getSearchTaskList();
     }
   }
-  compareFn = (o1: any, o2: any) => (o1 && o2 ? o1.id === o2.id : o1 === o2);
   //选择类型
   currentChoice;
   itemChoice(data, index) {
@@ -620,7 +623,8 @@ export class TaskTypeManagementComponent implements OnInit {
     };
     this.taskData.taskType["id"] = data.id;
     this.taskName = data.taskName;
-    this.association = data.associationType;
+    this.association.id = data.associationType.id + "";
+    this.association.value = data.associationType.value;
     this.getType();
     this.departments = [];
     this.mapOfCheckedId = {};
@@ -1205,7 +1209,7 @@ export class TaskTypeManagementComponent implements OnInit {
     this.departmentIds = "";
     this.departmentTypeIds = "";
     this.taskName = ""; //任务名称
-    this.association = {}; //关联类型
+    this.association.id = null; //关联类型
     this.getAllGoods(); //获取携带设备
     this.getAllScheduleClass(); //获取班次列表
     this.allowUrgent = "1"; //是否加急