Browse Source

院区增加父院区

seimin 1 year ago
parent
commit
409ab4afa1

+ 3 - 2
src/app/views/hospital-management/hospital-management.component.html

@@ -18,13 +18,15 @@
18
         <thead>
18
         <thead>
19
           <tr class="thead">
19
           <tr class="thead">
20
             <th nzWidth="20%">院区名称</th>
20
             <th nzWidth="20%">院区名称</th>
21
-            <th nzWidth="60%">院区编码</th>
21
+            <th nzWidth="30%">父院区</th>
22
+            <th nzWidth="30%">院区编码</th>
22
             <th nzWidth="20%">操作</th>
23
             <th nzWidth="20%">操作</th>
23
           </tr>
24
           </tr>
24
         </thead>
25
         </thead>
25
         <tbody>
26
         <tbody>
26
           <tr *ngFor="let data of listOfData">
27
           <tr *ngFor="let data of listOfData">
27
             <td>{{ data.hosName }}</td>
28
             <td>{{ data.hosName }}</td>
29
+            <td>{{ data.parent ? data.parent.hosName : '无' }}</td>
28
             <td>{{ data.hosNo }}</td>
30
             <td>{{ data.hosNo }}</td>
29
             <td>
31
             <td>
30
               <div class="coop">
32
               <div class="coop">
@@ -79,7 +81,6 @@
79
             <nz-form-label
81
             <nz-form-label
80
               [nzSm]="6"
82
               [nzSm]="6"
81
               [nzXs]="24"
83
               [nzXs]="24"
82
-              nzRequired
83
               nzFor="parentHospital"
84
               nzFor="parentHospital"
84
               >父级院区</nz-form-label
85
               >父级院区</nz-form-label
85
             >
86
             >

+ 2 - 2
src/app/views/hospital-management/hospital-management.component.less

@@ -101,7 +101,7 @@
101
             margin-bottom: 15px;
101
             margin-bottom: 15px;
102
 
102
 
103
             .ant-form-item-label {
103
             .ant-form-item-label {
104
-              line-height: 0;
104
+              line-height: normal;
105
               text-align: left;
105
               text-align: left;
106
             }
106
             }
107
           }
107
           }
@@ -112,7 +112,7 @@
112
             margin-bottom: 15px;
112
             margin-bottom: 15px;
113
 
113
 
114
             .ant-form-item-label {
114
             .ant-form-item-label {
115
-              line-height: 0;
115
+              line-height: normal;
116
               text-align: left;
116
               text-align: left;
117
             }
117
             }
118
           }
118
           }

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

@@ -93,7 +93,7 @@ export class HospitalManagementComponent implements OnInit {
93
     };
93
     };
94
     if (this.coopId) {
94
     if (this.coopId) {
95
       // 过滤这个院区及其子院区
95
       // 过滤这个院区及其子院区
96
-      postData.hospital.filterByDeptId = this.coopId;
96
+      postData.hospital.filterByHosId = this.coopId;
97
     }
97
     }
98
     return this.mainService.getFetchDataList("data", "hospital", postData);
98
     return this.mainService.getFetchDataList("data", "hospital", postData);
99
   }
99
   }
@@ -118,7 +118,7 @@ export class HospitalManagementComponent implements OnInit {
118
   addModal() {
118
   addModal() {
119
     this.add = true;
119
     this.add = true;
120
     this.modal = true;
120
     this.modal = true;
121
-    this.validateForm.controls.parentHospital.setValue("");
121
+    this.validateForm.controls.parentHospital.setValue(null);
122
     this.validateForm.controls.hospitalName.setValue("");
122
     this.validateForm.controls.hospitalName.setValue("");
123
     this.validateForm.controls.hospitalNum.setValue("");
123
     this.validateForm.controls.hospitalNum.setValue("");
124
   }
124
   }