Commit d426f58e authored by 金王方-del's avatar 金王方-del

Merge branch 'func_eccs_2264' into 'test'

fix: 问题修改

See merge request !48
parents b5917e13 8d8a582f
......@@ -16,7 +16,7 @@
</a-col>
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear disabled>
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear showSearch disabled>
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
{{ item.longName }}
</a-select-option>
......
......@@ -11,7 +11,7 @@
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allowClear>
<a-select v-model="form.payorCode" placeholder="请选择保险公司" showSearch allowClear>
<a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
......
......@@ -7,7 +7,7 @@
<a-row :gutter="30">
<a-col :lg="8" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear :disabled="!isEdit">
<a-select v-model="form.payorCode" placeholder="请选择保险公司" allow-clear showSearch :disabled="!isEdit">
<a-select-option v-for="item in companyOptions" :key="item.id" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
......@@ -256,20 +256,20 @@ export default {
computed: {
columns() {
const base = [
{ title: "账单日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
{ title: "账单日期", dataIndex: "receiptDate", width: 160,fixed: "left",scopedSlots: { customRender: "receiptDate" } },
{ title: "状态", dataIndex: "status", key:"status",align:'center',fixed: "left", width: 136,scopedSlots: { customRender: "status" } },
{ title: "客户姓名", dataIndex: "patientName",fixed: "left", width: 160 },
{ title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
{ title: "客户姓名", dataIndex: "patientName", width: 160 },
{ title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 250 },
{ title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
{ title: "客户生日", dataIndex: "birthday", width: 160 },
{ title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",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: "doctorName", width: 100, align: 'center' },
{ title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
{ title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
{ title: "减免金额", dataIndex: "reduceAmount", width: 100, align: 'center' },
{ title: "客户自付", dataIndex: "selfpaidAmount", width: 100, align: 'center' },
{ title: "理赔金额", dataIndex: "actualAmount", width: 100, align: 'center' },
{ title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
];
if(this.sendBatchNo && ! this.isEditNewBill && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
return base.concat([
......
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