Merge branch 'master' of http://140.143.162.39:3000/shentun/peisweb

src/components/report/BtnReport.vue

@@ -469,6 +469,7 @@ export default {
                             console.log('toOutShell', jsonToOutShell)
                             let res = await this.$peisAPI.upLoadReportPdf(jsonToOutShell)
                             if (JSON.parse(res).code < 0) {
+                                this.$message.error({ showClose: true, message: res.message });
                                 console.log('$peisAPI.upLoadReportPdf err', res)
                             } else {
                                 // 上传成功 ，更新上传传状态

src/views/fee-settings/cardRegister.vue

@@ -152,6 +152,8 @@
             ? 210
             : Math.floor((window.pageHeight - 300) / 2)
             " row-key="id" highlight-current-row ref="cardBillList" @selection-change="handleSelectionChange">
+            <el-table-column prop="patientRegisterNo" label="条码号" />
+            <el-table-column prop="patientName" label="姓名" />
             <el-table-column prop="payModeId" label="支付方式">
               <template slot-scope="scope">
                 <div>