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/settlementPrint.vue

@@ -1,14 +1,14 @@
 <template>
   <div>
     <template>
-      <el-button
+      <el-buttonc
         style="position:fixed;right:25px;z-index:999"
         :loading="loading"
         size="small"
         icon="el-icon-printer"
         @click="printThisPage"
         type="primary"
-        >打印</el-button
+        >打印</el-buttonc
       >
     </template>
     <div class="app-container" style="padding-top:40px;">

src/xt_pages/outpatientCharges/costComparison.vue

@@ -1,4 +1,4 @@
-<template>
+c<template>
     <div class="main-contain incomeStatistics">
         <div class="position">
             <bread-crumb :crumbs='crumbs'></bread-crumb>

src/xt_pages/outpatientCharges/outpatientChargesManagement.vue

@@ -135,7 +135,7 @@
                             <div style="margin-bottom:10px;float: right">
                               <div>
                                 <el-button
-                                    v-if="(hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
+                                    v-if="(hisPatientInfo.balance_accounts_type == 1 && hisPatientInfo.id > 0 &&  items.prescriptions[0].order.id == 0)"
                                     size="small"
                                     @click="open(8,items.med_type,items.prescriptions[0].order,items.prescriptions)"
                                     type="primary"

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>

src/xt_pages/supply/components/addSupply.vue

@@ -318,8 +318,11 @@ export default {
         this.title = "编辑供应商";
         this.supplier.supplierCode = data.SupplierCode;
         this.supplier.supplierName = data.SupplierName;
-        this.supplier.supplierType = data.SupplierType;
-
+        if (data.SupplierType == 0){
+          this.supplier.supplierType = ""
+        }else {
+          this.supplier.supplierType = data.SupplierType;
+        }
         this.supplier.vatRate = data.VatRate;
         this.supplier.number = data.Number;
         this.supplier.bank = data.Bank;