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/dialysis/template/DialysisPrintOrderFortySix.vue

@@ -1244,7 +1244,7 @@
                               monitor.operate_time < dialysisOrder.start_time)
                           "
                         >
-                          {{
+                         {{
                             monitor.ultrafiltration_volume
                               ? monitor.ultrafiltration_volume
                               : ""

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){

src/xt_pages/outpatientDoctorStation/pastInquiries.vue

@@ -14,9 +14,9 @@
                         format="yyyy-MM-dd"
                         value-format="yyyy-MM-dd"
                         placeholder="选择日期时间" align="right"></el-date-picker>
-        <!-- <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(1)">处方筏批量打印</el-button>
         <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(2)">治疗单批量打印</el-button>
-        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button> -->
+        <el-button size="small" style="margin:0 10px;" class="filter-item" type="primary" @click="batchPrint(3)">检验单批量打印</el-button>
       </div>
       <el-table :data="tableData" border ref="table" style="width: 100%;" :row-style="{ color: '#303133' }" @selection-change="handleSelectionChange"
                 :header-cell-style="{backgroundColor: 'rgb(245, 247, 250)',color: '#606266'}" highlight-current-row>

src/xt_pages/outpatientDoctorStation/template/printSix.vue

@@ -26,9 +26,9 @@
 
         <div class="infoTitle" style="border-bottom: 1px solid #000">
           <p style="width: 174px">科室：{{ item.info ? getDepart(item.info.departments) : "" }}</p>
-          <p style="width: 176px">费别：</p>
-          <p style="width: 198px" v-if="hisPatient.number.length <= 11">
-            门诊号：{{ hisPatient.number ? hisPatient.number : "" }}
+          <p style="width: 150px">费别：</p>
+          <p style="width: 210px" v-if="hisPatient.number.length <= 11">
+            门诊号：12345678912{{ hisPatient.number ? hisPatient.number : "" }}
           </p>
 
           <p style="text-align: right; width: 155px">
@@ -50,14 +50,14 @@
           </p>
         </div>
         <div class="infoTitle" style="border-bottom: 1px solid #000">
-          <p>姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
-          <p>
+          <p style="width: 150px;">姓名：{{ item.patient.name ? item.patient.name : "" }}</p>
+          <p style="width: 145px;">
             性别：
             <span v-if="item.patient.gender == 1">男</span>
             <span v-if="item.patient.gender == 2">女</span>
           </p>
-          <p>年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
-          <p>电话：{{ item.patient.phone }}</p>
+          <p style="width: 135px;">年龄：{{ getAge(item.patient) ? getAge(item.patient) : "" }}岁</p>
+          <p style="max-width: 150px;text-align: right;">电话：{{ item.patient.phone }}</p>
         </div>
         <div class="infoTitle" style="border-bottom: 1px solid #000">
           <p style="width:100%">地址：{{ item.patient.home_address }}</p>
@@ -138,7 +138,7 @@
               }}元/{{ it.count }}次
             </div>
           </div>
-          <div style="text-align: center">(以下空白)</div>
+          <!-- <div style="text-align: center">(以下空白)</div> -->
         </div>
 
         <div class="infoTitle"></div>
@@ -462,10 +462,10 @@ export default {
   font-size: 22px;
   text-align: center;
   font-weight: bold;
-  display: flex;
+  // display: flex;
   position: relative;
   left: 50%;
-  transform: translateX(-50px);
+  transform: translateX(-50%);
 }
 .infoTitle_thin {
   display: flex;