Przeglądaj źródła

科室管理和临床用户修改

seimin 2 lat temu
rodzic
commit
792622b395

+ 1 - 0
src/app/views/clinical-users-management/clinical-users-management.component.ts

@@ -89,6 +89,7 @@ export class ClinicalUsersManagementComponent implements OnInit {
89
   // 重置
89
   // 重置
90
   reset() {
90
   reset() {
91
     this.pageIndex = 1;
91
     this.pageIndex = 1;
92
+    this.hosId = this.tool.getCurrentHospital().id;
92
     this.name = "";
93
     this.name = "";
93
     this.num = "";
94
     this.num = "";
94
     this.userType = null;
95
     this.userType = null;

+ 11 - 0
src/app/views/office-management/office-management.component.html

@@ -3,6 +3,17 @@
3
     <div class="list-template__top" nz-row>
3
     <div class="list-template__top" nz-row>
4
       <div nz-col nzLg='14' class="list-template__searchBox">
4
       <div nz-col nzLg='14' class="list-template__searchBox">
5
         <div class="list-template__searchItem">
5
         <div class="list-template__searchItem">
6
+          <span class="label">院区</span>:
7
+          <nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzShowSearch nzAllowClear nzPlaceHolder="请选择院区" [(ngModel)]="hospital">
8
+            <ng-container *ngFor="let option of hospitals1">
9
+              <nz-option *ngIf="!isLoading" [nzLabel]="option.hosName" [nzValue]="option.id"></nz-option>
10
+            </ng-container>
11
+            <nz-option *ngIf="isLoading" nzDisabled nzCustomContent>
12
+              <i nz-icon nzType="loading" class="loading-icon"></i> 搜索中...
13
+            </nz-option>
14
+          </nz-select>
15
+        </div>
16
+        <div class="list-template__searchItem">
6
           <span class="label">科室名称:</span>
17
           <span class="label">科室名称:</span>
7
           <input nz-input class="formItem" [(ngModel)]="name" placeholder="请输入科室名称" nzSize="default" />
18
           <input nz-input class="formItem" [(ngModel)]="name" placeholder="请输入科室名称" nzSize="default" />
8
         </div>
19
         </div>

+ 6 - 4
src/app/views/office-management/office-management.component.ts

@@ -58,7 +58,7 @@ export class OfficeManagementComponent implements OnInit {
58
   add: boolean; //true:新增;false:编辑
58
   add: boolean; //true:新增;false:编辑
59
   validateForm: FormGroup; //新增/编辑表单
59
   validateForm: FormGroup; //新增/编辑表单
60
   coopId: number; //表格中执行操作的id
60
   coopId: number; //表格中执行操作的id
61
-  hospital; //所属院区
61
+  hospital: number; //所属院区
62
   name; //名称
62
   name; //名称
63
   num; //编码
63
   num; //编码
64
   deptalias; //别名
64
   deptalias; //别名
@@ -73,6 +73,7 @@ export class OfficeManagementComponent implements OnInit {
73
   isAddDeptsPhone = true; //添加新的科室电话是否禁用
73
   isAddDeptsPhone = true; //添加新的科室电话是否禁用
74
   deptsPhoneId = 1; //科室电话自增id
74
   deptsPhoneId = 1; //科室电话自增id
75
   allParentdepart: any = []; //所有的父级科室列表
75
   allParentdepart: any = []; //所有的父级科室列表
76
+  hospitals1: any = []; //院区列表(搜索)
76
   searchParentDeptSubject = new Subject();
77
   searchParentDeptSubject = new Subject();
77
   // 初始化增删改按钮
78
   // 初始化增删改按钮
78
   coopBtns: any = {};
79
   coopBtns: any = {};
@@ -94,7 +95,7 @@ export class OfficeManagementComponent implements OnInit {
94
       });
95
       });
95
     }
96
     }
96
   }
97
   }
97
-  //获取所有的父级科室列表baba
98
+  //获取所有的父级科室列表
98
   getAllParentdepart(keyWord = "") {
99
   getAllParentdepart(keyWord = "") {
99
     let postData: any = {
100
     let postData: any = {
100
       idx: 0,
101
       idx: 0,
@@ -144,7 +145,7 @@ export class OfficeManagementComponent implements OnInit {
144
   // 重置
145
   // 重置
145
   reset() {
146
   reset() {
146
     this.pageIndex = 1;
147
     this.pageIndex = 1;
147
-    this.hospital = this.tool.getCurrentHospital().id + "";
148
+    this.hospital = this.tool.getCurrentHospital().id;
148
     this.type = null;
149
     this.type = null;
149
     this.name = "";
150
     this.name = "";
150
     this.num = "";
151
     this.num = "";
@@ -182,7 +183,8 @@ export class OfficeManagementComponent implements OnInit {
182
 
183
 
183
   // 获取所有院区
184
   // 获取所有院区
184
   getAllHospital() {
185
   getAllHospital() {
185
-    this.hospital = this.tool.getCurrentHospital().id + "";
186
+    this.hospitals1 = this.tool.getHospitalList();
187
+    this.hospital = this.tool.getCurrentHospital().id;
186
     this.getList();
188
     this.getList();
187
   }
189
   }
188
 
190