Merge branch 'master' into develop

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

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

src/app/views/hushijiandan/hushijiandan.component.ts

@@ -494,27 +494,28 @@ export class HushijiandanComponent implements OnInit {
           this.isAssign = result.list.find(v => v.key == 'nurseSendOrder').value == 1;
           if (this.isShowBx && this.coopBtns.repairList && !this.checkedTableType) {
             // 初始化默认显示第一个
-            if(this.tabPermission.length){
-              this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
-            }else if(this.coopBtns.suggestionBox){
-              this.checkedTableType = 'advice';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.surgery){
-              this.checkedTableType = 'surgery';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.outpatientHelpAppointment){
-              this.checkedTableType = 'outpatientHelpAppointment';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.inquiryOfHistoricalSpecimens){
-              this.checkedTableType = 'historySpecimen';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.historicalMedicineListInquiry){
-              this.checkedTableType = 'historyDrugsbag';
-              this.checkTable(this.checkedTableType);
-            }else if(this.coopBtns.repairList && this.isShowBx){
-              this.checkedTableType = 'bxlb';
-              this.checkTable(this.checkedTableType);
-            }
+            console.log(this.tabPermission)
+            // if(this.tabPermission.length){
+            //   this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
+            // }else if(this.coopBtns.suggestionBox){
+            //   this.checkedTableType = 'advice';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.surgery){
+            //   this.checkedTableType = 'surgery';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.outpatientHelpAppointment){
+            //   this.checkedTableType = 'outpatientHelpAppointment';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.inquiryOfHistoricalSpecimens){
+            //   this.checkedTableType = 'historySpecimen';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.historicalMedicineListInquiry){
+            //   this.checkedTableType = 'historyDrugsbag';
+            //   this.checkTable(this.checkedTableType);
+            // }else if(this.coopBtns.repairList && this.isShowBx){
+            //   this.checkedTableType = 'bxlb';
+            //   this.checkTable(this.checkedTableType);
+            // }
             this.smallTabs = [
               { id: 1, name: "综合日志" },
               { id: 2, name: "一键报修" },
@@ -1459,6 +1460,7 @@ export class HushijiandanComponent implements OnInit {
         }
         // 初始化默认显示第一个
         if(search === undefined && !this.checkedTableType){
+          console.log(this.tabPermission)
           if(this.tabPermission.length){
             this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
           }else if(this.coopBtns.suggestionBox){