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

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -114,11 +114,25 @@
 
 
                     <div v-if="this.$store.getters.xt_user.org_id != 9504 && this.$store.getters.xt_user.org_id != 10028 && this.$store.getters.xt_user.org_id != 10138">
-                        <el-button size="small" @click="open(3)" type="primary">打印</el-button>
+                        <el-button size="small" @click="open(3)" type="primary" v-if="this.radio == 2">打印</el-button>
                         <el-button v-loading="loadingone" size="small"
                                    @click="open(6)"
                                    type="primary">挂号
                         </el-button>
+
+                        <!--<el-button-->
+                        <!--size="small" @click="open(8)" type="primary"-->
+                        <!--&gt;预结算-->
+                        <!--</el-button>-->
+
+
+                        <!--<el-button v-loading="loadingtwo"-->
+                        <!--v-if="(this.hisPatientInfo.id > 0 && this.order.id == 0) || this.order.order_status == 1 ||  this.order.order_status == 3"-->
+                        <!--size="small"-->
+                        <!--@click="open(4)"-->
+                        <!--type="primary">收费-->
+                        <!--</el-button>-->
+
                         <el-button size="small" @click="open(5)" type="primary"
                                    v-if="this.radio == 2  && this.hisPatientInfo.id > 0 && this.order.id > 0 &&  this.order.order_status == 2">
                             退费
@@ -136,6 +150,12 @@
                         >退号
                         </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>
                     <!--<el-button size="small" @click="query" type="primary"-->
                     <!--&gt;查询-->
@@ -167,32 +187,32 @@
                                             </el-tab-pane>
 
                                             <div style="margin-bottom:10px;float: right">
-                                                <el-button
-                                                        v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0) "
-
-                                                        size="small"
-                                                        @click="sz_open(8,items.med_type,items.prescriptions[0].order)"
-                                                        type="primary"
-                                                >预结算
-                                                </el-button>
-
-                                                <el-button
-                                                        v-if="order.order_status == 1"
-                                                        size="small"
-                                                        @click="sz_open(7,items.med_type,items.prescriptions[0].order,items.prescriptions)"
-                                                        type="primary"
-                                                >撤销明细
-                                                </el-button>
-
-                                                <el-button
-                                                        v-if="(hisPatientInfo.id > 0 && items.prescriptions[0].order.id == 0) || items.prescriptions[0].order.order_status == 1"
-                                                        size="small"
-                                                        @click="sz_open(3,items.med_type,items.prescriptions[0].order,items.prescriptions)"
-                                                        type="primary">收费
-                                                </el-button>
 
 
                                                 <div v-if="org_id == 9504 || org_id == 10028 || org_id == 10138">
+                                                    <el-button
+                                                            v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0) "
+
+                                                            size="small"
+                                                            @click="sz_open(8,items.med_type,items.prescriptions[0].order)"
+                                                            type="primary"
+                                                    >预结算
+                                                    </el-button>
+
+                                                    <el-button
+                                                            v-if="order.order_status == 1"
+                                                            size="small"
+                                                            @click="sz_open(7,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                                            type="primary"
+                                                    >撤销明细
+                                                    </el-button>
+
+                                                    <el-button
+                                                            v-if="(hisPatientInfo.id > 0 && items.prescriptions[0].order.id == 0) || items.prescriptions[0].order.order_status == 1"
+                                                            size="small"
+                                                            @click="sz_open(3,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                                            type="primary">收费
+                                                    </el-button>
 
 
 
@@ -209,12 +229,12 @@
                                                     <!--</el-button>-->
 
 
-                                                    <!--<el-button v-loading="loadingtwo"-->
-                                                               <!--v-if="(hisPatientInfo.id > 0 && items.prescriptions[0].order.id == 0) || items.prescriptions[0].order.order_status == 1 ||  items.prescriptions[0].order.order_status == 3"-->
-                                                               <!--size="small"-->
-                                                               <!--@click="open(4,items.med_type,items.prescriptions[0].order,items.prescriptions)"-->
-                                                               <!--type="primary">收费-->
-                                                    <!--</el-button>-->
+                                                    <el-button v-loading="loadingtwo"
+                                                               v-if="(hisPatientInfo.id > 0 && items.prescriptions[0].order.id == 0) || items.prescriptions[0].order.order_status == 1 ||  items.prescriptions[0].order.order_status == 3"
+                                                               size="small"
+                                                               @click="open(4,items.med_type,items.prescriptions[0].order,items.prescriptions)"
+                                                               type="primary">收费
+                                                    </el-button>
 
 
                                                     <!--<el-button-->
@@ -233,9 +253,18 @@
 
                                         <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>基金支付：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
-                                            <span>个人支付：<span style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</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>基金支付：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curPrescriptions.order.fund_pay_sumamt:''}}元</span></span>-->
+                                            <!--<span>个人支付：<span style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>-->
+
+
+                                            <span>医疗费总额：<span style="color:red;">{{ items.curPrescriptions.order.medfee_sumamt ?  items.curMonthPrescriptions.order.medfee_sumamt:getTotalFour(items.month_prescriptions)?getTotalFour(items.month_prescriptions):'' }}元</span></span>
+                                            <span>基金支付金额：<span style="color:red;">{{ items.curPrescriptions.order.fund_pay_sumamt?items.curMonthPrescriptions.order.fund_pay_sumamt:''}}元</span></span>
+                                            <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curMonthPrescriptions.order.acct_pay:''}}元</span></span>
+                                            <span>个人支付金额：<span style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</span></span>
+                                            <span>个人账户金额：<span style="color:red;">{{ items.curPrescriptions.order.account_price?items.curPrescriptions.order.account_price:''}}元</span></span>
+
+
 
                                             <span v-if="items.curPrescriptions.order_status  == 1">待结算</span>
                                             <span v-if="items.curPrescriptions.order_status  == 2">已结算</span>
@@ -398,14 +427,14 @@
                                             <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
+                                                            v-if="(hisPatientInfo.id > 0 && items.curMonthPrescriptions.order.id == 0) "
 
-                                                            <!--size="small"-->
-                                                            <!--@click="sz_open(8,items.med_type,items.curMonthPrescriptions.order)"-->
-                                                            <!--type="primary"-->
-                                                    <!--&gt;预结算-->
-                                                    <!--</el-button>-->
+                                                            size="small"
+                                                            @click="sz_open(8,items.med_type,items.curMonthPrescriptions.order)"
+                                                            type="primary"
+                                                    >预结算
+                                                    </el-button>
 
                                                     <el-button
                                                             v-if="order.order_status == 1"
@@ -463,11 +492,12 @@
                                                 <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>
-                                                <span>个人支付：<span style="color:red;">{{ items.curMonthPrescriptions.order.psn_cash_pay?items.curMonthPrescriptions.order.psn_cash_pay:''}}元</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>
+                                                <span>个人账户支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.acct_pay?items.curMonthPrescriptions.order.acct_pay:''}}元</span></span>
+                                                <span>个人支付金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.psn_cash_pay?items.curMonthPrescriptions.order.psn_cash_pay:''}}元</span></span>
+                                                <span>个人账户金额：<span style="color:red;">{{ items.curMonthPrescriptions.order.account_price?items.curMonthPrescriptions.order.account_price:''}}元</span></span>
 
-                                                <!--<span>{{ state }}</span>-->
                                             </div>
 
                                         </el-tabs>