优化级

src/app/components/configurationCenter/configuration-priority/configuration-priority.component.html

@@ -12,11 +12,13 @@
             [nzLoading]="loading1" [nzScroll]="{ y: tablePriorityHeight + 'px' }">
             <thead>
               <tr class="thead">
-                <th nzWidth="20%">优先级名称</th>
-                <th nzWidth="20%">排序</th>
-                <th nzWidth="20%">响应时间（分钟）</th>
-                <th nzWidth="20%">解决时间（分钟）</th>
-                <th nzWidth="20%">操作</th>
+                <th nzWidth="14%">优先级名称</th>
+                <th nzWidth="14%">排序</th>
+                <th nzWidth="14%">响应时间（分钟）</th>
+                <th nzWidth="14%">解决时间（分钟）</th>
+                <th nzWidth="14%">节假日班次</th>
+                <th nzWidth="14%">工作日班次</th>
+                <th nzWidth="16%">操作</th>
               </tr>
             </thead>
             <tbody>
@@ -25,6 +27,8 @@
                 <td>{{data.orders}}</td>
                 <td>{{data.responseTime}}</td>
                 <td>{{data.handleTime}}</td>
+                <td>{{data.holidayClassDTO?.name}}</td>
+                <td>{{data.workdayClassDTO?.name}}</td>
                 <td>
                   <div class="coop">
                     <span (click)="showDelModal(data,'您确认要删除吗？','删除','delPriority')">删除</span>
@@ -87,6 +91,34 @@
             </nz-input-group>
           </nz-form-control>
         </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="holidayClassId">&nbsp;&nbsp;节假日班次</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择节假日班次!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="holidayClassId"
+              nzPlaceHolder="请选择节假日班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList1">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="6" nzFor="workdayClassId">&nbsp;&nbsp;工作日班次</nz-form-label>
+          <nz-form-control [nzSpan]="18" nzErrorTip="请选择工作日班次!">
+            <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="workdayClassId"
+              nzPlaceHolder="请选择工作日班次" nzServerSearch>
+              <ng-container *ngFor="let data of classList2">
+                <nz-option *ngIf="!isLoading" [nzLabel]="data.name" [nzValue]="data.id"></nz-option>
+              </ng-container>
+              <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
+                <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
+              </nz-option>
+            </nz-select>
+          </nz-form-control>
+        </nz-form-item>
       </form>
     </div>
     <div class=" display_flex justify-content_flex-center">

src/app/components/configurationCenter/configuration-priority/configuration-priority.component.ts

@@ -22,16 +22,20 @@ export class ConfigurationPriorityComponent implements OnInit {
   ) {}
 
   coopData: any = {}; //当前操作列
+  currentHospital; //当前院区
 
   formatterMinute = (value: number) => `${value} 分钟`;
   parserMinute = (value: string) => value.replace(' 分钟', '');
 
   ngOnInit() {
+    this.currentHospital = this.tool.getCurrentHospital();
     // 优先级
     setTimeout(() => {
       this.tablePriorityHeight = document.querySelector('#priorityTable').clientHeight - document.querySelector('#priorityTable .list-template__top').clientHeight - 8 - document.querySelector('#priorityTable .thead').clientHeight;
     }, 0)
     this.getPriorityList();
+    this.getClassList(1);
+    this.getClassList(2);
   }
 
   // 新增优先级弹框
@@ -61,6 +65,8 @@ export class ConfigurationPriorityComponent implements OnInit {
     this.validatePriorityForm.controls.orders.setValue(data.orders);
     this.validatePriorityForm.controls.responseTime.setValue(data.responseTime);
     this.validatePriorityForm.controls.handleTime.setValue(data.handleTime);
+    this.validatePriorityForm.controls.holidayClassId.setValue(data.holidayClassId);
+    this.validatePriorityForm.controls.workdayClassId.setValue(data.workdayClassId);
   }
 
   // 新增/编辑表单提交
@@ -85,6 +91,8 @@ export class ConfigurationPriorityComponent implements OnInit {
           orders: this.validatePriorityForm.value.orders,
           responseTime: this.validatePriorityForm.value.responseTime,
           handleTime: this.validatePriorityForm.value.handleTime,
+          holidayClassId: this.validatePriorityForm.value.holidayClassId,
+          workdayClassId: this.validatePriorityForm.value.workdayClassId,
         // }
       };
     } else {
@@ -97,6 +105,8 @@ export class ConfigurationPriorityComponent implements OnInit {
             orders: this.validatePriorityForm.value.orders,
             responseTime: this.validatePriorityForm.value.responseTime,
             handleTime: this.validatePriorityForm.value.handleTime,
+            holidayClassId: this.validatePriorityForm.value.holidayClassId,
+            workdayClassId: this.validatePriorityForm.value.workdayClassId,
           }
         // }
       };
@@ -128,6 +138,8 @@ export class ConfigurationPriorityComponent implements OnInit {
       orders: [null, [Validators.required]],//排序号
       responseTime: [0, [Validators.required]],//响应时间
       handleTime: [0, [Validators.required]],//解决时间
+      holidayClassId: [null],//节假日班次
+      workdayClassId: [null],//工作日班次
     });
     console.log(this.validatePriorityForm.controls)
   }
@@ -155,6 +167,28 @@ export class ConfigurationPriorityComponent implements OnInit {
       });
   }
 
+  // 获取班次
+  isLoading:boolean = false;
+  classList1: any = [];
+  classList2: any = [];
+  // type: 1工作日，2节假日
+  getClassList(type:number) {
+    let postData = {
+      idx: 0,
+      sum: 9999,
+      scheduleClass: {
+        hospital: { id: this.currentHospital.id },
+        type,
+      },
+    };
+    this.mainService
+      .getFetchDataList("simple/data", "scheduleClass", postData)
+      .subscribe((data) => {
+        this.isLoading = false;
+        this['classList' + type] = data.list || [];
+      });
+  }
+
   delModal: boolean = false; //删除模态框
   tipsMsg1: string; //提示框信息
   tipsMsg2: string; //操作后信息