院区部门修改

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

@@ -6,10 +6,10 @@
       <div class="icon"><i class="icon_transport transport-wenhao"></i></div>
       <div class="defeat" [innerHTML]="content | htmlTransform"></div>
       <div class="tips red" *ngIf="tips">（{{tips}}）</div>
-      <div [hidden]="!isChecked">
+      <div *ngIf="isChecked">
         <label nz-checkbox [(ngModel)]="isRemandClean" [ngModelOptions]="{ standalone: true }">是否同步建立手术清洁任务工单</label>
       </div>
-      <div [hidden]="!isSelected" class="mt8 mb8 w100">
+      <div *ngIf="isSelected" class="mt8 mb8 w100">
         <nz-select class="w100" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzPlaceHolder="请选择苏醒室" [(ngModel)]="recoveryRoom">
           <ng-container *ngFor="let option of isSelectedArr">
             <nz-option *ngIf="!isLoading" [nzLabel]="deptDisplay == 2 ? option.deptalias : option.dept" [nzValue]="option.id"></nz-option>

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

@@ -29,6 +29,11 @@ export class DialogDeleteComponent implements OnInit, OnChanges {
   ngOnInit() {}
 
   ngOnChanges(changes: SimpleChanges){
+    if(changes.delModal && changes.delModal.currentValue){
+      this.isRemandClean = true;
+      this.isLoading = false;
+      this.recoveryRoom = null;
+    }
     if(changes.isSelected && changes.isSelectedArr){
       if(changes.isSelectedArr.currentValue.length === 1){
         this.recoveryRoom = changes.isSelectedArr.currentValue[0].id;

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

@@ -17,17 +17,19 @@
       >
         <thead>
           <tr class="thead">
-            <th nzWidth="20%">院区名称</th>
-            <th nzWidth="30%">父院区</th>
-            <th nzWidth="30%">院区编码</th>
+            <th nzWidth="20%">院区/部门名称</th>
+            <th nzWidth="20%">部门类型</th>
+            <th nzWidth="20%">父院区</th>
+            <th nzWidth="20%">院区编码</th>
             <th nzWidth="20%">操作</th>
           </tr>
         </thead>
         <tbody>
           <tr *ngFor="let data of listOfData">
-            <td>{{ data.hosName }}</td>
+            <td>{{ data.hosName || '无' }}</td>
+            <td>{{ data.type ? data.type.name : '无' }}</td>
             <td>{{ data.parent ? data.parent.hosName : '无' }}</td>
-            <td>{{ data.hosNo }}</td>
+            <td>{{ data.hosNo || '无' }}</td>
             <td>
               <div class="coop">
                 <span
@@ -65,7 +67,7 @@
   >
     <div class="modalBody">
       <div class="title">
-        {{ add ? "新增" : "编辑" }}院区信息<i
+        {{ add ? "新增" : "编辑" }}<i
           class="icon_transport transport-guanbi"
           (click)="hideAddModal()"
         ></i>
@@ -82,11 +84,11 @@
               [nzSm]="6"
               [nzXs]="24"
               nzFor="parentHospital"
-              >父级院区</nz-form-label
+              >父院区</nz-form-label
             >
-            <nz-form-control nzErrorTip="请选择父级院区!">
-              <nz-select formControlName="parentHospital" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父级院区" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event)"
-              (nzOpenChange)="openHospitalSelect($event)">
+            <nz-form-control nzErrorTip="请选择父院区!">
+              <nz-select formControlName="parentHospital" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父院区" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event)"
+              (nzOpenChange)="openHospitalSelect($event)" (ngModelChange)="changeHospitalSelect($event)">
                 <ng-container *ngFor="let option of parentHospitals">
                   <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
                 </ng-container>
@@ -103,7 +105,7 @@
               [nzXs]="24"
               nzRequired
               nzFor="hospitalName"
-              >院区名称</nz-form-label
+              >{{validateForm.value.parentHospital ? '部门' : '院区'}}名称</nz-form-label
             >
             <nz-form-control nzErrorTip="请输入院区名称!">
               <nz-input-group>
@@ -116,6 +118,20 @@
               </nz-input-group>
             </nz-form-control>
           </nz-form-item>
+          <nz-form-item [hidden]="!validateForm.value.parentHospital">
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="hospitalType" [nzRequired]="validateForm.value.parentHospital">部门类型</nz-form-label>
+            <nz-form-control nzErrorTip="请选择部门类型!">
+              <nz-select formControlName="hospitalType" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择部门类型" nzShowSearch nzAllowClear (nzOpenChange)="openHospitalTypeSelect($event)">
+                <ng-container *ngFor="let option of hospitalTypes">
+                  <nz-option *ngIf="!isHospitalTypeLoading" [nzLabel]="option.name" [nzValue]="option.id"></nz-option>
+                </ng-container>
+                <nz-option *ngIf="isHospitalTypeLoading" 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 [nzSm]="6" [nzXs]="24" nzRequired nzFor="hospitalNum"
               >院区编码</nz-form-label

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

@@ -82,6 +82,25 @@ export class HospitalManagementComponent implements OnInit {
       });
     }
   }
+  // 选择父级科室下拉框
+  changeHospitalSelect(e) {
+    if(!e){
+      this.validateForm.controls.hospitalType.setValue(null);
+    }
+    this.requiredChange(Boolean(e), 'hospitalType');
+  }
+  // 打开部门类型下拉框
+  isHospitalTypeLoading = false;
+  hospitalTypes: any = [];
+  openHospitalTypeSelect(flag) {
+    if (flag) {
+      this.isHospitalTypeLoading = true;
+      this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {
+        this.isHospitalTypeLoading = false;
+        this.hospitalTypes = result;
+      });
+    }
+  }
   //获取所有的父级院区列表
   getAllParentHospital(keyWord = "") {
     let postData: any = {
@@ -115,6 +134,19 @@ export class HospitalManagementComponent implements OnInit {
       });
   }
 
+  // 修改验证规则-是否必选
+  requiredChange(required: boolean, field: string): void {
+    if (!required) {
+      this.validateForm.get(field)!.clearValidators();
+      this.validateForm.get(field)!.markAsPristine();
+    } else {
+      this.validateForm.get(field)!.setValidators(Validators.required);
+      this.validateForm.get(field)!.markAsDirty();
+    }
+    this.validateForm.get(field)!.updateValueAndValidity();
+  }
+
+
   addModal() {
     this.add = true;
     this.modal = true;
@@ -170,6 +202,7 @@ export class HospitalManagementComponent implements OnInit {
   // 初始化新增form表单
   initForm() {
     this.validateForm = this.fb.group({
+      hospitalType: [null],
       parentHospital: [null],
       hospitalName: [null, [Validators.required]],
       hospitalNum: [null, [Validators.required]],
@@ -194,6 +227,9 @@ export class HospitalManagementComponent implements OnInit {
     if (this.validateForm.value.parentHospital) {
       data.hospital.parent = { id: this.validateForm.value.parentHospital };
     }
+    if (this.validateForm.value.hospitalType) {
+      data.hospital.type = { id: this.validateForm.value.hospitalType };
+    }
     if (!that.add) {
       data.hospital["id"] = that.coopId;
     }
@@ -224,6 +260,12 @@ export class HospitalManagementComponent implements OnInit {
         }
       });
     }
+    if(data.type){
+      this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {
+        this.hospitalTypes = result;
+        this.validateForm.controls.hospitalType.setValue(data.type.id);
+      });
+    }
     this.validateForm.controls.hospitalName.setValue(data.hosName);
     this.validateForm.controls.hospitalNum.setValue(data.hosNo);
   }