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

                                                             </el-button>
                                                             <el-button
                                                                     v-if="items.curPrescriptions.order.order_status == 1 && items.curPrescriptions.order.is_pre == 1 && hisPatientInfo.balance_accounts_type != 2"
-                                                                    size="small" @click="open(11)" type="primary"
+                                                                    size="small" @click="open(11,items.med_type,items.prescriptions[0].order,items.prescriptions)" type="primary"
                                                             >撤销明细
                                                             </el-button>
                                                             <!--<div>{{ items.curPrescriptions.order.order_status}}</div>-->
 
 
                                                 <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.hifp_pay?items.curPrescriptions.order.hifp_pay:''}}元</span></span>
                                                 <span>个人账户支付金额：<span style="color:red;">{{ items.curPrescriptions.order.acct_pay?items.curPrescriptions.order.acct_pay:''}}元</span></span>
                                                 <span v-if="hisPatientInfo.balance_accounts_type != 2">个人支付金额：<span
                                                         style="color:red;">{{ items.curPrescriptions.order.psn_cash_pay?items.curPrescriptions.order.psn_cash_pay:''}}元</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.hifp_pay?items.curMonthPrescriptions.order.hifp_pay:''}}元</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>-->
 

src/xt_pages/outpatientDoctorStation/components/prescriptionTable.vue

             scope.row.prescribing_number = scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)
           }else{
             console.log(12)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1)) * (scope.row.day ? scope.row.day : 1) / scope.row.drug.min_number)
           }
         }else{
           if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
             console.log(123)
-            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose) 
+            scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose)
           }else{
             console.log(1234)
             scope.row.prescribing_number = Math.ceil((scope.row.single_dose * (scope.row.execution_frequency ? this.getNum(scope.row.execution_frequency) : 1) * (scope.row.day ? scope.row.day : 1)) / scope.row.drug.dose / scope.row.drug.min_number)
           }
           // scope.row.retail_price = scope.row.drug.retail_price * scope.row.prescribing_number
         }
-        
+
       },
       getPrescribingNumberUnit(scope){
 
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
         //     scope.row.prescribing_number = scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day
         //   }else{
-        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number) 
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency)) * scope.row.day / scope.row.drug.min_number)
         //   }
         // }else{
         //   if(scope.row.prescribing_number_unit == scope.row.drug.min_unit){
-        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose) 
+        //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose)
         //   }else{
         //     scope.row.prescribing_number = Math.ceil((scope.row.single_dose * this.getNum(scope.row.execution_frequency) * scope.row.day) / scope.row.drug.dose / scope.row.drug.min_number)
         //   }
         if(this.prescription.project[scope.$index].total == 0){
           this.prescription.project[scope.$index].total = 1
         }
-        
+
       },
       getNum(execution_frequency){
         let arr = [
     watch:{
       "prescription.advices":{
         handler(newVal,oldVal){
-          
+
         },
         deep:true
       },