浏览代码

BUG修复

seimin 3 年之前
父节点
当前提交
cfe1cd9cd2

+ 1 - 1
proxy.conf.json

@@ -1,6 +1,6 @@
1 1
 {
2 2
   "/service": {
3
-    "target": "http://192.168.3.108",
3
+    "target": "http://192.168.3.96",
4 4
     "logLevel": "debug",
5 5
     "changeOrigin": true,
6 6
     "pathRewrite": {

+ 5 - 4
src/app/views/building-floor/building-floor.component.html

@@ -25,11 +25,12 @@
25 25
     <div class="top display_flex justify-content_flex-end align-items_center">
26 26
       <div class="display_flex align-items_center">
27 27
         <span>已选择 {{selectedFloor.length}} 个楼层</span>
28
-        <button class="btn default" *ngIf="coopBtns.add" nzType="primary" nz-button
28
+        <button class="btn default" *ngIf="coopBtns.add&&buildingList.length" nzType="primary" nz-button
29 29
           (click)="showFloorModal($event,'add')">新增</button>
30
-        <button class="btn default" *ngIf="coopBtns.del" nzType="primary" nz-button (click)="showDelFloorModal($event)"
31
-          [disabled]="allFloorList.length===0">批量删除</button>
32
-        <button class="btn default" *ngIf="coopBtns.add" nzType="primary" nz-button (click)="generate()">生成楼层</button>
30
+        <button class="btn default" *ngIf="coopBtns.del&&buildingList.length" nzType="primary" nz-button
31
+          (click)="showDelFloorModal($event)" [disabled]="allFloorList.length===0">批量删除</button>
32
+        <button class="btn default" *ngIf="coopBtns.add&&buildingList.length" nzType="primary" nz-button
33
+          (click)="generate()">生成楼层</button>
33 34
       </div>
34 35
     </div>
35 36
     <div class="table" *ngIf="!buildingsLoading">

+ 2 - 1
src/app/views/building-floor/building-floor.component.ts

@@ -114,7 +114,7 @@ export class BuildingFloorComponent implements OnInit {
114 114
   // 选中楼栋
115 115
   checkBuilding(data) {
116 116
     this.positionY = this.osComponentRef1.osInstance().scroll().position.y; //内容滚动的距离
117
-    this.checkedBuilding = data;
117
+    this.checkedBuilding = data ? data : {};
118 118
     this.mapOfCheckedId = {};
119 119
     this.getAllFloor();
120 120
   }
@@ -327,6 +327,7 @@ export class BuildingFloorComponent implements OnInit {
327 327
       this.btnLoading = false;
328 328
       if (result["status"] == 200 && !result["data"][0].msg) {
329 329
         this.showPromptModal("删除", true, "");
330
+        this.checkedBuilding = {};
330 331
       } else {
331 332
         this.showPromptModal("删除", false, result["data"][0].msg);
332 333
       }

+ 2 - 2
src/app/views/group-management/group-management.component.html

@@ -31,8 +31,8 @@
31 31
       </div>
32 32
       <div class="display_flex align-items_center">
33 33
         <span>已选择 {{usersArr.length}} 人</span>
34
-        <button class="btn default" *ngIf="coopBtns.edit" nzType="primary" nz-button [nzLoading]="saveLoading"
35
-          (click)="save()">保存</button>
34
+        <button class="btn default" *ngIf="coopBtns.edit&&groupList.length" nzType="primary" nz-button
35
+          [nzLoading]="saveLoading" (click)="save()">保存</button>
36 36
       </div>
37 37
     </div>
38 38
     <div class="table" *ngIf="!loading1">

+ 3 - 2
src/app/views/group-management/group-management.component.ts

@@ -107,7 +107,7 @@ export class GroupManagementComponent implements OnInit {
107 107
         user: {
108 108
           name: this.searchName,
109 109
           usertype: { id: 106 },
110
-          hospital: { id: this.checkedGroup["hospital"]["id"] },
110
+          hospital: { id: this.hosId },
111 111
         },
112 112
       };
113 113
       this.timeNum++;
@@ -168,7 +168,7 @@ export class GroupManagementComponent implements OnInit {
168 168
   checkGroup(data) {
169 169
     this.positionY = this.osComponentRef1.osInstance().scroll().position.y; //内容滚动的距离
170 170
     this.searchName = "";
171
-    this.checkedGroup = data;
171
+    this.checkedGroup = data ? data : {};
172 172
     this.mapOfCheckedId = {};
173 173
     this.groupUserList = this.checkedGroup["users"]
174 174
       ? this.checkedGroup["users"]
@@ -318,6 +318,7 @@ export class GroupManagementComponent implements OnInit {
318 318
         that.btnLoading = false;
319 319
         if (data.status == 200) {
320 320
           that.showPromptModal("删除", true, "");
321
+          this.checkedGroup = {};
321 322
         } else {
322 323
           that.showPromptModal("删除", false, data.msg);
323 324
         }