Commit 58829b4a authored by suqh's avatar suqh

Merge branch 'func-eccs-2152' into test

parents 0f66ee66 17a4e081
...@@ -146,7 +146,7 @@ export default { ...@@ -146,7 +146,7 @@ export default {
{ title: "收费时间", dataIndex: "receiptDate", width: 180 }, { title: "收费时间", dataIndex: "receiptDate", width: 180 },
{ title: "账单编号", dataIndex: "receiptNo", width: 180 }, { title: "账单编号", dataIndex: "receiptNo", width: 180 },
{ title: "账单类型", dataIndex: "receiptTypeStr", width: 130 }, { title: "账单类型", dataIndex: "receiptTypeStr", width: 130 },
{ title: "状态", dataIndex: "status", width: 130 }, { title: "状态", dataIndex: "status", width: 130,scopedSlots: { customRender: "status" } },
{ title: "病历号", dataIndex: "mrnNo",width: 180}, { title: "病历号", dataIndex: "mrnNo",width: 180},
{ title: "客户姓名",dataIndex: "patientName",width: 120,}, { title: "客户姓名",dataIndex: "patientName",width: 120,},
{ title: "保险公司", dataIndex: "payorName", width: 200 }, { title: "保险公司", dataIndex: "payorName", width: 200 },
......
...@@ -262,7 +262,7 @@ export default { ...@@ -262,7 +262,7 @@ export default {
{ title: "保险卡号", dataIndex: "memberCardNo", width: 180 }, { title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
{ title: "客户生日", dataIndex: "birthday", width: 160 }, { title: "客户生日", dataIndex: "birthday", width: 160 },
{ title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136}, { title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
{ title: "状态", dataIndex: "status", key:"status",align:'center', width: 136}, { title: "状态", dataIndex: "status", key:"status",align:'center', width: 136,scopedSlots: { customRender: "status" } },
{ title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 250 }, { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 250 },
{ title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' }, { title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
{ title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' }, { title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
......
...@@ -168,6 +168,9 @@ ...@@ -168,6 +168,9 @@
:scroll="{ x: true, y: 450 }" :scroll="{ x: true, y: 450 }"
:pagination="false" :pagination="false"
> >
<template slot="status" slot-scope="text">
{{ text==1?'有效':text==2?'无效':'' }}
</template>
<template slot="operation" slot-scope="text, record, index"> <template slot="operation" slot-scope="text, record, index">
<a-button <a-button
type="link" type="link"
...@@ -242,6 +245,9 @@ ...@@ -242,6 +245,9 @@
onSelectAll: onSelectAll, onSelectAll: onSelectAll,
}" }"
> >
<template slot="status" slot-scope="text">
{{ text==1?'有效':text==2?'无效':'' }}
</template>
</a-table> </a-table>
<BurtPagination <BurtPagination
:pagination="pagination" :pagination="pagination"
...@@ -335,7 +341,8 @@ export default { ...@@ -335,7 +341,8 @@ export default {
title: "账单状态", title: "账单状态",
dataIndex: "status", dataIndex: "status",
ellipsis: true, ellipsis: true,
width: 150, width: 150
,scopedSlots: { customRender: "status" }
}, },
{ title: "病历号", dataIndex: "mrnNo", ellipsis: true, width: 195 }, { title: "病历号", dataIndex: "mrnNo", ellipsis: true, width: 195 },
{ {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment