父级部门

proxy.conf.json

@@ -1,6 +1,6 @@
 {
   "/service": {
-		"target": "http://192.168.3.108",
+		"target": "http://192.168.4.105",
     "logLevel": "debug",
     "changeOrigin": true,
     "pathRewrite": {

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

@@ -17,10 +17,11 @@
       >
         <thead>
           <tr class="thead">
-            <th nzWidth="20%">院区/部门名称</th>
-            <th nzWidth="20%">部门类型</th>
-            <th nzWidth="20%">父院区</th>
-            <th nzWidth="20%">院区编码</th>
+            <th nzWidth="16%">院区/部门名称</th>
+            <th nzWidth="16%">部门类型</th>
+            <th nzWidth="16%">父院区</th>
+            <th nzWidth="16%">父级部门</th>
+            <th nzWidth="16%">院区编码</th>
             <th nzWidth="20%">操作</th>
           </tr>
         </thead>
@@ -29,18 +30,13 @@
             <td>{{ data.hosName || '无' }}</td>
             <td>{{ data.type ? data.type.name : '无' }}</td>
             <td>{{ data.parent ? data.parent.hosName : '无' }}</td>
+            <td>{{ data.parentDeptDTO ? data.parentDeptDTO.hosName : '无' }}</td>
             <td>{{ data.hosNo || '无' }}</td>
             <td>
               <div class="coop">
-                <span
-                  *ngIf="currentUserAccount == 'dsadmin'"
-                  (click)="copy(data)"
-                  >复制</span
-                >
+                <span *ngIf="currentUserAccount == 'dsadmin'" (click)="copy(data)">复制</span>
                 <span *ngIf="coopBtns.edit" (click)="edit(data)">编辑</span>
-                <span *ngIf="coopBtns.del" (click)="showDelModal(data.id)"
-                  >删除</span
-                >
+                <span *ngIf="coopBtns.del" (click)="showDelModal(data.id)">删除</span>
               </div>
             </td>
           </tr>
@@ -61,16 +57,9 @@
   </div>
 
   <!-- 新增/编辑模态框 -->
-  <div
-    class="save align-items_center display_flex justify-content_flex-center add"
-    *ngIf="modal"
-  >
+  <div class="save align-items_center display_flex justify-content_flex-center add" *ngIf="modal">
     <div class="modalBody">
-      <div class="title">
-        {{ add ? "新增" : "编辑" }}<i
-          class="icon_transport transport-guanbi"
-          (click)="hideAddModal()"
-        ></i>
+      <div class="title">{{ add ? "新增" : "编辑" }}<i class="icon_transport transport-guanbi" (click)="hideAddModal()"></i>
       </div>
       <div class="content">
         <form
@@ -80,14 +69,9 @@
           (ngSubmit)="submitForm()"
         >
           <nz-form-item>
-            <nz-form-label
-              [nzSm]="6"
-              [nzXs]="24"
-              nzFor="parentHospital"
-              >父院区</nz-form-label
-            >
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="parentHospital">父院区</nz-form-label>
             <nz-form-control nzErrorTip="请选择父院区!">
-              <nz-select formControlName="parentHospital" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父院区" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event)"
+              <nz-select formControlName="parentHospital" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父院区" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event, 'parent')"
               (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>
@@ -100,6 +84,21 @@
             </nz-form-control>
           </nz-form-item>
           <nz-form-item>
+            <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="parentDeptId">父级部门</nz-form-label>
+            <nz-form-control nzErrorTip="请选择父级部门!">
+              <nz-select formControlName="parentDeptId" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择父级部门" nzShowSearch nzAllowClear nzServerSearch (nzOnSearch)="changeInp($event, 'parentDept')"
+              (nzOpenChange)="openParentDeptSelect($event)">
+                <ng-container *ngFor="let option of parentDepts">
+                  <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.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
               [nzSm]="6"
               [nzXs]="24"

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

@@ -26,13 +26,23 @@ export class HospitalManagementComponent implements OnInit {
   ) {}
 
   ngOnInit() {
-    this.searchParentHospitalSubject.pipe(debounceTime(500)).subscribe((v: any) => {
-      this.getAllParentHospital(v).subscribe((result) => {
-        this.isLoading = false;
-        if (result.status == 200) {
-          this.parentHospitals = result.list;
-        }
-      });
+    this.searchParentHospitalSubject.pipe(debounceTime(500)).subscribe(({e, type}) => {
+      if(type === 'parentDept'){
+        this.getAllParentHospital(e, type === 'parentDept').subscribe((result) => {
+          this.isLoading = false;
+          if (result.status == 200) {
+            this.parentDepts = result.list;
+          }
+        });
+      }else if(type === 'parent'){
+        this.getAllParentHospital(e, type === 'parentDept').subscribe((result) => {
+          this.isLoading = false;
+          if (result.status == 200) {
+            this.parentHospitals = result.list;
+          }
+        });
+      }
+
     });
     this.coopBtns = this.tool.initCoopBtns(this.route);
     this.getList();
@@ -63,11 +73,12 @@ export class HospitalManagementComponent implements OnInit {
   coopBtns: any = {};
   //所有院区
   parentHospitals: any = [];
+  parentDepts: any = [];
   searchParentHospitalSubject = new Subject();
   //搜索父级院区
-  changeInp(e) {
+  changeInp(e, type) {
     this.isLoading = true;
-    this.searchParentHospitalSubject.next(e);
+    this.searchParentHospitalSubject.next({e, type});
   }
   // 打开父级科室下拉框
   isLoading = false;
@@ -82,6 +93,18 @@ export class HospitalManagementComponent implements OnInit {
       });
     }
   }
+  // 打开父级部门下拉框
+  openParentDeptSelect(flag) {
+    if (flag) {
+      this.isLoading = true;
+      this.getAllParentHospital('', true).subscribe((result) => {
+        this.isLoading = false;
+        if (result.status == 200) {
+          this.parentDepts = result.list;
+        }
+      });
+    }
+  }
   // 选择父级科室下拉框
   changeHospitalSelect(e) {
     if(!e){
@@ -102,19 +125,39 @@ export class HospitalManagementComponent implements OnInit {
     }
   }
   //获取所有的父级院区列表
-  getAllParentHospital(keyWord = "") {
-    let postData: any = {
-      idx: 0,
-      sum: 10,
-      hospital: {
-        keyWord: keyWord,
-      },
-    };
-    if (this.coopId) {
-      // 过滤这个院区及其子院区
-      postData.hospital.filterByHosId = this.coopId;
+  getAllParentHospital(keyWord = "", isParentDept = false) {
+    if(isParentDept){
+      this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {
+        this.hospitalTypes = result || [];
+      });
+
+      let postData: any = {
+        idx: 0,
+        sum: 10,
+        hospital: {
+          keyWord: keyWord,
+          type: isParentDept ? this.hospitalTypes.find(v => v.value == 6) : undefined
+        },
+      };
+      if (this.coopId) {
+        // 过滤这个院区及其子院区
+        postData.hospital.filterByHosId = this.coopId;
+      }
+      return this.mainService.getFetchDataList("data", "hospital", postData);
+    }else{
+      let postData: any = {
+        idx: 0,
+        sum: 10,
+        hospital: {
+          keyWord: keyWord,
+        },
+      };
+      if (this.coopId) {
+        // 过滤这个院区及其子院区
+        postData.hospital.filterByHosId = this.coopId;
+      }
+      return this.mainService.getFetchDataList("data", "hospital", postData);
     }
-    return this.mainService.getFetchDataList("data", "hospital", postData);
   }
 
   // 表格数据
@@ -204,6 +247,7 @@ export class HospitalManagementComponent implements OnInit {
     this.validateForm = this.fb.group({
       hospitalType: [null],
       parentHospital: [null],
+      parentDeptId: [null],
       hospitalName: [null, [Validators.required]],
       hospitalNum: [null, [Validators.required]],
     });
@@ -227,6 +271,9 @@ export class HospitalManagementComponent implements OnInit {
     if (this.validateForm.value.parentHospital) {
       data.hospital.parent = { id: this.validateForm.value.parentHospital };
     }
+    if (this.validateForm.value.parentDeptId) {
+      data.hospital.parentDeptId =  this.validateForm.value.parentDeptId;
+    }
     if (this.validateForm.value.hospitalType) {
       data.hospital.type = { id: this.validateForm.value.hospitalType };
     }
@@ -253,12 +300,12 @@ export class HospitalManagementComponent implements OnInit {
     this.modal = true;
     this.coopId = data.id;
     if (data.parent) {
-      this.getAllParentHospital(data.parent.dept).subscribe((res) => {
-        if (res.status == 200) {
-          this.parentHospitals = res.list;
-          this.validateForm.controls.parentHospital.setValue(data.parent.id);
-        }
-      });
+      this.parentHospitals = [data.parent];
+      this.validateForm.controls.parentHospital.setValue(data.parent.id);
+    }
+    if (data.parentDeptId && data.parentDeptDTO) {
+      this.parentDepts = [data.parentDeptDTO];
+      this.validateForm.controls.parentDeptId.setValue(data.parentDeptId);
     }
     if(data.type){
       this.mainService.getDictionary("list", "hospital_type").subscribe((result) => {