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

src/xt_pages/outpatientCharges/components/chargeDialog.vue

@@ -349,7 +349,7 @@
         //初始化
         this.form.tmp_decimal = 0
         this.tmp_pay = 0
-        this.id = id
+        this.id =id
         this.form.dec_way = false
         this.updateconfig()
         this.form.total = total

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -1265,9 +1265,9 @@ export default {
               } else {
                 that.pwdFormVisible = false
                 if (that.activeName == 'first') {
-                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder)
+                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder,that.patientInfo.id)
                 } else {
-                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder)
+                  that.$refs.charge.show(that.getTotalFour(that.other_prescriptions), that.currentOrder,that.patientInfo.id)
                 }
               }
 

src/xt_pages/outpatientCharges/statementTemplate/batchPrint.vue

@@ -127,7 +127,8 @@
                 <td colspan="7">
                   <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
                     <div style="width:33%;">医疗费总额：{{infos.order.medfee_sumamt?infos.order.medfee_sumamt:""}}元</div>
-                    <div style="width:33%;">基金支付金额：{{infos.order.fund_pay_sumamt?infos.order.fund_pay_sumamt:""}}元</div>
+                    <div style="width:33%;">基金支付金额：{{ (infos.order.hifp_pay + infos.order.maf_pay + infos.order.hifmi_pay).toFixed(2)}}元</div>
+
                     <div style="width:33%;">个人账户支付金额：{{infos.order.acct_pay?infos.order.acct_pay:""}}元</div>
 
                   </div>
@@ -136,9 +137,9 @@
                     <div style="width:33%;">个人支付金额：{{ infos.order.psn_cash_pay}}元</div>
                     <div style="width:33%;">个人账户金额：{{infos.order.balc}}元</div>
                   </div>
-                  <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">
-                    <div style="width:33%;">基金统筹支付金额：{{infos.order.hifp_pay?infos.order.hifp_pay:""}}元</div>
-                  </div>
+<!--                  <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">-->
+<!--&lt;!&ndash;                    <div style="width:33%;">基金统筹支付金额：{{infos.order.hifp_pay?infos.order.hifp_pay:""}}元</div>&ndash;&gt;-->
+<!--                  </div>-->
                 </td>
                 <td style="font-size:16px;">合计：{{infos.order.medfee_sumamt}}元</td>
               </tr>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -123,7 +123,7 @@
                         <td colspan="7">
                             <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
                                 <div style="width:33%;">医疗费总额：{{info.medfee_sumamt?info.medfee_sumamt:info.new_order.medfee_sumamt}}元</div>
-                                <div style="width:33%;">基金支付金额：{{info.fund_pay_sumamt?info.fund_pay_sumamt:info.new_order.fund_pay_sumamt}}元</div>
+                                <div style="width:33%;">基金支付金额：{{ (info.new_order.hifp_pay + info.new_order.maf_pay + info.new_order.hifmi_pay).toFixed(2)}}元</div>
                                 <div style="width:33%;">个人账户支付金额：{{info.acct_pay?info.acct_pay:info.new_order.acct_pay}}元</div>
 
                             </div>
@@ -132,9 +132,9 @@
                                 <div style="width:33%;">个人支付金额：{{ info.new_order.psn_cash_pay}}元</div>
                                 <div style="width:33%;">个人账户金额：{{info.new_order.balc}}元</div>
                             </div>
-                          <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">
-                            <div style="width:33%;">基金统筹支付金额：{{info.hifp_pay?info.hifp_pay:info.new_order.hifp_pay}}元</div>
-                          </div>
+<!--                          <div style="display:flex;flez-wrap:wrap;font-size:16px;margin-top: 10px">-->
+<!--&lt;!&ndash;                            <div style="width:33%;">基金统筹支付金额：{{info.hifp_pay?info.hifp_pay:info.new_order.hifp_pay}}元</div>&ndash;&gt;-->
+<!--                          </div>-->
                         </td>
                         <td style="font-size:16px;">合计：{{info.new_order.medfee_sumamt}}元</td>
                     </tr>