瀏覽代碼

bug修复

seimin 5 月之前
父節點
當前提交
24972f7a66

+ 1 - 1
src/app/components/configurationCenter/configuration-category/configuration-category.component.html

@@ -204,7 +204,7 @@
204 204
           </nz-form-control>
205 205
         </nz-form-item>
206 206
         <nz-form-item *ngIf="!add && coopType === 3">
207
-          <nz-form-label nzFor="category2" nzRequired [nzSpan]="6">{{activeCategory2.id}}二级故障现象</nz-form-label>
207
+          <nz-form-label nzFor="category2" nzRequired [nzSpan]="6">二级故障现象</nz-form-label>
208 208
           <nz-form-control [nzSpan]="24" nzErrorTip="请选择二级故障现象!">
209 209
 						<nz-select class="formItem" [nzDropdownMatchSelectWidth]="false" nzPlaceHolder="请选择二级故障现象" formControlName="category2">
210 210
 						  <ng-container *ngFor="let option of categoryListP2">

+ 23 - 21
src/app/views/hushijiandan/hushijiandan.component.ts

@@ -494,27 +494,28 @@ export class HushijiandanComponent implements OnInit {
494 494
           this.isAssign = result.list.find(v => v.key == 'nurseSendOrder').value == 1;
495 495
           if (this.isShowBx && this.coopBtns.repairList && !this.checkedTableType) {
496 496
             // 初始化默认显示第一个
497
-            if(this.tabPermission.length){
498
-              this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
499
-            }else if(this.coopBtns.suggestionBox){
500
-              this.checkedTableType = 'advice';
501
-              this.checkTable(this.checkedTableType);
502
-            }else if(this.coopBtns.surgery){
503
-              this.checkedTableType = 'surgery';
504
-              this.checkTable(this.checkedTableType);
505
-            }else if(this.coopBtns.outpatientHelpAppointment){
506
-              this.checkedTableType = 'outpatientHelpAppointment';
507
-              this.checkTable(this.checkedTableType);
508
-            }else if(this.coopBtns.inquiryOfHistoricalSpecimens){
509
-              this.checkedTableType = 'historySpecimen';
510
-              this.checkTable(this.checkedTableType);
511
-            }else if(this.coopBtns.historicalMedicineListInquiry){
512
-              this.checkedTableType = 'historyDrugsbag';
513
-              this.checkTable(this.checkedTableType);
514
-            }else if(this.coopBtns.repairList && this.isShowBx){
515
-              this.checkedTableType = 'bxlb';
516
-              this.checkTable(this.checkedTableType);
517
-            }
497
+            console.log(this.tabPermission)
498
+            // if(this.tabPermission.length){
499
+            //   this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
500
+            // }else if(this.coopBtns.suggestionBox){
501
+            //   this.checkedTableType = 'advice';
502
+            //   this.checkTable(this.checkedTableType);
503
+            // }else if(this.coopBtns.surgery){
504
+            //   this.checkedTableType = 'surgery';
505
+            //   this.checkTable(this.checkedTableType);
506
+            // }else if(this.coopBtns.outpatientHelpAppointment){
507
+            //   this.checkedTableType = 'outpatientHelpAppointment';
508
+            //   this.checkTable(this.checkedTableType);
509
+            // }else if(this.coopBtns.inquiryOfHistoricalSpecimens){
510
+            //   this.checkedTableType = 'historySpecimen';
511
+            //   this.checkTable(this.checkedTableType);
512
+            // }else if(this.coopBtns.historicalMedicineListInquiry){
513
+            //   this.checkedTableType = 'historyDrugsbag';
514
+            //   this.checkTable(this.checkedTableType);
515
+            // }else if(this.coopBtns.repairList && this.isShowBx){
516
+            //   this.checkedTableType = 'bxlb';
517
+            //   this.checkTable(this.checkedTableType);
518
+            // }
518 519
             this.smallTabs = [
519 520
               { id: 1, name: "综合日志" },
520 521
               { id: 2, name: "一键报修" },
@@ -1459,6 +1460,7 @@ export class HushijiandanComponent implements OnInit {
1459 1460
         }
1460 1461
         // 初始化默认显示第一个
1461 1462
         if(search === undefined && !this.checkedTableType){
1463
+          console.log(this.tabPermission)
1462 1464
           if(this.tabPermission.length){
1463 1465
             this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
1464 1466
           }else if(this.coopBtns.suggestionBox){