Merge branch 'feature/修改' into develop

src/styles/media/components/outpatientDetails.scss

@@ -424,6 +424,18 @@
                         }
                     }
                 }
+                &_div6 {
+                    .iconfont {
+                        font-size: 18px !important;
+                    }
+                    &_t6 {
+                        font-size: 12px !important;
+                        text-align: start !important;
+                        span {
+                            color: #787e8a;
+                        }
+                    }
+                }
                 &_div5 {
                     .iconfont {
                         font-size: 18px !important;
@@ -628,6 +640,30 @@
                         }
                     }
                 }
+                &_div6 {
+                    .iconfont {
+                        font-size: 18px !important;
+                    }
+                    &_t6 {
+                        font-size: 12px !important;
+                        text-align: start !important;
+                        span {
+                            color: #787e8a;
+                        }
+                    }
+                }
+                &_div5 {
+                    .iconfont {
+                        font-size: 18px !important;
+                    }
+                    &_t5 {
+                        font-size: 12px !important;
+                        text-align: start !important;
+                        span {
+                            color: #787e8a;
+                        }
+                    }
+                }
             }
         }
         &_msg {
@@ -810,6 +846,30 @@
                         }
                     }
                 }
+                &_div6 {
+                    .iconfont {
+                        font-size: 18px !important;
+                    }
+                    &_t6 {
+                        font-size: 12px !important;
+                        text-align: start !important;
+                        span {
+                            color: #787e8a;
+                        }
+                    }
+                }
+                &_div5 {
+                    .iconfont {
+                        font-size: 18px !important;
+                    }
+                    &_t5 {
+                        font-size: 12px !important;
+                        text-align: start !important;
+                        span {
+                            color: #787e8a;
+                        }
+                    }
+                }
             }
         }
         &_msg {

src/views/outaddrecordEnrollment.vue

@@ -13,7 +13,7 @@
 							class="outaddrecordEnrollment_search_message_left_t2"
 							v-model.trim="outaddsearchForm.diagName"
 							:trigger-on-focus="true"
-							placeholder="请输入主诊断名称或诊断编码"
+							placeholder="请输入预计DIP支付费用"
 							clearable
 							:fetch-suggestions="addquerySearchGroup"
 							select-when-unmatched="true"

src/views/outpatientDetails.vue

@@ -2,7 +2,7 @@
  * @Author: wsq
  * @Date: 2022-04-22 15:20:58
  * @LastEditors: wsq
- * @LastEditTime: 2022-07-15 18:29:02
+ * @LastEditTime: 2022-07-22 10:09:29
  * @Description: 
 -->
 <template>
@@ -54,6 +54,14 @@
             分组类型:<span>{{ HistoryInfo.disNature }}</span>
           </div>
         </div>
+        <div class="outpatientDetails_top_message_div6">
+          <span class="outpatientDetails_top_message_div6_tu6"
+            ><img src="../assets/img/lx2.png" alt=""
+          /></span>
+          <div class="outpatientDetails_top_message_div6_t6">
+           病人类型:<span>{{HistoryInfo.patientType}}</span>
+          </div>
+        </div>
         <div class="outpatientDetails_top_message_div5">
           <span class="outpatientDetails_top_message_div5_tu5"
             ><img src="../assets/img/je.png" alt=""
@@ -816,7 +824,7 @@ export default {
       justify-content: space-between;
       margin-top: 16px;
       &_left {
-        width: 20%;
+        width: 16.6%;
         height: 51px;
         display: flex;
         justify-content: start;
@@ -849,7 +857,7 @@ export default {
         }
       }
       &_centert {
-        width: 20%;
+        width: 16.6%;
         height: 51px;
         display: flex;
         justify-content: start;
@@ -883,7 +891,7 @@ export default {
         }
       }
       &_right {
-        width: 20%;
+        width: 16.6%;
         height: 51px;
         display: flex;
         justify-content: start;
@@ -912,7 +920,7 @@ export default {
         }
       }
       &_low {
-        width: 20%;
+        width: 16.6%;
         height: 51px;
         display: flex;
         justify-content: start;
@@ -940,8 +948,36 @@ export default {
           }
         }
       }
+       &_div6 {
+        width: 16.6%;
+        height: 51px;
+        display: flex;
+        justify-content: start;
+        align-items: center;
+        background-color: #f3fafd;
+        font-family: PingFang SC;
+        &_tu6 {
+          padding-left: 29px;
+          font-size: 23px;
+        }
+        &_t6 {
+          width: 80%;
+          height: 42px;
+          display: flex;
+          justify-content: start;
+          padding-left: 10px;
+          align-items: center;
+          background-color: #fff;
+          color: #abafb3;
+          font-size: 14px;
+          margin-left: 29px;
+          span {
+            color: #787e8a;
+          }
+        }
+      }
       &_div5 {
-        width: 20%;
+        width: 16.6%;
         height: 51px;
         display: flex;
         justify-content: start;