页面优化

src/app/views/hushijiandan/hushijiandan.component.html

@@ -1731,7 +1731,7 @@
                           <td>{{ item.patientName }}<br>{{ item.sex?.name }}<ng-container *ngIf="item.age !== undefined"> {{item.age}}岁</ng-container></td>
                           <td>{{ item.applyType?.name }}<br>{{ item.equipment?.name }}</td>
                           <td>患者：{{ item.patientPhone }}<br>代表：{{ item.agent_phone }}</td>
-                          <td>{{ item.escortTime | date:'yyyy-MM-dd' }}<br>{{ item.status?.name }}</td>
+                          <td>{{ item.escortTime | date:'yyyy-MM-dd HH:mm' }}<br>{{ item.status?.name }}</td>
                           <td>
                             <div class="coop">
                               <span (click)="createOrder($event, item)">一键申请</span>
@@ -4028,4 +4028,4 @@
 <app-pathology-add *ngIf="pathologyModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyCancel($event)"></app-pathology-add>
 
 <!-- 病理详情 -->
-<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>
+<app-pathology-detail *ngIf="pathologyDetailModal" [surgeryId]="surgeryDataId" [patientId]="patientDataId" (pathologyCancel)="pathologyDetailCancel($event)"></app-pathology-detail>

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

@@ -170,7 +170,7 @@ export class HushijiandanComponent implements OnInit {
   coopBtns: any = {};
 	surgeryDataId: any; //手术id
 	patientDataId: any; //病人id
-	
+
   ngOnInit() {
     this.getCoopBtns();
     this.currentHospital = this.tool.getCurrentHospital();
@@ -311,7 +311,7 @@ export class HushijiandanComponent implements OnInit {
     this.coopBtns = coopBtns;
     console.log(this.coopBtns);
   }
-	
+
 	// 手术排程-病理申请单
 	pathologyAddItem(e,item){
 		this.surgeryDataId = item.id
@@ -335,7 +335,7 @@ export class HushijiandanComponent implements OnInit {
 				}
 			});
 	}
-	
+
 	// 病理申请单
 	pathologyAdd(e){
 		this.surgeryDataId = this.surgeryWKOMsg.id
@@ -359,11 +359,11 @@ export class HushijiandanComponent implements OnInit {
 			}
 		});
 	}
-	
+
 	pathologyDetailCancel(){
 		this.pathologyDetailModal = false
 	}
-	
+
 	pathologyCancel(){
 		this.pathologyModal = false
 	}
@@ -501,7 +501,7 @@ export class HushijiandanComponent implements OnInit {
         if (result.status == 200) {
           this.isShowBx = result.list.find(v => v.key == 'hos_itsmIncident').value == 1;
           this.isAssign = result.list.find(v => v.key == 'nurseSendOrder').value == 1;
-          if (this.isShowBx && (this.coopBtns.repairList || this.coopBtns.quickReportForRepair)) {
+          if (this.isShowBx && (this.coopBtns.repairList || this.coopBtns.quickReportForRepair) && !this.checkedTableType) {
             // 初始化默认显示第一个
             if(this.tabPermission.length){
               this.checkedTableType = (this.tabPermission[0] && this.tabPermission[0].system) ? 'other' : this.tabPermission[0].id;
@@ -1507,7 +1507,7 @@ export class HushijiandanComponent implements OnInit {
           this.tabPermission = this.tabPermission.filter(v => !v.system);
         }
         // 初始化默认显示第一个
-        if(search === undefined){
+        if(search === undefined && !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){
@@ -1532,6 +1532,9 @@ export class HushijiandanComponent implements OnInit {
             this.checkedTableType = 'bxlb';
             this.checkTable(this.checkedTableType);
           }
+        }else{
+          console.log('this.checkedTableType', this.checkedTableType);
+          this.checkTable(this.checkedTableType);
         }
         this.othersList = {};
         this.tabPermission.forEach(v => {

src/common.less

@@ -171,17 +171,6 @@
 }
 // list模板样式 end
 
-// 滚动条样式
-::-webkit-scrollbar {
-  width: 8px;
-  height: 8px;
-}
-
-::-webkit-scrollbar-thumb {
-
-
-}
-
 // button
 @lg-btn-height: 52px;
 @default-btn-height: 34px;