Browse Source

优化护士端样式

seimin 6 months ago
parent
commit
f5763d46ab

+ 7 - 7
src/app/views/hushijiandan/hushijiandan.component.html

@@ -526,7 +526,7 @@
526
               </div>
526
               </div>
527
               <!-- 其他任务建单 -->
527
               <!-- 其他任务建单 -->
528
               <ng-container *ngIf="othersList[checkedTableType]">
528
               <ng-container *ngIf="othersList[checkedTableType]">
529
-                <div style="flex: 1; height: 100%; position: relative">
529
+                <div style="flex: 1; height: 100%;min-height:0;; position: relative">
530
                   <div class="otherBox">
530
                   <div class="otherBox">
531
                     <div class="otherBoxInner">
531
                     <div class="otherBoxInner">
532
                       <div class="otherBox-nav">
532
                       <div class="otherBox-nav">
@@ -756,7 +756,7 @@
756
               <!-- 意见箱 -->
756
               <!-- 意见箱 -->
757
               <div
757
               <div
758
                 *ngIf="checkedTableType == 'advice'"
758
                 *ngIf="checkedTableType == 'advice'"
759
-                style="flex: 1; height: 100%"
759
+                style="flex: 1; height: 100%;min-height:0;"
760
               >
760
               >
761
                 <div
761
                 <div
762
                   class="searchBox display_flex align-items_center justify-content_space-between"
762
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -852,7 +852,7 @@
852
                 </div>
852
                 </div>
853
               </div>
853
               </div>
854
               <!-- 手术排程信息 -->
854
               <!-- 手术排程信息 -->
855
-              <div *ngIf="checkedTableType == 'surgery'" style="flex: 1; height: 100%">
855
+              <div *ngIf="checkedTableType == 'surgery'" style="flex: 1; height: 100%;min-height:0;">
856
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
856
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
857
                   <div class="left alignC display_flex justify-content_flex-center align-items_center"></div>
857
                   <div class="left alignC display_flex justify-content_flex-center align-items_center"></div>
858
                   <div class="btns">
858
                   <div class="btns">
@@ -921,7 +921,7 @@
921
                 </div>
921
                 </div>
922
               </div>
922
               </div>
923
               <!-- 门诊帮扶预约 -->
923
               <!-- 门诊帮扶预约 -->
924
-              <div *ngIf="checkedTableType == 'outpatientHelpAppointment'" style="flex: 1; height: 100%">
924
+              <div *ngIf="checkedTableType == 'outpatientHelpAppointment'" style="flex: 1; height: 100%;min-height:0;">
925
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
925
                 <div class="searchBox display_flex align-items_center justify-content_space-between">
926
                   <div class="left alignC display_flex justify-content_flex-center align-items_center">
926
                   <div class="left alignC display_flex justify-content_flex-center align-items_center">
927
                     <div>预约时间:</div>
927
                     <div>预约时间:</div>
@@ -989,7 +989,7 @@
989
               <!-- 历史标本查询 -->
989
               <!-- 历史标本查询 -->
990
               <div
990
               <div
991
                 *ngIf="checkedTableType == 'historySpecimen'"
991
                 *ngIf="checkedTableType == 'historySpecimen'"
992
-                style="flex: 1; height: 100%"
992
+                style="flex: 1; height: 100%;min-height:0;"
993
               >
993
               >
994
                 <div
994
                 <div
995
                   class="searchBox display_flex align-items_center justify-content_space-between"
995
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -1099,7 +1099,7 @@
1099
               <!-- 历史药单查询 -->
1099
               <!-- 历史药单查询 -->
1100
               <div
1100
               <div
1101
                 *ngIf="checkedTableType == 'historyDrugsbag'"
1101
                 *ngIf="checkedTableType == 'historyDrugsbag'"
1102
-                style="flex: 1; height: 100%"
1102
+                style="flex: 1; height: 100%;min-height:0;"
1103
               >
1103
               >
1104
                 <div
1104
                 <div
1105
                   class="searchBox display_flex align-items_center justify-content_space-between"
1105
                   class="searchBox display_flex align-items_center justify-content_space-between"
@@ -1197,7 +1197,7 @@
1197
               <!-- 报修列表 -->
1197
               <!-- 报修列表 -->
1198
               <div
1198
               <div
1199
                 *ngIf="checkedTableType == 'bxlb' && isShowBx && coopBtns.repairList"
1199
                 *ngIf="checkedTableType == 'bxlb' && isShowBx && coopBtns.repairList"
1200
-                style="flex: 1; height: 100%"
1200
+                style="flex: 1; height: 100%;min-height:0;"
1201
               >
1201
               >
1202
                 <div
1202
                 <div
1203
                   class="searchBox display_flex align-items_center justify-content_space-between"
1203
                   class="searchBox display_flex align-items_center justify-content_space-between"

+ 3 - 3
src/app/views/hushijiandan/hushijiandan.component.less

@@ -106,7 +106,7 @@
106
     bottom: 0;
106
     bottom: 0;
107
     left: 0;
107
     left: 0;
108
     right: 0;
108
     right: 0;
109
-    height: 100%;
109
+    height: calc(100% - 48px);
110
   }
110
   }
111
 
111
 
112
 	.isKeyClass{
112
 	.isKeyClass{
@@ -1614,7 +1614,7 @@
1614
 
1614
 
1615
           .table {
1615
           .table {
1616
             width: 100%;
1616
             width: 100%;
1617
-            height: 100%;
1617
+            height: calc(100% - 56px);
1618
             padding: 0 8px 8px;
1618
             padding: 0 8px 8px;
1619
 
1619
 
1620
             &.turn {
1620
             &.turn {
@@ -1758,7 +1758,7 @@
1758
 
1758
 
1759
           .orderList {
1759
           .orderList {
1760
             width: 100%;
1760
             width: 100%;
1761
-            height: calc(100% - 106px);
1761
+            height: calc(100% - 114px);
1762
 
1762
 
1763
             .box {
1763
             .box {
1764
               position: relative;
1764
               position: relative;