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

src/xt_pages/hospitalStation/invoicePrint.vue

@@ -19,9 +19,9 @@
           "
           :paramsObj="invoiceParams"
         ></printOne>
-        <printTwo v-if="org_id == 10215" :paramsObj="invoiceParams"></printTwo>
+        <printTwo v-if="org_id == 10215 ||  org_id == 0" :paramsObj="invoiceParams"></printTwo>
         <printThree
-          v-if="org_id == 10265 || org_id == 4 || org_id == 9675|| org_id == 0"
+          v-if="org_id == 10265 || org_id == 4 || org_id == 9675"
           :paramsObj="invoiceParams"
         ></printThree>
       </div>

src/xt_pages/hospitalStation/invoiceTemplate/printThree.vue

@@ -29,9 +29,6 @@
           <div  style="position: absolute;left:650px;top:70px;" v-if="insutype == '310'">
             类别：职工基本医疗保险
           </div>
-          <div  style="position: absolute;left:400px;top:70px;" v-else>
-            类别：
-          </div>
         </div>
 
         <div style="display:flex;justify-content: space-between;">

src/xt_pages/hospitalStation/invoiceTemplate/printTwo.vue

@@ -36,8 +36,8 @@
             <div v-if=" gend == 1" style="position: absolute;top:110px;left:100px;">√</div>
             <div v-else style="position: absolute;top:110px;left:140px;">√</div>
 
-            <div style="position: absolute;top:110px;left:260px;">{{ number.length <= 13 ? (totalPrice - list.order.psn_cash_pay).toFixed(2) : '0.00' }}</div>
-            <div style="position: absolute;top:110px;left:420px;">{{ number.length <= 13 ? list.order.psn_cash_pay.toFixed(2) : (totalPrice - list.psn_cash_money).toFixed(2) }}</div>
+            <div style="position: absolute;top:110px;left:260px;">{{balance_accounts_type != 2 ?  list.order.fund_pay_sumamt : '0.00' }}</div>
+            <div style="position: absolute;top:110px;left:420px;">{{balance_accounts_type != 2 ? list.order.psn_cash_pay : list.order.medfee_sumamt}}</div>
             <div style="position: absolute;top:110px;left:540px;">现金</div>
         </div>
         <div style="display:flex;justify-content: space-between;">
@@ -113,7 +113,7 @@
                     {{zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) == '佰' ||  !zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾'))? '壹' : zhongwen.substring(zhongwen.indexOf('拾') - 1,zhongwen.indexOf('拾')) }}
                 </span>
                 <span v-else>零</span>
-            </span> 
+            </span>
             <span  style="position: absolute;top:235px;left:350px">
                 <span v-if="zhongwen.indexOf('元') > -1 && zhongwen.substring(this.zhongwen.indexOf('元') - 1).substring(0,1)!= '拾'">
                     {{ zhongwen.substring(zhongwen.indexOf('元') - 1,zhongwen.indexOf('元')) }}

src/xt_pages/hospitalStation/settlementTemplate/hospitalSettlePrint.vue

@@ -47,7 +47,7 @@
               </div>
               <div class="inline_block">性别
                  <div style="width:80px;" class="under_line" v-if="info.gend == '1'">{{'男'}}</div>
-                 <div style="width:80px;" class="under_line" v-if="info.gend == '2'">{{'女'}}</div>
+                 <div style=" width:80px;" class="under_line" v-if="info.gend == '2'">{{'女'}}</div>
               </div>
               <div class="inline_block">出生日期
                 <div style="width:40px;" class="under_line">{{info.brdy.slice(0,4)}}</div>年
@@ -674,6 +674,7 @@
                 <td>&nbsp;{{getAllJiaTotal()}}</td>
                 <td>&nbsp;{{getAllYiTotal()}}</td>
                 <td>
+                  {{getAllBingTotal()}}
                 </td>
                 <td>&nbsp;</td>
               </tr>
@@ -854,6 +855,16 @@ export default {
       }
       return total.toFixed(2)
 
+    },getAllBingTotal(){
+      let total = 0.00
+      for(let i = 0; i  < this.list.length; i++){
+        total = parseFloat(total) + parseFloat(this.list[i].bingTotal)
+      }
+      if (total == 0){
+        return ""
+      }
+      return total.toFixed(2)
+
     },
 
     getJiaTotal(name){