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

src/views/layout/Layout.vue

@@ -17,11 +17,11 @@
           <p>透析管理</p>
         </div>
 
-         <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">
-           <i class="iconfont icon-kccx navIcon"></i>
-           <p>采购管理</p>
-        </div>
-        
+<!--         <div v-if="caigouShow" :class="index == 5 ? 'navOne navActive' : 'navOne'" @click="clickActive(5,'采购管理')">-->
+<!--           <i class="iconfont icon-kccx navIcon"></i>-->
+<!--           <p>采购管理</p>-->
+<!--        </div>-->
+
         <div v-if="kucunShow" :class="index == 3 ? 'navOne navActive' : 'navOne'" @click="clickActive(3,'库房管理')">
           <i class="iconfont icon-kccx navIcon"></i>
           <p>库房管理</p>

src/xt_pages/hospitalStation/newStatementPrint.vue

@@ -13,7 +13,7 @@
     </template>
 
     <div class='dialysisPage' style="padding-top:40px;">
-      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin"></printOne>
+      <printOne :info="info" :p_admin="p_admin" :charge_admin="charge_admin" :his="his" :his_hospital="his_hospital"></printOne>
     </div>
   </div>
 </template>
@@ -59,6 +59,8 @@
         info:null,
         p_admin:{},
         charge_admin:{},
+        his:{},
+        his_hospital:{},
       };
     },
     methods:{
@@ -176,6 +178,8 @@
                 that.p_admin = response.data.data.printor_admin;
                 that.charge_admin = response.data.data.charge_admin;
 
+                that.his = response.data.data.his;
+                that.his_hospital = response.data.data.his_hospital;
 
                 that.info['p_admin'] =  that.p_admin;
                 that.info['charge_admin'] =  that.charge_admin;

src/xt_pages/hospitalStation/statementTemplate/printOne.vue

@@ -77,7 +77,7 @@
         <td>单位名称</td>
         <td colspan="5">{{info.emp_name}}</td>
         <td width="80">联系电话</td>
-        <td width="110">{{}}</td>
+        <td width="110"></td>
         <td width="80">身份证号</td>
         <td colspan="3">{{info.certno}}</td>
       </tr>
@@ -128,7 +128,7 @@
       <tr>
         <td colspan="12" style="text-align:left;padding-left:10px;">
           本次就医：总费用{{info.medfee_sumamt}}元，基金支付{{info.fund_pay_sumamt}}元，个人支付{{info.psn_pay}}元。
-          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{info.psn_pay - info.preselfpay_amt}} )
+          (起付线 {{info.act_pay_dedc}}元, 先自付 {{info.preselfpay_amt}}元, 段内自付 {{(info.psn_pay - info.preselfpay_amt).toFixed(2)}} )
         </td>
       </tr>
       <tr>
@@ -278,6 +278,13 @@
         <td colspan="3" style="text-align:left;padding-left:10px;">公务员基金支付</td>
         <td colspan="3">{{info.cvlserv_pay}}</td>
       </tr>
+
+      <tr>
+        <td colspan="3" style="text-align:left;padding-left:10px;">其他基金支付</td>
+        <td colspan="3">{{info.oth_pay}}</td>
+        <td colspan="3" style="text-align:left;padding-left:10px;">个人账户支付</td>
+        <td colspan="3">{{info.acct_pay}}</td>
+      </tr>
       <tr>
         <td>收款人:</td>
         <td colspan="2">{{info.charge_admin.user_name}}</td>
@@ -320,7 +327,17 @@
         type: Object,
         default: function() {
           return {}
-        }
+        },
+      },his: {
+        type: Object,
+        default: function() {
+          return {}
+        },
+      },his_record: {
+        type: Object,
+        default: function() {
+          return {}
+        },
       }
     },methods:{
       getDay(dateString1,dateString2){