Skip to content

B
bims
Commit 7263fe01 authored by 金王方-del's avatar 金王方-del
Browse files
Options

Merge branch 'func_eccs_2376' into 'test' 

Func eccs 2376

See merge request !63
parents 2487ec53 370fe7c5
Hide whitespace changes
Inline Side-by-side
Showing with 233 additions and 123 deletions
src/api/apis_moudles/base.js
View file @ 7263fe01
......@@ -6,6 +6,9 @@ export default {
planCodeList: "/backstage/auth/planList", // 根据corporCode查询
uploadImg: "/common/upload",
specialtyList: "/backstage/auth/specialtyList",
receiptCount: "/backstage/auth/receiptCount",
backMoneyReportCount: "/backstage/auth/backMoneyReportCount",
queryBackReceiptCount: "/backstage/auth/queryBackReceiptCount",
coverageCode: "/backstage/auth/coverageMasterList",
getRefcdByRefgrp: "/common/getRefcdByRefgrp", // 公共获取码表接口
checkUserEmail: "/backstage/user/checkUserEmail", // 校验用户邮箱
......
src/api/funcs_modules/base.js
View file @ 7263fe01
......@@ -51,6 +51,17 @@ const CHECKUSEREMAIL = (data) => {
return req.post(`${apis.checkUserEmail}?userName=${data.userName}`);
};
//
const receiptCount = (data) => {
return req.post(`${apis.receiptCount}`, data);
};
const backMoneyReportCount = (data) => {
return req.post(`${apis.backMoneyReportCount}`, data);
};
const queryBackReceiptCount = (data) => {
return req.post(`${apis.queryBackReceiptCount}`, data);
};
// 对象数组
export default {
GETUSERINFO,
......@@ -59,6 +70,9 @@ export default {
GETPLANCODEBYCORP,
GETSPECIALTYLIST,
UPLOADIMG,
receiptCount,
queryBackReceiptCount,
backMoneyReportCount,
GETCOVERAGECODE,
GETREFCDBYREFGRP,
CHECKUSEREMAIL,
......
src/views/charge-query/index.vue
View file @ 7263fe01
<template>
<!-- 收费查询-账单查询 -->
<div class="white_bg burt-container custom-info">
<!-- form -->
<a-form-model ref="form" layout="vertical" :model="form">
<a-row :gutter="30">
<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="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="6" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorIds" placeholder="请选择保险公司" allowClear show-search mode="multiple"
:filterOption="filterCode" optionFilterProp="label">
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id" :label="item.longName">
{{ item.longName }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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">
{{ item.doctorDesc }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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="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>
是
</a-select-option>
<a-select-option value="N" allow-clear>
否
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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>
<a-select-option value="N" allow-clear>
否
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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="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="6" :lg="6" :sm="12">
<a-form-model-item label="状态">
<a-select v-model="form.status" placeholder="请选择状态" allowClear>
<a-select-option v-for="item in statusOptions" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
</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">
<!-- 收费查询-账单查询 -->
<div class="white_bg burt-container custom-info">
<!-- form -->
<a-form-model ref="form" layout="vertical" :model="form">
<a-row :gutter="30">
<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="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="6" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorIds" placeholder="请选择保险公司" allowClear show-search mode="multiple"
:filterOption="filterCode" optionFilterProp="label">
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id"
:label="item.longName">
{{ item.longName }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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">
{{ item.doctorDesc }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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="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>
是
</a-select-option>
<a-select-option value="N" allow-clear>
否
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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>
<a-select-option value="N" allow-clear>
否
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<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="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="6" :lg="6" :sm="12">
<a-form-model-item label="状态">
<a-select v-model="form.status" placeholder="请选择状态" allowClear>
<a-select-option v-for="item in statusOptions" :key="item.code" :value="item.code">
{{ item.name }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="3" :sm="3">
<a-form-model-item :label="` 未清余额合计 `">
<div>未清余额合计:{{ ciReceiptTotalVo.residueBackAmount || 0 }}(共计{{ ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条)</div>
</a-form-model-item>
</a-col>
<a-col :xl="6" :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">
<Icon name="ssiadd" :size="14" />新建预授权</a-button> -->
<a-button class="mar-left10" type="primary" @click="handlerReset">
<Icon name="ssireset" :size="14" />重置
......@@ -235,7 +243,8 @@ export default {
name: '有效',
code: 1
}
]
],
ciReceiptTotalVo: {}
};
},
components: {
......@@ -252,6 +261,18 @@ export default {
},
methods: {
moment,
// 获取未清余额合计
getReceiptCount() {
this.$apis.receiptCount({
...this.pageForm,
...this.pagination
}).then((res) => {
if (res.returnCode == '0000') {
console.log(res.content)
this.ciReceiptTotalVo = res.content
}
});
},
// 选择框筛选
filterCode(input, option) {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
......@@ -335,6 +356,7 @@ export default {
if (!valid) {
return false;
}
this.getReceiptCount()
this.pagination.pageNum = 1;
this.pageForm = this.$lodash.cloneDeep({ ...this.form, dateRange: undefined });
this._getChargeList();
......@@ -359,10 +381,12 @@ export default {
<style lang="less" scoped>
.none-label {
text-align: right;
.ant-form-item-label {
opacity: 0;
}
}
.ant-btn .icon-class {
.mg-r(10);
}
......
src/views/charge-query/lpjManageDetail.vue
View file @ 7263fe01
......@@ -503,6 +503,7 @@ export default {
api({
sendBatchNo: this.sendBatchNo || undefined,
...this.searchForm,
payorCode: this.form.payorCode || undefined,
visitTimeEnd: visitTimeStart[1] ? visitTimeStart[1] + ' 23:59:59' : undefined,
visitTimeStart: visitTimeStart[0] ? visitTimeStart[0] + ' 00:00:00' : undefined,
})
......@@ -533,7 +534,11 @@ export default {
this.pagination.pageNum = 1;
this.isEditNewBill = true;
this.cacheDataList = {}
if(this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
this._getNewBillList()
} else {
this.getData()
}
}
},
_getNewBillList() {
......@@ -618,7 +623,11 @@ export default {
this.$message.success("成功");
this.selectedRowKeys = [];
this.cacheDataList = {}
this.getData();
if(this.isEditNewBill) { // 新增时添加了账单信息 那分页也应该是调账单信息接口
this._getNewBillList()
} else {
this.getData()
}
resolve();
} else {
this.$message.error(res.returnMsg);
......
src/views/report/returnedMoney.vue
View file @ 7263fe01
......@@ -6,7 +6,8 @@
<a-row :gutter="30">
<a-col :xl="4" :lg="6" :sm="12">
<a-form-model-item label="保险公司">
<a-select v-model="form.payorCode" placeholder="请选择" show-search allowClear :filterOption="filterCode">
<a-select v-model="form.payorCode" placeholder="请选择" show-search allowClear
:filterOption="filterCode">
<a-select-option v-for="item in companyOptions" :key="item.payorCode" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
......@@ -25,27 +26,17 @@
</a-col>
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="账单起止日期">
<a-range-picker
format="YYYY-MM-DD"
format-value="YYYY-MM-DD"
v-model="billRange"
:placeholder="['开始时间', '结束时间']"
@change="onSelectBillTime"
/>
<a-range-picker format="YYYY-MM-DD" format-value="YYYY-MM-DD" v-model="billRange"
:placeholder="['开始时间', '结束时间']" @change="onSelectBillTime" />
</a-form-model-item>
</a-col>
<a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="回款起止日期">
<a-range-picker
format="YYYY-MM-DD"
format-value="YYYY-MM-DD"
v-model="returnRange"
:placeholder="['开始时间', '结束时间']"
@change="onSelectReturnTime"
/>
<a-range-picker format="YYYY-MM-DD" format-value="YYYY-MM-DD" v-model="returnRange"
:placeholder="['开始时间', '结束时间']" @change="onSelectReturnTime" />
</a-form-model-item>
</a-col>
<a-col :xl="10" :lg="10" :sm="12" class="none-label">
<a-col :xl="6" :lg="10" :sm="12" class="none-label">
<a-form-model-item label="button">
<a-button class="mar-left10" type="primary" @click="handlerReset">
<Icon name="ssireset" :size="14" />重置
......@@ -58,21 +49,39 @@
</a-button>
</a-form-model-item>
</a-col>
<a-col :xl="4" :lg="6" :sm="12" class="none-label">
<a-form-model-item label="账单回款金额合计">
<div>共计{{ ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条</div>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="10" :sm="12" class="none-label">
<a-form-model-item label="回款金额合计">
<div>账单金额合计:{{ ciReceiptTotalVo.actualAmountTotal || 0 }}</div>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="10" :sm="12" class="none-label">
<a-form-model-item label="回款金额合计">
<div>回款金额合计:{{ ciReceiptTotalVo.paidAmountEobTotal || 0 }}</div>
</a-form-model-item>
</a-col>
<a-col :xl="3" :lg="10" :sm="12" class="none-label">
<a-form-model-item label="个人欠费合计">
<div>个人欠费合计:{{ ciReceiptTotalVo.arrearsAmountTotal || 0 }}</div>
</a-form-model-item>
</a-col>
</a-row>
</a-form-model>
<!-- table -->
<a-table
:columns="columns"
:data-source="dataList"
:scroll="{ x: true }"
:pagination="false"
:rowKey="
(record) => {
record.id + record.backMoneyNo;
}
"
>
<a-table :columns="columns" :data-source="dataList" :scroll="{ x: true }" :pagination="false" :rowKey="(record) => {
record.id + record.backMoneyNo;
}
">
<template slot="index" slot-scope="text, record, index">
{{ index + 1 }}
</template>
......@@ -133,6 +142,7 @@ export default {
columns,
billRange: null,
returnRange: null,
ciReceiptTotalVo:{},
form: {
payorCode: '',
mrnNo: '',
......@@ -165,6 +175,18 @@ export default {
filterCode(input, option) {
return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
},
// 获取未清余额合计
getBackMoneyReportCount() {
this.$apis.backMoneyReportCount({
...this.pageForm,
...this.pagination
}).then((res) => {
if (res.returnCode == '0000') {
console.log(res.content)
this.ciReceiptTotalVo = res.content
}
});
},
// 获取列表数据
getList() {
const data = {
......@@ -174,7 +196,7 @@ export default {
this.$apis.backMoneyReport(data).then((res) => {
let content = res.content || {};
this.dataList = content.list || [];
this.getBackMoneyReportCount()
this.pagination.total = content.total || 0;
});
},
......@@ -228,10 +250,12 @@ export default {
<style lang="less" scoped>
.none-label {
text-align: left;
.ant-form-item-label {
opacity: 0;
}
}
.ant-btn .icon-class {
.mg-r(10);
}
......
src/views/verification/collectionDetail.vue
View file @ 7263fe01
......@@ -98,7 +98,7 @@
</a-col>
</template>
<template v-else>
<a-col :lg="9" :sm="12">
<a-col :lg="6" :sm="12">
<a-form-model-item label="保险公司" prop="payorCode">
<a-select
v-model="form.payorCode"
......@@ -116,7 +116,7 @@
</a-select>
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
<a-col :lg="6" :sm="12">
<a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
<a-input
class="fixed_width"
......@@ -128,7 +128,13 @@
/>
</a-form-model-item>
</a-col>
<a-col :lg="7" :sm="12">
<a-col :lg="6" :sm="12">
<a-form-model-item label="回款金额统计">
<div>{{ ciReceiptTotalVo.backAmountTotal || 0 }}(共计{{ ciReceiptTotalVo.totalNum || 0 }}条，其中：无效 <span style="color: red;">{{ ciReceiptTotalVo.invalidNum || 0 }}</span> 条)</div>
</a-form-model-item>
</a-col>
<a-col :lg="6" :sm="12">
<a-form-model-item label="可核销余额">
<a-input class="fixed_width" v-model="residueBackAmount" disabled />
</a-form-model-item>
......@@ -319,6 +325,7 @@ export default {
isEdit: false,
EOBStatusOptions,
dialogShow: false,
ciReceiptTotalVo:{},
form: {
payorCode: undefined,
backDate: null,
......@@ -615,6 +622,18 @@ export default {
},
methods: {
moment,
// 获取未清余额合计
getBackMoneyReportCount(params) {
this.$apis.queryBackReceiptCount({
...params,
...this.pagination
}).then((res) => {
if (res.returnCode == '0000') {
console.log(res.content)
this.ciReceiptTotalVo = res.content
}
});
},
// 计算表格最大高度
calcTableHeight() {
const dom = this.$refs.burt;
......@@ -787,6 +806,14 @@ export default {
})
.then((res) => {
if (res.returnCode == '0000') {
this.getBackMoneyReportCount({
pageNum: 1,
pageSize: 999,
backMoneyNo: this.backMoneyNo,
...this.searchForm,
receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
})
const list = res.content.list || [];
let ids = [];
this.selectedRows = list.map((item) => {
......@@ -816,6 +843,15 @@ export default {
})
.then((res) => {
if (res.returnCode == '0000') {
this.getBackMoneyReportCount({
pageNum: this.pagination.pageNum,
pageSize: this.pagination.pageSize,
backMoneyNo: this.backMoneyNo,
payorCode: this.form.payorCode,
...this.searchForm,
receiptEndDate: billDate[1] ? billDate[1] + ' 23:59:59' : undefined,
receiptStartDate: billDate[0] ? billDate[0] + ' 00:00:00' : undefined
})
let content = res.content || {};
this.pagination.total = content.total || 0;
this.dataList =
......
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