新功能

src/xt_pages/outpatientCharges/batchStatementPrint.vue

@@ -338,6 +338,7 @@ export default {
 
           }
           this.info = orders
+          console.log( this.info )
 
 
           // var that = this;

src/xt_pages/outpatientCharges/statementTemplate/batchPrint.vue

@@ -32,7 +32,7 @@
               </div>
               <div>费别：<span style="display:inline-block;min-width:80px;">医保</span>
               </div>
-              <div>收费日期：<span style="display:inline-block;">{{infos.order.setl_time ? infos.order.setl_time.split(' ') : ''}}</span>
+              <div>收费日期：<span style="display:inline-block;">{{infos.order.setl_time ? infos.order.setl_time.split(' ')[0] : ''}}</span>
               </div>
             </div>
             <div style="float:right">金额单位：元</div>
@@ -121,22 +121,24 @@
                     </div>
                   </div>
                 </td>
-                <td>合计: {{infos.order.medfee_sumamt}}元</td>
+                <td>合计: {{infos.medfee_sumamt}}元</td>
               </tr>
               <tr>
                 <td colspan="7">
                   <div style="display:flex;flez-wrap:wrap;margin-bottom:10px;font-size:16px;">
-                    <div style="width:33%;">医疗费总额：{{infos.order.medfee_sumamt}}元</div>
-                    <div style="width:33%;">基金支付金额：{{infos.order.hifp_pay}}元</div>
-                    <div style="width:33%;">个人账户支付金额：{{infos.order.acct_pay}}元</div>
+                    <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.acct_pay?infos.order.acct_pay:""}}元</div>
 
                   </div>
                   <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                    <div style="width:33%;">医疗救助基金金额：{{infos.order.maf_pay}}元</div>
-
-                    <div style="width:33%;">个人支付金额：{{ infos.order.psn_pay }}元</div>
+                    <div style="width:33%;">医疗救助基金金额：{{infos.order.maf_pay?infos.order.maf_pay:""}}元</div>
+                    <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>
                 </td>
                 <td style="font-size:16px;">合计：{{infos.order.medfee_sumamt}}元</td>
               </tr>

src/xt_pages/outpatientCharges/statementTemplate/printThree.vue

@@ -123,16 +123,18 @@
                         <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.hifp_pay?info.hifp_pay:info.new_order.hifp_pay}}元</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.acct_pay?info.acct_pay:info.new_order.acct_pay}}元</div>
 
                             </div>
                             <div style="display:flex;flez-wrap:wrap;font-size:16px;">
-                              <div style="width:33%;">医疗救助基金金额：{{info.maf_pay?info.maf_pay:info.new_order.maf_pay}}元</div>
-
-                              <div style="width:33%;">个人支付金额：{{ info.new_order.psn_cash_pay}}元</div>
+                                <div style="width:33%;">医疗救助基金金额：{{info.maf_pay?info.maf_pay:info.new_order.maf_pay}}元</div>
+                                <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>
                         </td>
                         <td style="font-size:16px;">合计：{{info.new_order.medfee_sumamt}}元</td>
                     </tr>

src/xt_pages/outpatientCharges/summary.vue

@@ -107,7 +107,7 @@
                       <el-button slot="reference" style="margin:0 10px;" type="primary" size="small">打印</el-button>
 
                     </el-popover> -->
-          <el-button  v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278" size="small" type="primary" @click="batch_print_settlte">批量打印结算单
+          <el-button  v-if="$store.getters.xt_user.org_id == 10138 || $store.getters.xt_user.org_id == 10278 || $store.getters.xt_user.org_id == 0" size="small" type="primary" @click="batch_print_settlte">批量打印结算单
           </el-button>
           <el-button size="small" type="primary" @click="export_detail"
           >报表下载