Merge branch 'master' of http://git.dashitech.com/seimin/zy-pc

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

@@ -8,7 +8,7 @@
             节假日班次：
             <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.holidayClassId"
               nzPlaceHolder="请选择节假日班次" nzServerSearch>
-              <ng-container *ngFor="let data of classList1">
+              <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>
@@ -20,7 +20,7 @@
             工作日班次：
             <nz-select class="select" [nzDropdownMatchSelectWidth]="false" nzAllowClear [(ngModel)]="dataInfo.workdayClassId"
               nzPlaceHolder="请选择工作日班次" nzServerSearch>
-              <ng-container *ngFor="let data of classList2">
+              <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>

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

@@ -62,6 +62,7 @@ export class ConfigurationCallcenterComponent implements OnInit {
       sum: 9999,
       scheduleClass: {
         hospital: { id: this.currentHospital.id },
+        bindCall: 1,
         type,
       },
     };

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

@@ -175,6 +175,7 @@ export class ConfigurationDictionaryComponent implements OnInit {
           }
         }
       })
+      console.log(this.validateDictionaryForm.controls)
     })
   }
 
@@ -228,12 +229,13 @@ export class ConfigurationDictionaryComponent implements OnInit {
 
     //增加
     postData = [];
+    let rawValueObj = this.validateDictionaryForm.getRawValue();
     for (let i = 0; i < this.dictionaryList.length; i++) {
       postData.push({
         id: uuidValidate(this.dictionaryList[i].id) ? undefined : this.dictionaryList[i].id,
-        name: this.validateDictionaryForm.value['name_' + this.dictionaryList[i].id],
-        value: this.validateDictionaryForm.value['value_' + this.dictionaryList[i].id],
-        orders: this.validateDictionaryForm.value['orders_' + this.dictionaryList[i].id],
+        name: rawValueObj['name_' + this.dictionaryList[i].id],
+        value: rawValueObj['value_' + this.dictionaryList[i].id],
+        orders: rawValueObj['orders_' + this.dictionaryList[i].id],
         system: uuidValidate(this.dictionaryList[i].id) ? false : this.dictionaryList[i].system,
         key: this.activeDictionaryKey.key,
       })

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

@@ -96,7 +96,7 @@
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择节假日班次!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="holidayClassId"
               nzPlaceHolder="请选择节假日班次" nzServerSearch>
-              <ng-container *ngFor="let data of classList1">
+              <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>
@@ -110,7 +110,7 @@
           <nz-form-control [nzSpan]="18" nzErrorTip="请选择工作日班次!">
             <nz-select [nzDropdownMatchSelectWidth]="false" nzAllowClear formControlName="workdayClassId"
               nzPlaceHolder="请选择工作日班次" nzServerSearch>
-              <ng-container *ngFor="let data of classList2">
+              <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>
@@ -126,4 +126,4 @@
       <button class="btn cancel" nz-button nzType="default" (click)="hidePriorityModal()">取消</button>
     </div>
   </div>
-</div>
+</div>

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

@@ -178,6 +178,7 @@ export class ConfigurationPriorityComponent implements OnInit {
       sum: 9999,
       scheduleClass: {
         hospital: { id: this.currentHospital.id },
+        bindPriority: 1,
         type,
       },
     };

src/app/views/classes-management/classes-management.component.html

@@ -12,17 +12,21 @@
         [nzLoading]="loading1">
         <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>
           <tr *ngFor="let data of listOfData">
             <td>{{ data.name }}</td>
             <td>{{ (data.describe?data.describe:'-') }}</td>
+            <td>{{ data.bindCall == 1 ? '是' : '否' }}</td>
+            <td>{{ data.bindPriority == 1 ? '是' : '否' }}</td>
             <td>
               <div *ngIf="data.scheduleClassTimes">
                 <div *ngFor="let time of data.scheduleClassTimes">
@@ -77,6 +81,24 @@
           </nz-form-control>
         </nz-form-item>
         <nz-form-item>
+          <nz-form-label [nzSpan]="9" nzRequired nzFor="bindCall">呼叫中心班次</nz-form-label>
+          <nz-form-control [nzSpan]="15" nzErrorTip="请选择呼叫中心班次!">
+            <nz-radio-group formControlName="bindCall">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
+          <nz-form-label [nzSpan]="9" nzRequired nzFor="bindPriority">优先级班次</nz-form-label>
+          <nz-form-control [nzSpan]="15" nzErrorTip="请选择优先级班次!">
+            <nz-radio-group formControlName="bindPriority">
+              <label nz-radio [nzValue]="1">是</label>
+              <label nz-radio [nzValue]="0">否</label>
+            </nz-radio-group>
+          </nz-form-control>
+        </nz-form-item>
+        <nz-form-item>
           <nz-form-label [nzSm]="24" [nzXs]="24" nzRequired nzFor="datesType">适用日期类型</nz-form-label>
           <nz-form-control nzErrorTip="请选择适用日期类型!">
             <nz-checkbox-group formControlName="datesType" [(ngModel)]="oneOption"

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

@@ -101,6 +101,8 @@ export class ClassesManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       classesName: [null, [Validators.required]],
       description: [null, [Validators.required]],
+      bindCall: [0, [Validators.required]],
+      bindPriority: [0, [Validators.required]],
       datesType: [null, [this.dateValidator]],
       // 时间段1
       timerF1: [null, [Validators.required]],
@@ -189,6 +191,8 @@ export class ClassesManagementComponent implements OnInit {
       {
         name: that.validateForm.value.classesName,
         describe: that.validateForm.value.description,
+        bindCall: that.validateForm.value.bindCall,
+        bindPriority: that.validateForm.value.bindPriority,
         scheduleClassTimes: times,
         type: that.validateForm.value.datesType,
         hospital: { id: this.hospital },
@@ -258,6 +262,8 @@ export class ClassesManagementComponent implements OnInit {
     this.coopId = data.id;
     this.validateForm.controls.classesName.setValue(data.name);
     this.validateForm.controls.description.setValue(data.describe);
+    this.validateForm.controls.bindCall.setValue(data.bindCall);
+    this.validateForm.controls.bindPriority.setValue(data.bindPriority);
     if (data.type == 1) {
       this.oneOption[0]['checked'] = true;
     } else if (data.type == 2) {