Merge branch '20201109_pc_vue_new_branch' of http://git.shengws.com/csx/Vue_New into 20201109_pc_vue_new_branch

src/xt_pages/dialysis/template/DialysisPrintOrderTwentyNine.vue

                         <td width="30"></td>
                         <td width='70'>体重增加:</td>
                         <td width="50">
-                            <div class="under-line">&nbsp;{{ afterdialysis.weight_after ? afterdialysis.weight_after : "" }}</div>
+                            <div class="under-line">&nbsp;{{ (predialysis.weight_before - assessmentafter.weight_after).toFixed(1) }}</div>
                         </td>
                         <td width="10">Kg</td>
                         <td width="30"></td>

src/xt_pages/outpatientCharges/newTreatTemplate/printTwo.vue

       }
     },
     props: {
-      paramsObj: Object
+      paramsObj: Object,
+      info: Object
     },
     methods: {
       getName(list) {
     mounted() {
       this.org_id = this.$store.getters.xt_user.org_id
       if (this.org_id == 9504 || this.org_id == 10028 || this.org_id == 10138) {
+        var xtuser = this.$store.getters.xt_user
         this.orgname = xtuser.org.org_name
         var form = {
           'order_id': this.paramsObj.order_id,

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

                         <el-tab-pane label="日结" name="first">
                             <div style="display:flex;height:100%;">
                                 <div class="centerLeft">
+                                  <div>
                                     <div class="tabsBox" v-for="items,index in big_prescriptions" :key="index">
+                                      <div style="height: calc(100% - 60px);">
 
 
 
 
-                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
-                                                 @tab-click="tabclickEvent">
-                                            <!--<el-radio-group v-model="med_radio">-->
-                                            <el-tab-pane
-                                                    v-for="(item, index) in items.prescriptions"
-                                                    :key="index"
-                                                    :label="item.name"
-                                                    :name="item.name"
-                                            >
-                                            </el-tab-pane>
+                                          <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                                                  @tab-click="tabclickEvent">
+                                              <!--<el-radio-group v-model="med_radio">-->
+                                              <el-tab-pane
+                                                      v-for="(item, index) in items.prescriptions"
+                                                      :key="index"
+                                                      :label="item.name"
+                                                      :name="item.name"
+                                              >
+                                              </el-tab-pane>
 
                                             <div style="margin-bottom:10px;float: right">
 
                                                                 :prescription="items.curPrescriptions"></prescription-table>
                                             <!--</el-radio-group>-->
                                         </el-tabs>
-
+                                      </div>
                                         <div class="costBox">
                                             <span>当前处方总费用：<span style="color:red;">{{items.total}}元</span></span>
                                             <!--<span>总费用：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curPrescriptions.order.medfee_sumamt:getTotalFour(items.prescriptions)?getTotalFour(items.prescriptions):'' }}元</span></span>-->
                                             <span v-if="items.curPrescriptions.order_status  == 3">已退费</span>
                                         </div>
                                     </div>
+                                  </div>
 
 
                                 </div>
                                                 value-format="yyyy-MM-dd">
                                         </el-date-picker>
                                     </div>
-                                    <div class="tabsBox" v-for="items, index in big_month_prescriptions">
-
-                                        <!--<el-radio v-model="month_check" label="11" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 11">{{'普通门诊处方'}}-->
-                                        <!--</el-radio>-->
-                                        <!--<el-radio v-model="month_check" label="12" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 12">{{'门诊挂号'}}-->
-                                        <!--</el-radio>-->
-                                        <!--<el-radio v-model="month_check" label="13" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 13">{{'急诊'}}-->
-                                        <!--</el-radio>-->
-                                        <!--<el-radio v-model="month_check" label="14" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 14">{{'门诊特殊病'}}-->
-                                        <!--</el-radio>-->
-                                        <!--<el-radio v-model="month_check" label="15" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 15">{{'门诊统筹'}}-->
-                                        <!--</el-radio>-->
-                                        <!--<el-radio v-model="month_check" label="16" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 16">{{'门诊慢性病'}}-->
-                                        <!--</el-radio>-->
-                                        <!--<el-radio v-model="month_check" label="21" style="margin:10px 0;"-->
-                                        <!--v-if="items.med_type == 21">{{'普通住院'}}-->
-                                        <!--</el-radio>-->
-
-                                        <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
-                                        <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
-                                                 @tab-click="tabclickEventTwo">
-
-                                            <el-tab-pane
-                                                    v-for="(item, index) in items.month_prescriptions"
-                                                    :key="index"
-                                                    :label="item.name"
-                                                    :name="item.name">
-
-
-                                            </el-tab-pane>
-                                            <div style="margin-bottom:10px;float: right">
-                                                <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
+                                    <div>
+                                      <div class="tabsBox" v-for="items, index in big_month_prescriptions">
+                                        <div  style="height: calc(100% - 60px);">
+
+                                            <!--<el-radio v-model="month_check" label="11" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 11">{{'普通门诊处方'}}-->
+                                            <!--</el-radio>-->
+                                            <!--<el-radio v-model="month_check" label="12" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 12">{{'门诊挂号'}}-->
+                                            <!--</el-radio>-->
+                                            <!--<el-radio v-model="month_check" label="13" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 13">{{'急诊'}}-->
+                                            <!--</el-radio>-->
+                                            <!--<el-radio v-model="month_check" label="14" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 14">{{'门诊特殊病'}}-->
+                                            <!--</el-radio>-->
+                                            <!--<el-radio v-model="month_check" label="15" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 15">{{'门诊统筹'}}-->
+                                            <!--</el-radio>-->
+                                            <!--<el-radio v-model="month_check" label="16" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 16">{{'门诊慢性病'}}-->
+                                            <!--</el-radio>-->
+                                            <!--<el-radio v-model="month_check" label="21" style="margin:10px 0;"-->
+                                            <!--v-if="items.med_type == 21">{{'普通住院'}}-->
+                                            <!--</el-radio>-->
+
+                                            <!-- <el-button type="text" class="addTab" @click="addCharges" icon="el-icon-circle-plus">附加收费</el-button> -->
+                                            <el-tabs class="preTabs" v-model="editableTabsValue" type="border-card"
+                                                    @tab-click="tabclickEventTwo">
+
+                                                <el-tab-pane
+                                                        v-for="(item, index) in items.month_prescriptions"
+                                                        :key="index"
+                                                        :label="item.name"
+                                                        :name="item.name">
+
+
+                                                </el-tab-pane>
+                                                <div style="margin-bottom:10px;float: right">
+                                                    <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
 
                                                     <el-button
                                                             v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "
                                                     >预结算
                                                     </el-button>
 
-                                                    <el-button
-                                                            v-if="order.order_status == 1"
-                                                            size="small"
-                                                            @click="sz_open(7,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
-                                                            type="primary"
-                                                    >撤销明细
-                                                    </el-button>
-
-                                                    <el-button
-                                                            v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1"
-                                                            size="small"
-                                                            @click="sz_open(3,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
-                                                            type="primary">收费
-                                                    </el-button>
-
-
+                                                        <el-button
+                                                                v-if="order.order_status == 1"
+                                                                size="small"
+                                                                @click="sz_open(7,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
+                                                                type="primary"
+                                                        >撤销明细
+                                                        </el-button>
+
+                                                        <el-button
+                                                                v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1"
+                                                                size="small"
+                                                                @click="sz_open(3,items.med_type,items.curMonthPrescriptions.order, items.month_prescriptions)"
+                                                                type="primary">收费
+                                                        </el-button>
+
+
+                                                    </div>
+                                                    <div v-if="org_id != 9504 && org_id != 10028 &&org_id != 10138">
+
+                                                        <!--<el-button-->
+                                                                <!--v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "-->
+                                                                <!--size="small"-->
+                                                                <!--@click="open(8,items.med_type,items.curMonthPrescriptions.order)"-->
+                                                                <!--type="primary"-->
+                                                        <!--&gt;预结算-->
+                                                        <!--</el-button>-->
+
+
+                                                        <el-button v-loading="loadingtwo"
+                                                                  v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
+                                                                  size="small"
+                                                                  @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
+                                                                  type="primary">收费
+                                                        </el-button>
+
+
+                                                        <!--<el-button-->
+                                                        <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
+                                                        <!--size="small" @click="open(11)" type="primary"-->
+                                                        <!--&gt;撤销明细-->
+                                                        <!--</el-button>-->
+
+                                                    </div>
                                                 </div>
-                                                <div v-if="org_id != 9504 && org_id != 10028 &&org_id != 10138">
-
-                                                    <!--<el-button-->
-                                                            <!--v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "-->
-                                                            <!--size="small"-->
-                                                            <!--@click="open(8,items.med_type,items.curMonthPrescriptions.order)"-->
-                                                            <!--type="primary"-->
-                                                    <!--&gt;预结算-->
-                                                    <!--</el-button>-->
 
-
-                                                    <el-button v-loading="loadingtwo"
-                                                               v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) || items.curMonthPrescriptions.order.order_status == 1 ||  items.curMonthPrescriptions.order.order_status == 3"
-                                                               size="small"
-                                                               @click="open(4,items.med_type,items.curMonthPrescriptions.order,items.month_prescriptions)"
-                                                               type="primary">收费
-                                                    </el-button>
+                                                <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
+                                                <!--<month-prescription-table ref="prescription_tables"-->
+                                                <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
+                                                <charge-month-prescription-table
+                                                        :prescription="items.curMonthPrescriptions"></charge-month-prescription-table>
 
 
-                                                    <!--<el-button-->
-                                                    <!--v-if="$store.getters.xt_user.org_id == 4 || this.$store.getters.xt_user.org_id == 9919  || this.$store.getters.xt_user.org_id == 9671 || this.$store.getters.xt_user.org_id == 9674   || this.$store.getters.xt_user.org_id == 10106 || this.$store.getters.xt_user.org_id == 9990"-->
-                                                    <!--size="small" @click="open(11)" type="primary"-->
-                                                    <!--&gt;撤销明细-->
-                                                    <!--</el-button>-->
 
-                                                </div>
-                                            </div>
 
-                                            <!--<prescription-table :preTableData='preTableData'></prescription-table>-->
-                                            <!--<month-prescription-table ref="prescription_tables"-->
-                                            <!--:activeType="activeType"  :prescription="curMonthPrescriptions"></month-prescription-table>-->
-                                            <charge-month-prescription-table
-                                                    :prescription="items.curMonthPrescriptions"></charge-month-prescription-table>
+                                            </el-tabs>
 
 
-                                            <div class="costBox">
-                                                <span>当前处方总费用：<span
-                                                        style="color:red;">{{ items.month_total }}元</span></span>
+                                        </div>
+                                        <div class="costBox">
+                                          <span>当前处方总费用：<span
+                                                  style="color:red;">{{ items.month_total }}元</span></span>
 
                                                 <span>医疗费总额：<span style="color:red;">{{ items.curMonthPrescriptions.order.medfee_sumamt ?  items.curMonthPrescriptions.order.medfee_sumamt:getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
                                                 <span>基金支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.fund_pay_sumamt?items.curMonthPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
 
                                             </div>
 
-                                        </el-tabs>
+                                      </div>
 
 
                                     </div>
     }
     .tabsBox {
         position: relative;
-        height: 90%;
+        // height: 90%;
         overflow-y: auto;
-        margin-bottom: 60px;
+        height: 350px;
+        // margin-bottom: 60px;
 
     .el-tabs__item {
         padding: 0 10px;
         display: flex;
         flex-direction: column;
         position: relative;
+        overflow-y: auto;
     }
 
     .preTabs {