Skip to content

B
bims
Commit 17ad2fab authored by 周留芳's avatar 周留芳
Browse files
Options

Merge branch 'func-eccs-2045' into test

parents 737cafac d19e27b2
Hide whitespace changes
Inline Side-by-side
Showing with 107 additions and 68 deletions
src/api/apis_moudles/verification.js
View file @ 17ad2fab
......@@ -12,4 +12,7 @@ export default {
saveBackMoney: "/backstage/auth/saveBackMoney", //新建回款
deleteBackMoney: "/backstage/auth/deleteBackMoney", //删除回款
eobReceipListExport: "/backstage/auth/eobReceipListExport", //EOB关联账单导出
queryBackReceiptList: "/backstage/auth/queryBackReceiptList", //回销关联账单列表查询
queryReceiptInfoList: "/backstage/auth/queryReceiptInfoList", //回销账单列表查询
};
src/api/funcs_modules/verification.js
View file @ 17ad2fab
......@@ -53,6 +53,15 @@ const EOBRECEIPLISTEXPORT = (data={}) => {
return req.post(apis.eobReceipListExport, data, { responseType: "blob" });
};
//回销关联账单列表查询
const QUERYBACKRECEIPTLIST = (data) => {
return req.post(apis.queryBackReceiptList, data);
};
//回销账单列表查询
const QUERYBACKRECEIPTINFOLIST = (data) => {
return req.post(apis.queryReceiptInfoList, data);
};
// 对象数组
export default {
QUERYEOBLIST,
......@@ -66,4 +75,6 @@ export default {
SAVEBACKMONEY,
DELETEBACKMONEY,
EOBRECEIPLISTEXPORT,
QUERYBACKRECEIPTLIST,
QUERYBACKRECEIPTINFOLIST
};
\ No newline at end of file
src/router/modules/menu.js
View file @ 17ad2fab
......@@ -14,38 +14,34 @@ export default [
path: "/customer",
title: "客户查询",
},
{
path: "/customer/edit",
title: "新建客户",
},
],
},
{
icon: "ssimanage_msg",
path: "2",
title: "福利信息管理",
children: [
{
path: "/welfare",
title: "福利查询",
}
],
},
{
icon: "ssimanage",
path: "pre-auth",
title: "预授权信息管理",
children: [
{
path: "/pre-auth",
title: "预授权查询",
},
{
path: "/pre-auth/add",
title: "新建预授权",
},
],
},
// {
// icon: "ssimanage_msg",
// path: "2",
// title: "福利信息管理",
// children: [
// {
// path: "/welfare",
// title: "福利查询",
// }
// ],
// },
// {
// icon: "ssimanage",
// path: "pre-auth",
// title: "预授权信息管理",
// children: [
// {
// path: "/pre-auth",
// title: "预授权查询",
// },
// // {
// // path: "/pre-auth/add",
// // title: "新建预授权",
// // },
// ],
// },
{
icon: "ssisearch",
path: "charge-query",
......
src/views/charge-query/index.vue
View file @ 17ad2fab
......@@ -150,8 +150,8 @@ export default {
{ title: "病历号", dataIndex: "mrnNo",width: 180},
{ title: "客户姓名",dataIndex: "patientName",width: 120,},
{ title: "客户类型", dataIndex: "patientType", width: 180 },
{ title: "保险公司", dataIndex: "payorName", width: 180 },
{ title: "就诊医生", dataIndex: "doctorName", 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" } },
......@@ -211,7 +211,6 @@ export default {
})
},
created() {
this._getChargeList();
this._getCompanyOptions();
this._getDoctorListNoPage();//获取医生下拉选项
},
......
src/views/charge-query/lpjManageDetail.vue
View file @ 17ad2fab
......@@ -229,11 +229,13 @@ export default {
computed: {
columns() {
const base = [
{ title: "就诊日期", dataIndex: "receiptDate", width: 200,scopedSlots: { customRender: "receiptDate" } },
{ title: "就诊日期", dataIndex: "receiptDate", width: 160,scopedSlots: { customRender: "receiptDate" } },
{ title: "病历号", dataIndex: "mrnNo", key:"mrnNo",align:'center', width: 136},
{ title: "客户姓名", dataIndex: "patientName", width: 98 },
{ title: "客户姓名", dataIndex: "patientName", width: 160 },
{ title: "保险卡号", dataIndex: "memberCardNo", width: 180 },
{ title: "客户生日", dataIndex: "birthday", width: 160 },
{ title: "账单编号", dataIndex: "receiptNo", key:"receiptNo",align:'center', width: 136},
{ title: "保险公司", dataIndex: "payorName", width: 110 },
{ 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' },
......
src/views/customer/info/index.vue
View file @ 17ad2fab
......@@ -32,7 +32,7 @@
</a-col>
<a-col :xl="18" :lg="18" :sm="12" class="none-label">
<a-form-model-item label="button">
<a-button type="primary" @click="addNewCustom"><Icon name="ssiadd" :size="14" />新建客户</a-button>
<!-- <a-button type="primary" @click="addNewCustom"><Icon name="ssiadd" :size="14" />新建客户</a-button> -->
<a-button class="mar-left10" type="primary" @click="handlerSearch">
<Icon name="ssisearch_active" :size="14" />查询
</a-button>
......@@ -121,7 +121,6 @@ export default {
BurtPagination,
},
created() {
this._getCustomerList();
this._getPayorCode();
},
methods: {
......
src/views/pre-auth/index.vue
View file @ 17ad2fab
......@@ -54,8 +54,8 @@
<a-button class="mar-left5" type="primary" @click="reset">
<Icon name="ssireset" :size="12" />重置
</a-button>
<a-button class="mar-left5" type="primary" @click="addPreAuth">
<Icon name="ssiadd" :size="12" />新建预授权</a-button>
<!-- <a-button class="mar-left5" type="primary" @click="addPreAuth">
<Icon name="ssiadd" :size="12" />新建预授权</a-button> -->
</a-form-model-item>
</a-col>
</a-row>
......
src/views/verification/collection.vue
View file @ 17ad2fab
......@@ -17,7 +17,12 @@
<a-input v-model="form.eobNo" placeholder="EOB编号"/>
</a-form-model-item>
</a-col>
<a-col :md="12" class="none-label">
<a-col :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 :md="24" class="none-label">
<a-form-model-item label="button">
<a-button class="mar-left10" type="primary" @click="handlerSearch">
<Icon name="ssisearch_active" :size="14" />查询
......@@ -54,8 +59,9 @@ const columns = [
{ title: "回款编号", dataIndex: "backMoneyNo", ellipsis: true, width: 150 },
{ title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 110 },
{ title: "回款金额(人民币)", dataIndex: "backAmountCny", ellipsis: true, width: 190,},
{ title: "回款金额(美元)", dataIndex: "backAmountUsd", ellipsis: true, width: 190,},
{ title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
{ title: "余额", dataIndex: "residueBackAmount", ellipsis: true, width: 130,},
{ title: "EOB编号", dataIndex: "eobNos", ellipsis: true, width: 140 },
{ title: "EOB备注", dataIndex: "eobRemark", ellipsis: true, width: 140 },
{ title: "创建时间", dataIndex: "createDate", ellipsis: true, width: 110 },
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "200px", align: "center"},
];
......@@ -66,6 +72,9 @@ export default {
form: {
payorCode: '',
eobNo: '',
dateRange: [], //创建时间范围
startDate: '',
endDate: ''
},
dataList: [],
companyOptions: [], //保险公司
......@@ -95,6 +104,9 @@ export default {
this.form = {
payorCode: '',
eobNo: '',
dateRange: [], //创建时间范围
startDate: '',
endDate: ''
}
},
// 获取保险公司下拉选项
......@@ -103,6 +115,11 @@ export default {
this.companyOptions = res.content || [];
});
},
// 选中就诊时间
onSelectVisitTime(date, dateString) {
this.form.startDate = dateString[0] + ''
this.form.endDate = dateString[1] + ''
},
handlerSearch() {
this.pagination.pageNum = 1;
this.getData();
......@@ -110,6 +127,7 @@ export default {
getData() {
this.$apis.QUERYBACKMONEYLIST({
...this.form,
dateRange: undefined,
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
})
......
src/views/verification/collectionDetail.vue
View file @ 17ad2fab
......@@ -33,8 +33,13 @@
<a-input v-model="form.backExchangeRate" placeholder="请输入金额" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="上传银行付款凭证">
<a-col :lg="5" :sm="12">
<a-form-model-item label="EOB编号">
<a-input v-model="form.eobNos" placeholder="请输入EOB编号" allow-clear :disabled="!isEdit" />
</a-form-model-item>
</a-col>
<a-col :lg="5" :sm="12">
<a-form-model-item label="上传附件">
<a-upload name="file" :multiple="false" :showUploadList="true" :disabled="!isEdit"
:fileList="fileList"
:customRequest="(file)=>uploadFile(file)"
......@@ -44,10 +49,13 @@
</a-upload>
</a-form-model-item>
</a-col>
<a-col :md="24" :lg="12" class="none-label" v-if="isEdit">
<a-col :md="24" :lg="7" class="none-label" v-if="isEdit">
<a-form-model-item label="button">
<a-button class="mar-left10" type="primary" @click="addNewEvt">
<Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />{{backMoneyNo?'保存回款':'新建回款'}}
<a-button class="mar-left10" type="primary" @click="addNewEvt(0)">
<Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />暂存
</a-button>
<a-button class="mar-left10" type="primary" @click="addNewEvt(1)">
<Icon :name="backMoneyNo?'ssibaocun':'ssiadd'" :size="14" />{{backMoneyNo?'结案':'新建回款'}}
</a-button>
</a-form-model-item>
</a-col>
......@@ -132,7 +140,8 @@ export default {
backDate: null,
backAmountCny: '',
backAmountUsd: '',
backExchangeRate: ''
backExchangeRate: '',
eobNos: '' // EOB编号
},
fileList: [], // 上传文件列表
dataList: [],
......@@ -168,22 +177,23 @@ export default {
computed: {
columns() {
const base = [
{ title: "EOB编号", dataIndex: "eobNo", scopedSlots: { customRender: 'eobNo' }, ellipsis: true, width: 150 },
{ title: "EOB名称", dataIndex: "eobName", ellipsis: true, width: 195 },
{ title: "核销时间", dataIndex: "eobBackDate", ellipsis: true, width: 110, scopedSlots: { customRender: "eobBackDate" }, },
{ title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 110 },
{ title: "EOB状态", dataIndex: "eobSts", ellipsis: true, width: 110, scopedSlots: { customRender: "eobSts" } },
{ title: "EOB赔付金额(人民币)", dataIndex: "eobAmountCny", ellipsis: true, width: 190,},
{ title: "EOB赔付金额(美元)", dataIndex: "eobAmountUsd", ellipsis: true, width: 190,},
{ title: "EOB回款金额(人民币)", dataIndex: "eobBackMoneyCny", ellipsis: true, width: 190,},
{ title: "EOB回款金额(美元)", dataIndex: "eobBackMoneyUsd", ellipsis: true, width: 190,},
{ title: "汇率差", dataIndex: "backExchangeRate", ellipsis: true, width: 110 },
{ title: "账单编号", dataIndex: "receiptNo", scopedSlots: { customRender: 'eobNo' }, ellipsis: true, width: 150 },
// { title: "病历号", dataIndex: "mrnNo", ellipsis: true, width: 195 },
{ title: "客户姓名",dataIndex: "patientName", ellipsis: true, width: 110 },
// { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 160 },
{ title: "账单日期", dataIndex: "receiptDate", ellipsis: true, width: 150 },
{ title: "收银", dataIndex: "receiptTellerName", ellipsis: true, width: 120,},
{ title: "账单金额", dataIndex: "actualAmount", ellipsis: true, width: 150,},
{ title: "回款金额", dataIndex: "backAmount", ellipsis: true, width: 150,},
{ title: "回款日期", dataIndex: "receiptDate", ellipsis: true, width: 150,},
// { title: "EOB号", dataIndex: "eobNo", ellipsis: true, width: 190 },
// { title: "EOB名称", dataIndex: "eobName", ellipsis: true, width: 160 },
];
if(this.backMoneyNo && !this.isEditNewEOB && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
return base.concat([
{ title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px", align: "center"},
])
}
// if(this.backMoneyNo && !this.isEditNewEOB && this.isEdit){ // 编辑状态下已经保存的数据才可进行操作
// return base.concat([
// { title: "操作", dataIndex: "operation", scopedSlots: { customRender: "operation" },fixed: "right", width: "170px", align: "center"},
// ])
// }
return base
}
},
......@@ -265,7 +275,7 @@ export default {
this.getData();
},
getData() {
this.$apis.QUERYBACKEOBLIST({
this.$apis.QUERYBACKRECEIPTLIST({
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
backMoneyNo: this.backMoneyNo
......@@ -285,7 +295,7 @@ export default {
addNewEOB(){
this.isEditNewEOB = !this.isEditNewEOB;
if(!this.isEditNewEOB){ //保存
this.addNewEvt()
this.addNewEvt(1)
.then(()=>{
this.isEditNewEOB = false;
})
......@@ -295,7 +305,7 @@ export default {
}
},
_getNewEOBList(){
this.$apis.QUERYEOBINFOLIST({
this.$apis.QUERYBACKRECEIPTINFOLIST({
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize
})
......@@ -311,7 +321,7 @@ export default {
});
},
//新建/保存回款
addNewEvt(){
addNewEvt(backStatus){
return new Promise((resolve,reject)=>{
if(!this.form.backAmountCny){
this.$message.warning("请输入回款金额");
......@@ -342,6 +352,7 @@ export default {
backMoneyEobList: backMoneyEobList,
backDate: this.form.backDate? moment(this.form.backDate).format('YYYY-MM-DD 00:00:00'):'',
backMoneyNo: this.backMoneyNo, //回款编号
backStatus // 0暂存 1结案
}
// 上传附件格式转换
......
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