Commit a32cab76 authored by yanglilong's avatar yanglilong

Merge branch 'yanglilong' of git.ssish.com:sunhailiang/bims into test

parents c485b1d7 1deab61b
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<title><%= webpackConfig.name %></title> <title><%= webpackConfig.name %></title>
<script <script
type="text/javascript" type="text/javascript"
src="//at.alicdn.com/t/font_3020450_c8k1zo91rcb.js" src="//at.alicdn.com/t/font_3020450_5d4bvzz8pmi.js"
></script> ></script>
</head> </head>
<body> <body>
......
// 收费查询api // 收费查询api
export default { export default {
querySendInfoList: "/backstage/auth/querySendInfoList", //查询寄送列表
deleteReceiptSendInfo:"/backstage/auth/deleteReceiptSendInfo",//删除寄送信息
saveReceipSendInfo:"/backstage/auth/saveReceipSendInfo",//保存理赔件账单寄送信息
querySendReceipList:"/backstage/auth/querySendReceipList",//查询寄送包含账单列表
queryNoSendReceipList:"/backstage/auth/queryNoSendReceipList",//待寄送账单查询
getChargeList: "/backstage/auth/receiptList", getChargeList: "/backstage/auth/receiptList",
getCompanyOptions: "/backstage/auth/payorListNopage", getCompanyOptions: "/backstage/auth/payorListNopage",
getDoctorListNoPage:"/backstage/auth/doctorListNoPage",//医生列表 getDoctorListNoPage:"/backstage/auth/doctorListNoPage",//医生列表
getChargeListDetail:"/backstage/auth/receiptDetailList",//账单明细 getChargeListDetail:"/backstage/auth/receiptDetailList",//账单明细
getReceiptPaymentDetail:"/backstage/auth/receiptPaymentDetail",//账单明细 getReceiptPaymentDetail:"/backstage/auth/receiptPaymentDetail",//账单明细
queryCiReceipSendList:"/backstage/auth/queryCiReceipSendList",//理赔件账单寄送查询 queryCiReceipSendList:"/backstage/auth/queryCiReceipSendList",//理赔件账单寄送查询
saveReceipSendInfo:"/backstage/auth/saveReceipSendInfo",//保存理赔件账单寄送信息
deleteReceiptSendInfo:"/backstage/auth/deleteReceiptSendInfo",//删除寄送信息
}; };
// 核销管理api // 核销管理api
export default { export default {
queryCiReceipSendList: "/backstage/auth/queryEobReceiptList", //EOB待核销账单查询 queryEobList: "/backstage/auth/queryEobList", //EOB列表查询
queryEobReceiptList: "/backstage/auth/queryEobReceiptList", //EOB待核销账单查询
queryEobNeedReceiptList: "/backstage/auth/queryEobNeedReceiptList", //EOB待确认账单列表查询
deleteEobReceiptInfo: "/backstage/auth/deleteEobReceiptInfo", //删除EOB deleteEobReceiptInfo: "/backstage/auth/deleteEobReceiptInfo", //删除EOB
saveEobReceiptInfo: "/backstage/auth/saveEobReceiptInfo", //EOB新建 saveEobReceiptInfo: "/backstage/auth/saveEobReceiptInfo", //EOB新建
queryEobInfoList: "/backstage/auth/queryEobInfoList", //回款EOB列表查询
queryBackMoneyList: "/backstage/auth/queryBackMoneyList", //回款列表
queryBackEobList: "/backstage/auth/queryBackEobList", //回款关联EOB列表查询
queryEobInfoList: "/backstage/auth/queryEobInfoList", //待回款EOB列表查询
saveBackMoney: "/backstage/auth/saveBackMoney", //新建回款 saveBackMoney: "/backstage/auth/saveBackMoney", //新建回款
deleteBackMoney: "/backstage/auth/deleteBackMoney", //删除回款 deleteBackMoney: "/backstage/auth/deleteBackMoney", //删除回款
}; };
// 收费查询函数库 // 收费查询函数库
import apis from "../apis_moudles/"; import apis from "../apis_moudles/";
import req from "../request"; import req from "../request";
// 查询寄送列表
const QUERYSENDINFOLIST = function (data) {
return req.post(apis.querySendInfoList, data);
};
// 删除寄送信息
const DELETERECEIPTSENDINFO= function (data) {
return req.post(apis.deleteReceiptSendInfo, data);
};
// 保存理赔件账单寄送信息
const SAVERECEIPSENDINFO= function (data) {
return req.post(apis.saveReceipSendInfo, data);
};
// 查询寄送包含账单列表
const QUERYSENDRECEIPLIST = function (data) {
return req.post(apis.querySendReceipList, data);
};
// 待寄送账单查询
const QUERYNOSENDRECEIPLIST = function (data) {
return req.post(apis.queryNoSendReceipList, data);
};
// get charge list // get charge list
const GETCHARGELIST = function (data) { const GETCHARGELIST = function (data) {
return req.post(apis.getChargeList, data); return req.post(apis.getChargeList, data);
...@@ -25,22 +45,21 @@ const GETRECEIPTPAYMENTDETAIL= function (data) { ...@@ -25,22 +45,21 @@ const GETRECEIPTPAYMENTDETAIL= function (data) {
const QUERYCIRECEIPSENDLIST= function (data) { const QUERYCIRECEIPSENDLIST= function (data) {
return req.post(apis.queryCiReceipSendList, data); return req.post(apis.queryCiReceipSendList, data);
}; };
// 保存理赔件账单寄送信息
const SAVERECEIPSENDINFO= function (data) {
return req.post(apis.saveReceipSendInfo, data);
};
// 删除寄送信息
const DELETERECEIPTSENDINFO= function (data) {
return req.post(apis.deleteReceiptSendInfo, data);
};
// 对象数组 // 对象数组
export default { export default {
QUERYSENDINFOLIST,
DELETERECEIPTSENDINFO,
SAVERECEIPSENDINFO,
QUERYSENDRECEIPLIST,
QUERYNOSENDRECEIPLIST,
GETCHARGELIST, GETCHARGELIST,
GETCOMPANYOPTIONS, GETCOMPANYOPTIONS,
GETDOCTORlISTNOPAGE, GETDOCTORlISTNOPAGE,
GETCHARGELISTDETAIL, GETCHARGELISTDETAIL,
GETRECEIPTPAYMENTDETAIL, GETRECEIPTPAYMENTDETAIL,
QUERYCIRECEIPSENDLIST, QUERYCIRECEIPSENDLIST,
SAVERECEIPSENDINFO,
DELETERECEIPTSENDINFO,
}; };
...@@ -2,9 +2,17 @@ ...@@ -2,9 +2,17 @@
import apis from "../apis_moudles/verification.js"; import apis from "../apis_moudles/verification.js";
import req from "../request"; import req from "../request";
//EOB列表查询
const QUERYEOBLIST = (data) => {
return req.post(apis.queryEobList, data);
};
//EOB待核销账单查询 //EOB待核销账单查询
const QUERYCIRECEIPSENDLIST = (data) => { const QUERYEOBRECEIPTLIST = (data) => {
return req.post(apis.queryCiReceipSendList, data); return req.post(apis.queryEobReceiptList, data);
};
//EOB待确认账单列表查询
const QUERYEOBNEEDRECEIPTLIST = (data) => {
return req.post(apis.queryEobNeedReceiptList, data);
}; };
//EOB新建 //EOB新建
...@@ -17,8 +25,16 @@ const DELEOBRECEIPTINFO = (data) => { ...@@ -17,8 +25,16 @@ const DELEOBRECEIPTINFO = (data) => {
return req.post(apis.deleteEobReceiptInfo, data); return req.post(apis.deleteEobReceiptInfo, data);
}; };
//回款EOB列表查询 //回款列表
const QUERYEOBRECEIPTINFO = (data) => { const QUERYBACKMONEYLIST = (data) => {
return req.post(apis.queryBackMoneyList, data);
};
//回款关联EOB列表查询
const QUERYBACKEOBLIST = (data) => {
return req.post(apis.queryBackEobList, data);
};
//待回款EOB列表查询
const QUERYEOBINFOLIST = (data) => {
return req.post(apis.queryEobInfoList, data); return req.post(apis.queryEobInfoList, data);
}; };
...@@ -34,10 +50,14 @@ const DELETEBACKMONEY = (data) => { ...@@ -34,10 +50,14 @@ const DELETEBACKMONEY = (data) => {
// 对象数组 // 对象数组
export default { export default {
QUERYCIRECEIPSENDLIST, QUERYEOBLIST,
QUERYEOBRECEIPTLIST,
QUERYEOBNEEDRECEIPTLIST,
SAVEEOBRECEIPTINFO, SAVEEOBRECEIPTINFO,
DELEOBRECEIPTINFO, DELEOBRECEIPTINFO,
QUERYEOBRECEIPTINFO, QUERYBACKMONEYLIST,
QUERYBACKEOBLIST,
QUERYEOBINFOLIST,
SAVEBACKMONEY, SAVEBACKMONEY,
DELETEBACKMONEY, DELETEBACKMONEY,
}; };
\ No newline at end of file
...@@ -19,6 +19,11 @@ export default { ...@@ -19,6 +19,11 @@ export default {
path: "lpjManage", path: "lpjManage",
name: "chargeQueryLpjManage", name: "chargeQueryLpjManage",
component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/lpjManage.vue") component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/lpjManage.vue")
},
{
path: "lpjManageDetail",
name: "chargeQueryLpjManageDetail",
component: () => import(/* webpackChunkName: "chargeQuery" */"@/views/charge-query/lpjManageDetail.vue")
} }
] ]
}; };
...@@ -68,18 +68,10 @@ export default [ ...@@ -68,18 +68,10 @@ export default [
path: "/verification", path: "/verification",
title: "EOB管理", title: "EOB管理",
}, },
{
path: "/verification/addEOB",
title: "新建EOB数据",
},
{ {
path: "/verification/collection", path: "/verification/collection",
title: "回款管理", title: "回款管理",
}, },
{
path: "/verification/collectionAdd",
title: "新建回款管理",
},
], ],
}, },
{ {
......
...@@ -11,9 +11,9 @@ export default { ...@@ -11,9 +11,9 @@ export default {
component: () => import("@/views/verification/index"), component: () => import("@/views/verification/index"),
}, },
{ {
path: "addEOB", path: "detail",
name: "VerificationAddEOB", name: "VerificationIndexDetail",
component: () => import("@/views/verification/addEOB"), component: () => import("@/views/verification/indexDetail"),
}, },
{ {
path: "collection", path: "collection",
...@@ -21,9 +21,9 @@ export default { ...@@ -21,9 +21,9 @@ export default {
component: () => import("@/views/verification/collection"), component: () => import("@/views/verification/collection"),
}, },
{ {
path: "collectionAdd", path: "collectionDetail",
name: "VerificationCollectionAdd", name: "VerificationCollectionDetail",
component: () => import("@/views/verification/collectionAdd"), component: () => import("@/views/verification/collectionDetail"),
}, },
], ],
}; };
This diff is collapsed.
This diff is collapsed.
<template>
<div>111</div>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
<style lang="less" scoped></style>
This diff is collapsed.
<template>
<div>111</div>
</template>
<script>
export default {
data() {
return {};
},
};
</script>
<style lang="less" scoped></style>
This diff is collapsed.
...@@ -13,36 +13,13 @@ ...@@ -13,36 +13,13 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :lg="6" :sm="12"> <a-col :lg="6" :sm="12">
<a-form-model-item label="EOB收到日期"> <a-form-model-item label="账单编号">
<a-range-picker format="YYYY年MM月DD日" v-model="form.dateRange" :placeholder="['开始日期', '结束日期']" /> <a-input v-model="form.receiptNo" placeholder="请输入账单编号" />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :lg="6" :sm="12"> <a-col :lg="12" :sm="24" class="none-label">
<a-form-model-item label="EOB名称">
<a-input v-model="form.eobName" placeholder="请输入EOB名称" />
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB金额(人民币)">
<a-input type="number" v-model="form.eobAmountCny" placeholder="请输入金额"/>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB金额(美元)">
<a-input type="number" v-model="form.eobAmountUsd" placeholder="请输入金额"/>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="EOB状态">
<a-select v-model="form.status" placeholder="请选择">
<a-select-option value="1">已寄送</a-select-option>
<a-select-option value="2">未寄送</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :md="24" :lg="12" class="none-label">
<a-form-model-item label="button"> <a-form-model-item label="button">
<a-button type="primary">导出</a-button> <!-- <a-button type="primary">导出</a-button> -->
<a-button class="mar-left10" type="primary" @click="addNewEvt"> <a-button class="mar-left10" type="primary" @click="addNewEvt">
<Icon name="ssiadd" :size="14" />新建EOB <Icon name="ssiadd" :size="14" />新建EOB
</a-button> </a-button>
...@@ -57,8 +34,7 @@ ...@@ -57,8 +34,7 @@
</a-row> </a-row>
</a-form-model> </a-form-model>
<!-- table --> <!-- table -->
<a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false" <a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false">
:row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }">
<template slot="visitTimeStart" slot-scope="text, record"> <template slot="visitTimeStart" slot-scope="text, record">
<span>{{record.visitTimeStart? moment(record.visitTimeStart).format('YYYY-MM-DD'):''}}</span> ~ <span>{{record.visitTimeStart? moment(record.visitTimeStart).format('YYYY-MM-DD'):''}}</span> ~
<span>{{record.visitTimeEnd? moment(record.visitTimeEnd).format('YYYY-MM-DD'):''}}</span> <span>{{record.visitTimeEnd? moment(record.visitTimeEnd).format('YYYY-MM-DD'):''}}</span>
...@@ -67,7 +43,7 @@ ...@@ -67,7 +43,7 @@
<span>{{text==1?'已寄送':'未寄送'}}</span> <span>{{text==1?'已寄送':'未寄送'}}</span>
</template> </template>
<template slot="operation" slot-scope="text, record, index"> <template slot="operation" slot-scope="text, record, index">
<a-button type="link">修改</a-button> <a-button type="link" @click.stop="editEvt(record)">修改</a-button>
<a-button v-if="record.eobNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button> <a-button v-if="record.eobNo" type="link" class="danger" @click.stop="delRecord(index)">删除</a-button>
</template> </template>
</a-table> </a-table>
...@@ -79,7 +55,7 @@ ...@@ -79,7 +55,7 @@
import BurtPagination from "@/components/CUSTOMER/pagation"; import BurtPagination from "@/components/CUSTOMER/pagation";
import moment from "moment"; import moment from "moment";
const columns = [ const columns = [
{ title: "病历号", dataIndex: "patientNo", ellipsis: true, width: 100 }, { title: "EOB编号", dataIndex: "eobNo", ellipsis: true, width: 100 },
{ title: "客户姓名", dataIndex: "patientName", ellipsis: true, width: 85 }, { title: "客户姓名", dataIndex: "patientName", ellipsis: true, width: 85 },
{ title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 80 }, { title: "保险公司", dataIndex: "payorName", ellipsis: true, width: 80 },
{ title: "就诊日期", dataIndex: "visitTimeStart", ellipsis: true, width: 110, scopedSlots: { customRender: "visitTimeStart" } }, { title: "就诊日期", dataIndex: "visitTimeStart", ellipsis: true, width: 110, scopedSlots: { customRender: "visitTimeStart" } },
...@@ -99,12 +75,8 @@ export default { ...@@ -99,12 +75,8 @@ export default {
return { return {
columns, columns,
form: { form: {
dateRange: [],
payorCode: '', payorCode: '',
eobName: '', receiptNo: '',
eobAmountCny: '',
eobAmountUsd: '',
status: ''
}, },
dataList: [], dataList: [],
companyOptions: [], //保险公司 companyOptions: [], //保险公司
...@@ -113,7 +85,6 @@ export default { ...@@ -113,7 +85,6 @@ export default {
pageSize: 10, pageSize: 10,
total: 0, total: 0,
}, },
selectedRowKeys: [], // Check here to configure the default column
}; };
}, },
components: { components: {
...@@ -125,19 +96,6 @@ export default { ...@@ -125,19 +96,6 @@ export default {
}, },
methods: { methods: {
moment, moment,
onSelectChange(selectedRowKeys) {
let arr = [];
for(let i=0; i<selectedRowKeys.length; i++){
let idx = selectedRowKeys[i];
if(this.dataList[idx].eobNo){
this.$msg.destroy();
this.$message.warning('EOB编号已存在')
}else{
arr.push(idx);
}
}
this.selectedRowKeys = arr;
},
handlerSearch() { handlerSearch() {
this.pagination.pageNum = 1; this.pagination.pageNum = 1;
this.getData(); this.getData();
...@@ -145,12 +103,8 @@ export default { ...@@ -145,12 +103,8 @@ export default {
// 重置 // 重置
handlerReset() { handlerReset() {
this.form = { this.form = {
dateRange: [],
payorCode: '', payorCode: '',
eobName: '', receiptNo: '',
eobAmountCny: '',
eobAmountUsd: '',
status: ''
} }
}, },
// 获取保险公司下拉选项 // 获取保险公司下拉选项
...@@ -160,7 +114,7 @@ export default { ...@@ -160,7 +114,7 @@ export default {
}); });
}, },
getData() { getData() {
this.$apis.QUERYCIRECEIPSENDLIST({ this.$apis.QUERYEOBLIST({
pageNum: this.pagination.pageNum, pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize, pageSize: this.pagination.pageSize,
}) })
...@@ -199,36 +153,20 @@ export default { ...@@ -199,36 +153,20 @@ export default {
}, },
//新建EOB //新建EOB
addNewEvt(){ addNewEvt(){
if(this.selectedRowKeys.length == 0){ this.$router.push({
this.$message.warning("未选择EOB"); path: '/verification/detail'
return;
}
let eobReceiptList = [];
this.dataList.forEach((item,index)=>{
if(this.selectedRowKeys.indexOf(index)!=-1){
eobReceiptList.push({
id: item.id,
receiptNo: item.receiptNo,
})
}
}) })
let formData = { },
...this.form, //修改
eobReceiptList: eobReceiptList, editEvt(record){
eobDate: moment(this.form.dateRange[0]).format('YYYY-MM-DD 00:00:00') const { eobNo } = record;
} localStorage.setItem('EobDataDetail', JSON.stringify(record));
delete formData.dateRange; this.$router.push({
this.$apis.SAVEEOBRECEIPTINFO(formData) path: '/verification/detail',
.then((res) => { query: {
if (res.returnCode == "0000") { eobNo
this.$message.success("新建成功");
this.handlerReset();
this.selectedRowKeys = [];
this.getData();
} else {
this.$message.error(res.returnMsg);
} }
}); })
} }
}, },
}; };
......
This diff is collapsed.
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