Skip to content

B
bims
Commit 778c0805 authored by 周留芳's avatar 周留芳
Browse files
Options

商保系统回款功能修改

parent a0d63754
Show whitespace changes
Inline Side-by-side
Showing with 166 additions and 153 deletions
src/api/apis_moudles/verification.js
View file @ 778c0805
......@@ -15,7 +15,7 @@ export default {
queryBackReceiptList: "/backstage/auth/queryBackReceiptList", //回销关联账单列表查询
queryReceiptInfoList: "/backstage/auth/queryReceiptInfoList", //回销账单列表查询
deleteReceiptRecord: "/backstage/auth/deleteBackReceipt", // 删除已关联账单
exportBackMoneyReport: "/backstage/auth/exportBackMoneyReport", // 回款列表导出
exportBackMoneyReport: "/backstage/auth/backMoneyListExport", // 回款列表导出
exportBackReceiptList: "/backstage/auth/exportBackReceiptList", // 关联账单列表导出
};
src/utils/utilsdictOptions.js
View file @ 778c0805
......@@ -52,6 +52,11 @@ const MoneyUnitOptions = [
{ name: '欧元', value: '04'},
];
// 账单类型
const receiptTypeOptions = [
{ name: '收费', value: '1'},
{ name: '退费', value: '2'},
];
module.exports = {
......@@ -62,4 +67,5 @@ module.exports = {
ApplyStatusOptions,
ApproveStatusOptions,
MoneyUnitOptions,
receiptTypeOptions
}
\ No newline at end of file
src/views/charge-query/detail.vue
View file @ 778c0805
......@@ -4,26 +4,17 @@
<Goback title="账单详情" />
<a-form-model ref="form" layout="vertical" :model="form">
<a-row :gutter="30">
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="病历号">
<a-input v-model="form.mrnNo" placeholder="请输入病历号" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="客户姓名">
<a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="客户类型">
<a-select v-model="form.patientType" placeholder="请选择客户类型" allowClear>
<a-select-option v-for="item in patientTypeOptions" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
......@@ -32,7 +23,7 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="看诊医生">
<a-select v-model="form.doctorCode" placeholder="请选择看诊医生" allowClear>
<a-select-option v-for="item in doctorOptions" :key="item.doctorCode" :value="item.doctorCode">
......@@ -42,19 +33,10 @@
</a-form-model-item>
</a-col>
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="就诊时间">
<a-form-model-item label="收费时间">
<a-date-picker value-format="YYYY-MM-DD 00:00:00" v-model="form.receiptDate" placeholder="就诊时间" />
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="6" :sm="12">
<a-form-model-item label="支付方式">
<a-select v-model="form.paymentCode" placeholder="请选择支付方式" allowClear>
<a-select-option v-for="item in paymentOptions" :key="item.code" :value="item.code" allow-clear>
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="16" :lg="12" :sm="12" class="none-label">
<a-form-model-item label="button">
<!-- <a-button>更新数据</a-button>
......@@ -258,7 +240,20 @@ export default {
this.$apis.GETCOMPANYOPTIONS().then((res) => {
console.log("获取保险公司下拉选项", res);
if (res.returnCode == "0000") {
this.companyOptions = res.content || [];
let existPayor = false
this.companyOptions = res.content.map(item => {
item.id = Number(item.id)
if(item.id === this.form.payorId) {
existPayor = true
}
return item
}) || [];
if(!existPayor) {
this.companyOptions.push({
id: this.form.payorId,
longName: this.form.payorName
})
}
} else {
this.$message.error(res.returnMsg);
}
......
src/views/charge-query/index.vue
View file @ 778c0805
......@@ -4,26 +4,17 @@
<!-- form -->
<a-form-model ref="form" layout="vertical" :model="form">
<a-row :gutter="30">
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="病历号">
<a-input v-model="form.mrnNo" placeholder="请输入病历号" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="客户姓名">
<a-input v-model="form.patientName" placeholder="请输入客户姓名" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="客户类型">
<a-select v-model="form.patientType" placeholder="请选择客户类型" allowClear>
<a-select-option v-for="item in patientTypeOptions" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear>
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
......@@ -32,7 +23,7 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="看诊医生">
<a-select v-model="form.doctorCode" placeholder="请选择看诊医生" allowClear>
<a-select-option v-for="item in doctorOptions" :key="item.doctorCode" :value="item.doctorCode">
......@@ -41,21 +32,12 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="5" :lg="6" :sm="12">
<a-form-model-item label="就诊时间">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="收费时间">
<a-range-picker format="YYYY-MM-DD" v-model="form.dateRange" :placeholder="['开始时间','结束时间']" @change="onSelectVisitTime" />
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="6" :sm="12">
<a-form-model-item label="支付方式">
<a-select v-model="form.paymentCode" placeholder="请选择支付方式" allowClear>
<a-select-option v-for="item in paymentOptions" :key="item.code" :value="item.code" allow-clear>
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="6" :sm="12">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="是否已关联寄送单">
<a-select v-model="form.isSend" placeholder="请选择是否已关联寄送单" allowClear>
<a-select-option value="Y" allow-clear>
......@@ -67,9 +49,9 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="6" :sm="12">
<a-form-model-item label="是否已关联EOB">
<a-select v-model="form.isEob" placeholder="请选择是否已关联EOB" allowClear>
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="是否已回款">
<a-select v-model="form.isEobBack" placeholder="请选择是否已回款" allowClear>
<a-select-option value="Y" allow-clear>
是
</a-select-option>
......@@ -79,19 +61,21 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="6" :sm="12">
<a-form-model-item label="是否已回款">
<a-select v-model="form.isEobBack" placeholder="请选择是否已回款" allowClear>
<a-select-option value="Y" allow-clear>
是
</a-select-option>
<a-select-option value="N" allow-clear>
否
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="账单类型">
<a-select v-model="form.receiptType" placeholder="请选择账单类型" allowClear>
<a-select-option v-for="item in receiptTypeOptions" :key="item.value" :value="item.value">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="3" :sm="3" class="none-label">
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="账单编号">
<a-input v-model="form.receiptNo" placeholder="请输入账单编号" allow-clear />
</a-form-model-item>
</a-col>
<a-col :xl="8" :lg="3" :sm="3" class="none-label">
<a-form-model-item label="button">
<!-- <a-button>更新数据</a-button> -->
<!-- <a-button class="mar-left10" type="primary" @click="addNewCharge">
......@@ -141,34 +125,35 @@
import BurtPagination from "@/components/CUSTOMER/pagation";
import { mapState } from "vuex"
import moment from "moment";
import { receiptTypeOptions } from '@/utils/utilsdictOptions.js';
import { exportFile } from '@/utils/index';
export default {
data() {
const columns = [
{ title: "序号", dataIndex: "index", key:"index",align:'center', width: 80,scopedSlots: { customRender: "index" }},
{ title: "收费时间", dataIndex: "receiptDate", width: 180 },
{ title: "账单编号", dataIndex: "receiptNo", width: 180 },
{ title: "账单类型", dataIndex: "receiptTypeStr", width: 130 },
{ title: "病历号", dataIndex: "mrnNo",width: 180},
{ title: "客户姓名",dataIndex: "patientName",width: 120,},
{ title: "客户类型", dataIndex: "patientType", width: 180 },
{ title: "保险公司", dataIndex: "payorName", width: 200 },
{ title: "就诊医生", dataIndex: "doctorName", width: 150 },
{ title: "是否已关联寄送单", dataIndex: "isSend", width: 180,scopedSlots: { customRender: "isSend" } },
{ title: "是否已关联EOB", dataIndex: "isEob", width: 180,scopedSlots: { customRender: "isEob" } },
{ title: "是否已回款", dataIndex: "isEobBack", width: 180,scopedSlots: { customRender: "isEobBack" } },
{ title: "应收金额", dataIndex: "chargeAmount", width: 180 },
{ title: "折扣（%）", dataIndex: "discountAmount", width: 180 },
{ title: "减免金额", dataIndex: "reduceAmount", width: 180 },
{ title: "客户自付", dataIndex: "selfpaidAmount", width: 180 },
{ title: "减免金额", dataIndex: "reduceAmount1", width: 180 },
{ title: "理赔金额", dataIndex: "actualAmount", width: 180 },
{ title: "保险已支付", dataIndex: "insurancePaidAmount", width: 180 },
{ title: "未清余额", dataIndex: "outstandAmount", width: 180 },
{ title: "保险已支付", dataIndex: "backAmount", width: 180 },
{ title: "保险欠费", dataIndex: "insuranceArrearsAmount", width: 180 },
{ title: "个人欠费", dataIndex: "personalArrearsAmount", width: 180 },
{ title: "账单编号", dataIndex: "receiptNo", width: 180 },
{ title: "个人欠费", dataIndex: "arrearsAmount", width: 180 },
{ title: "未清余额", dataIndex: "residueBackAmount", width: 180 },
{ title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }, align: "center"},
];
return {
columns,
receiptTypeOptions,
form: {},
pageForm: {
doctorCode: "",
......@@ -178,6 +163,8 @@ export default {
payorId: 0,
visitTimeEnd: "",
visitTimeStart: "",
receiptType: "",
receiptNo: ""
},
patientTypeOptions: [
{
......@@ -199,6 +186,10 @@ export default {
pageSize: 10,
total: 0,
},
receiptTypeDict: {
'1': '收费',
'2': '退费'
}
};
},
components: {
......@@ -223,7 +214,10 @@ export default {
};
this.$apis.GETCHARGELIST(data).then((res) => {
let content = res.content || {};
this.dataList = content.list || [];
this.dataList = content.list.map(item => {
item.receiptTypeStr = this.receiptTypeDict[item.receiptType] || ''
return item
}) || [];
this.pagination.total = content.total || 0;
});
},
......
src/views/charge-query/lpjManageDetail.vue
View file @ 778c0805
......@@ -76,8 +76,8 @@
<a-form-model ref="form" layout="vertical" :model="searchForm">
<a-row :gutter="30">
<a-col :lg="8" :sm="12">
<a-form-model-item label="就诊日期">
<a-range-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="searchForm.visitTimeStart" :placeholder="['选择就诊开始日期', '选择就诊结束日期']" />
<a-form-model-item label="账单日期">
<a-range-picker format="YYYY-MM-DD" value-format="YYYY-MM-DD" v-model="searchForm.visitTimeStart" :placeholder="['选择账单开始日期', '选择账单结束日期']" />
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
......@@ -229,7 +229,7 @@ export default {
computed: {
columns() {
const base = [
{ title: "就诊日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
{ title: "账单日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
{ title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
{ title: "客户姓名", dataIndex: "patientName", width: 160 },
{ title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
......@@ -238,9 +238,9 @@ export default {
{ title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 250 },
{ title: "应收金额", dataIndex: "chargeAmount", width: 100, align: 'center' },
{ title: "折扣金额", dataIndex: "discountAmount", width: 100, align: 'center' },
{ title: "减免金额", dataIndex: "discountAmount2", width: 100, align: 'center' },
{ title: "减免金额", dataIndex: "reduceAmount", width: 100, align: 'center' },
{ title: "客户自付", dataIndex: "selfpaidAmount", width: 100, align: 'center' },
{ title: "理赔金额", dataIndex: "paidAmount", width: 100, align: 'center' },
{ title: "理赔金额", dataIndex: "actualAmount", width: 100, align: 'center' },
];
if(this.sendBatchNo && ! this.isEditNewBill && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
return base.concat([
......
src/views/verification/collection.vue
View file @ 778c0805
......@@ -57,6 +57,11 @@
<a-input v-model="form.backAmountCny" placeholder="回款金额" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="回款编号">
<a-input v-model="form.backMoneyNo" placeholder="回款编号" />
</a-form-model-item>
</a-col>
<a-col :md="24" class="none-label">
<a-form-model-item label="button">
<a-button class="mar-left10" type="primary" @click="handlerSearch">
......@@ -153,6 +158,7 @@ export default {
endDate: "",
backStatus: "",
backAmountCny: "", // 回款金额
backMoneyNo: "", // 回款编号
},
dataList: [],
companyOptions: [], //保险公司
......
src/views/verification/collectionDetail.vue
View file @ 778c0805
......@@ -165,7 +165,7 @@
class="table-content"
:columns="selectedColumns"
:data-source="selectedRows"
:scroll="{ x: true, y: 300 }"
:scroll="{ x: true, y: 450 }"
:pagination="false"
>
<template slot="operation" slot-scope="text, record, index">
......@@ -343,7 +343,7 @@ export default {
title: "账单日期",
dataIndex: "receiptDate",
ellipsis: true,
width: 150,
width: 180,
},
{
title: "收银",
......@@ -352,7 +352,7 @@ export default {
width: 120,
},
{
title: "账单金额",
title: "理赔账单金额",
dataIndex: "actualAmount",
ellipsis: true,
width: 150,
......@@ -363,6 +363,12 @@ export default {
ellipsis: true,
width: 150,
},
{
title: "个人欠费",
dataIndex: "arrearsAmountShow",
ellipsis: true,
width: 150,
},
{
title: "未清余额",
dataIndex: "residueBackAmount",
......@@ -393,7 +399,7 @@ export default {
);
},
};
base[7] = {
base[8] = {
title: "未清余额",
dataIndex: "residueBackAmount",
ellipsis: true,
......@@ -404,13 +410,7 @@ export default {
return Number(residueBackAmount.toFixed(2));
},
};
base.splice(6, 0, {
title: "余末金额",
dataIndex: "currentReceiptAmount",
ellipsis: true,
width: 150,
});
base.splice(7, 0, {
base[7] = {
title: "个人欠费",
dataIndex: "arrearsAmount",
ellipsis: true,
......@@ -427,6 +427,12 @@ export default {
/>
);
},
};
base.splice(6, 0, {
title: "余末金额",
dataIndex: "currentReceiptAmount",
ellipsis: true,
width: 150,
});
base.push({
title: "回款日期",
......@@ -639,7 +645,11 @@ export default {
if (res.returnCode == "0000") {
let content = res.content || {};
this.pagination.total = content.total || 0;
this.dataList = content.list || [];
this.dataList = content.list.map(item => {
item.arrearsAmountShow = item.arrearsAmount
item.arrearsAmount = ''
return item
}) || [];
} else {
this.$message.error(res.returnMsg);
}
......@@ -668,10 +678,12 @@ export default {
return {
id: item.id,
backAmount: item.backAmount,
arrearsAmount: item.arrearsAmount,
};
});
const valid = receiptVoList.some((item) => {
return !item.backAmount;
const exist = !item.backAmount && item.backAmount !== 0
return exist;
});
if (valid) {
this.$message.warning("存在关联账单未输入回款金额");
......@@ -813,7 +825,7 @@ export default {
}
}
.bill-content {
height: calc(100vh - 256px);
height: calc(100vh - 338px);
overflow-y: auto;
overflow-x: hidden;
padding-right: 12px;
......
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