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

src/xt_pages/outpatientCharges/invoiceTemplate/printThree.vue

@@ -105,7 +105,7 @@
             <span style="position: absolute;top:250px;left:610px">{{ totalPrice.toFixed(2) }}</span>
         </div> -->
         <div style="position: absolute;top:300px;left:80px">合计大写 {{ zhongwen }}</div>
-        <div style="position: absolute;top:300px;left:300px">合计小写 {{ list.medfee_sumamt }}</div>
+        <div style="position: absolute;top:300px;left:300px">合计小写 {{ list.psn_cash_money }}</div>
         <div>
             <!-- <div style="position: absolute;top:320px;left:120px">{{ org_name }}</div> -->
             <div style="position: absolute;top:340px;left:120px">{{ paramsObj.chargeName }}</div>

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(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(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>
       </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>