Merge branch 'feature/修改' into develop

src/styles/media/components/outpatientDetails.scss

@@ -424,6 +424,18 @@
                         }
                     }
                 }
+                &_div5 {
+                    .iconfont {
+                        font-size: 18px !important;
+                    }
+                    &_t5 {
+                        font-size: 12px !important;
+                        text-align: start !important;
+                        span {
+                            color: #787e8a;
+                        }
+                    }
+                }
             }
         }
         &_msg {
@@ -494,7 +506,7 @@
                 }
                 &_right {
                     width: 55% !important;
-                    height: 90% !important;
+                    height: 98% !important;
                     margin-bottom: 10px !important;
                     // 无数据样式
                     &_box {
@@ -502,6 +514,11 @@
                             font-size: 12px !important;
                         }
                     }
+                    //中间有数据
+					&_treebtn {
+						margin: 5px 10px 5px 10px !important;
+
+					}
                     &_table {
                         height: calc(100% - 100px);
                     }
@@ -514,7 +531,7 @@
                 }
             }
             &_rght2 {
-                height: 87% !important;
+                height:97% !important;
                 width: 17% !important;
                 &_top {
                     height: 30% !important;
@@ -540,12 +557,12 @@
                     }
                 }
                 &_bottom {
-                    height: 70% !important;
+                    height: 65% !important;
                     &_li {
                         &_title {
-                            width: 54px !important;
-                            height: 25px !important;
-                            font-size: 16px !important;
+                            width: 45px !important;
+                            height: 20px !important;
+                            font-size: 13px !important;
                         }
                         &_cont {
                             font-size: 14px !important;
@@ -628,7 +645,7 @@
             }
         }
         &_bottom {
-            height: 60% !important;
+            height: 63% !important;
             &_leftShowBox {
                 width: 83% !important;
                 // 无数据
@@ -658,7 +675,7 @@
                         font-size: 9px !important;
                         div {
                             font-size: 9px !important;
-                            .sp1 {}
+                           
                             .sp2 {
                                 &_avg {
                                     padding-left: 5px !important;
@@ -676,7 +693,7 @@
                 }
                 &_right {
                     width: 55% !important;
-                    height: 90% !important;
+                    height: 98% !important;
                     margin-bottom: 10px !important;
                     // 无数据样式
                     &_box {
@@ -696,7 +713,7 @@
                 }
             }
             &_rght2 {
-                height: 87% !important;
+                height: 98% !important;
                 width: 17% !important;
                 &_top {
                     height: 30% !important;
@@ -722,12 +739,12 @@
                     }
                 }
                 &_bottom {
-                    height: 70% !important;
+                    height: 68% !important;
                     &_li {
                         &_title {
-                            width: 54px !important;
-                            height: 25px !important;
-                            font-size: 16px !important;
+                            width: 46px !important;
+                            height: 23px !important;
+                            font-size: 14px !important;
                         }
                         &_cont {
                             font-size: 14px !important;
@@ -905,7 +922,7 @@
                 &_bottom {
                     &_li {
                         &_title {
-                            font-size: 18px !important;
+                            font-size: 16px !important;
                         }
                         &_cont {
                             font-size: 16px !important;

src/views/outpatientDetails.vue

@@ -2,7 +2,7 @@
  * @Author: wsq
  * @Date: 2022-04-22 15:20:58
  * @LastEditors: wsq
- * @LastEditTime: 2022-07-15 16:07:26
+ * @LastEditTime: 2022-07-15 16:26:39
  * @Description: 
 -->
 <template>
@@ -59,7 +59,7 @@
             ><img src="../assets/img/je.png" alt=""
           /></span>
           <div class="outpatientDetails_top_message_div5_t5">
-            自费占比:<span>{{ decimal(HistoryInfo.ownProportion) }}</span>
+            自费占比:<span>{{ decimal(HistoryInfo.ownProportion)+'%' }}</span>
           </div>
         </div>
       </div>