Merge branch 'feature/恭城' of…

Merge branch 'feature/恭城' of https://gitlab.suvalue.com/ninglupeng/vue-composition-api into feature/恭城

src/views/outHistorygrouping.vue

@@ -355,6 +355,8 @@
                         <el-select v-model="leavevalue" placeholder="请选择离院方式" size="mini" class="outaddrecordEnrollment_search_div2_inp4">
                             <el-option v-for="item in leaveoptions" :key="item.value" :label="item.label" :value="item.value" />
                         </el-select>
+                        <span class="outaddrecordEnrollment_search_div2_span3" style="margin-left: 26px;">总费用:</span>
+                        <el-input v-model="d01" placeholder="请输入总费用" class="outaddrecordEnrollment_search_div2_inp3" size="mini" />
                     </div>
                     <div class="outaddrecordEnrollment_search_div3">
                         <span class="outaddrecordEnrollment_search_div3_span1">性别:</span>
@@ -364,8 +366,17 @@
                     </div>
                 </div>
                 <div class="outaddrecordEnrollment_centent">
-                    <div class="outaddrecordEnrollment_centent_totalnum" v-for="(item, index) in addCorePercents" :key="index">
-                        <div class="outaddrecordEnrollment_centent_totalnum_left">
+                    <div 
+                        class="outaddrecordEnrollment_centent_totalnum" 
+                        style="display: flex;justify-content: space-between;"
+                        v-for="(item, index) in addCorePercents" 
+                        :key="index"
+                        >
+                        <div class="outsetgrouping_centent_totalnum_left_yxrz" v-if="item.isShow">
+                            <div class="dw" style="height: 24%;"><img src="../assets/img/t29.png" alt="" /> 优先入组</div>
+                        </div>
+                        <div style="flex: 1;">
+                            <div class="outaddrecordEnrollment_centent_totalnum_left">
                             <div class="outaddrecordEnrollment_centent_totalnum_left_text1">
                                 <span>分组编码：{{ item.code }}</span>
                                 <span>分组名称：{{ item.coreName }}</span>
@@ -376,8 +387,8 @@
                                 <span>预计DRG支付费用：{{ decimal(item.actualfee) }}</span>
                                 <span>分组类型：{{ item.disNature }}</span>
                             </div>
-                        </div>
-                        <div class="outpatientDetails_fenqu" v-if="item.lowMagnification != 0 && item.highMagnification != 0">
+                            </div>
+                            <div class="outpatientDetails_fenqu" v-if="item.lowMagnification != 0 && item.highMagnification != 0">
                             <div class="outpatientDetails_fenqu_di">
                                 <div class="outpatientDetails_fenqu_di_bb">
                                     <div class="outpatientDetails_fenqu_di_bb_div1">
@@ -394,7 +405,10 @@
                                             }"
                                         ></span>
                                     </div>
-                                    <div class="outpatientDetails_fenqu_di_bb_div2">
+                                    <div 
+                                        class="outpatientDetails_fenqu_di_bb_div2"
+                                        style="height: 100%;"
+                                        >
                                         <span class="outpatientDetails_fenqu_di_bb_div2_span1" :style="{ width: item.lowwidth + '%' }"
                                             ><span
                                                 class="outpatientDetails_fenqu_di_bb_div2_span1_t1"
@@ -420,6 +434,7 @@
                                     </div>
                                 </div>
                             </div>
+                            </div>
                         </div>
                         <!-- <div class="outaddrecordEnrollment_centent_totalnum_right">
                             <div :id="`indexChart11` + index" class="outaddrecordEnrollment_centent_totalnum_right_echar1"></div>
@@ -545,6 +560,7 @@ export default {
             diagList: [], //诊断
             opsList: [], //手术
             a46C: "城乡居民",
+            d01: 0,
             myTimer: null,
         };
     },
@@ -789,6 +805,7 @@ export default {
                 diagList: this.diagList, // 诊断集合
                 opsList: this.opsList, // 手术集合
                 a46C: this.a46C,
+                d01: this.d01
             })
                 .then((data) => {
                     if (data && data.length == 0) {