Skip to content

B
bims
Commit 519332d8 authored by 王安伟's avatar 王安伟
Browse files
Options

回款管理页面测试问题修复

parent 27f0a6d8
Show whitespace changes
Inline Side-by-side
Showing with 577 additions and 505 deletions
src/views/charge-query/index.vue
View file @ 519332d8
...@@ -16,8 +16,14 @@ ...@@ -16,8 +16,14 @@
</a-col> </a-col>
<a-col :xl="6" :lg="6" :sm="12"> <a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="保险公司"> <a-form-model-item label="保险公司">
<a-select v-model="form.payorId" placeholder="请选择保险公司" allowClear show-search mode="multiple" <a-select
:filterOption="filterCode"> v-model="form.payorId"
placeholder="请选择保险公司"
allowClear
show-search
mode="multiple"
:filterOption="filterCode"
>
<a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id"> <a-select-option v-for="item in companyOptions" :key="item.corpCode" :value="item.id">
{{ item.longName }} {{ item.longName }}
</a-select-option> </a-select-option>
...@@ -35,30 +41,27 @@ ...@@ -35,30 +41,27 @@
</a-col> </a-col>
<a-col :xl="6" :lg="6" :sm="12"> <a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="收费时间"> <a-form-model-item label="收费时间">
<a-range-picker format="YYYY-MM-DD" v-model="form.dateRange" :placeholder="['开始时间','结束时间']" @change="onSelectVisitTime" /> <a-range-picker
format="YYYY-MM-DD"
v-model="form.dateRange"
:placeholder="['开始时间', '结束时间']"
@change="onSelectVisitTime"
/>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :xl="6" :lg="6" :sm="12"> <a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="是否已关联寄送单"> <a-form-model-item label="是否已关联寄送单">
<a-select v-model="form.isSend" placeholder="请选择是否已关联寄送单" allowClear> <a-select v-model="form.isSend" placeholder="请选择是否已关联寄送单" allowClear>
<a-select-option value="Y" allow-clear> <a-select-option value="Y" allow-clear> 是 </a-select-option>
是 <a-select-option value="N" allow-clear> 否 </a-select-option>
</a-select-option>
<a-select-option value="N" allow-clear>
否
</a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<a-col :xl="6" :lg="6" :sm="12"> <a-col :xl="6" :lg="6" :sm="12">
<a-form-model-item label="是否已回款"> <a-form-model-item label="是否已回款">
<a-select v-model="form.isEobBack" placeholder="请选择是否已回款" allowClear> <a-select v-model="form.isEobBack" placeholder="请选择是否已回款" allowClear>
<a-select-option value="Y" allow-clear> <a-select-option value="Y" allow-clear> 是 </a-select-option>
是 <a-select-option value="N" allow-clear> 否 </a-select-option>
</a-select-option>
<a-select-option value="N" allow-clear>
否
</a-select-option>
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
...@@ -117,16 +120,19 @@ ...@@ -117,16 +120,19 @@
</a-popconfirm> --> </a-popconfirm> -->
</template> </template>
<template slot="isSend" slot-scope="text"> <template slot="isSend" slot-scope="text">
{{text == 'Y' ? '是' : text == 'N' ? '否' : ''}} {{ text == 'Y' ? '是' : text == 'N' ? '否' : '' }}
</template> </template>
<template slot="isEob" slot-scope="text"> <template slot="isEob" slot-scope="text">
{{text == 'Y' ? '是' : text == 'N' ? '否' : ''}} {{ text == 'Y' ? '是' : text == 'N' ? '否' : '' }}
</template> </template>
<template slot="isEobBack" slot-scope="text"> <template slot="isEobBack" slot-scope="text">
{{text == 'Y' ? '是' : text == 'N' ? '否' : ''}} {{ text == 'Y' ? '是' : text == 'N' ? '否' : '' }}
</template> </template>
<template slot="status" slot-scope="text"> <template slot="status" slot-scope="text">
<span :style="{color: text == 2 ? 'red' : ''}">{{ text==1?'有效':text==2?'无效':'' }}</span> <span :style="{ color: text == 2 ? 'red' : '' }">{{ text == 1 ? '有效' : text == 2 ? '无效' : '' }}</span>
</template>
<template slot="redText" slot-scope="text">
<span style="color: red">{{ text }}</span>
</template> </template>
</a-table> </a-table>
<!--分页--> <!--分页-->
...@@ -135,84 +141,98 @@ ...@@ -135,84 +141,98 @@
</template> </template>
<script> <script>
import BurtPagination from "@/components/CUSTOMER/pagation"; import BurtPagination from '@/components/CUSTOMER/pagation';
import { mapState } from "vuex" import { mapState } from 'vuex';
import moment from "moment"; import moment from 'moment';
import { receiptTypeOptions } from '@/utils/utilsdictOptions.js'; import { receiptTypeOptions } from '@/utils/utilsdictOptions.js';
import { exportFile } from '@/utils/index'; import { exportFile } from '@/utils/index';
export default { export default {
data() { data() {
const columns = [ const columns = [
{ title: "序号", dataIndex: "index", key:"index",align:'center', width: 80,scopedSlots: { customRender: "index" }}, {
{ title: "收费时间", dataIndex: "receiptDate", width: 180 }, title: '序号',
{ title: "账单编号", dataIndex: "receiptNo", width: 180 }, dataIndex: 'index',
{ title: "账单类型", dataIndex: "receiptTypeStr", width: 130 }, key: 'index',
{ title: "状态", dataIndex: "status", width: 130,scopedSlots: { customRender: "status" } }, align: 'center',
{ title: "病历号", dataIndex: "mrnNo",width: 180}, width: 80,
{ title: "客户姓名",dataIndex: "patientName",width: 120,}, scopedSlots: { customRender: 'index' }
{ title: "保险公司", dataIndex: "payorName", width: 200 }, },
{ title: "保险卡", dataIndex: "cardNo", width: 200 }, { title: '收费时间', dataIndex: 'receiptDate', width: 180 },
{ title: "客户生日", dataIndex: "birthday", width: 200 }, { title: '账单编号', dataIndex: 'receiptNo', width: 180 },
{ title: "就诊医生", dataIndex: "doctorName", width: 150 }, { title: '账单类型', dataIndex: 'receiptTypeStr', width: 130 },
{ title: "是否已关联寄送单", dataIndex: "isSend", width: 180,scopedSlots: { customRender: "isSend" } }, { title: '状态', dataIndex: 'status', width: 130, scopedSlots: { customRender: 'status' } },
{ title: "是否已回款", dataIndex: "isEobBack", width: 180,scopedSlots: { customRender: "isEobBack" } }, { title: '病历号', dataIndex: 'mrnNo', width: 180 },
{ title: "应收金额", dataIndex: "chargeAmount", width: 180 }, { title: '客户姓名', dataIndex: 'patientName', width: 120 },
{ title: "折扣（%）", dataIndex: "discountAmount", width: 180 }, { title: '保险公司', dataIndex: 'payorName', width: 200 },
{ title: "减免金额", dataIndex: "reduceAmount", width: 180 }, { title: '保险卡', dataIndex: 'cardNo', width: 200 },
{ title: "应付金额", dataIndex: "payableAmount", width: 180 }, { title: '客户生日', dataIndex: 'birthday', width: 200 },
{ title: "客户自付", dataIndex: "selfpaidAmount", width: 180 }, { title: '就诊医生', dataIndex: 'doctorName', width: 150 },
{ title: "理赔金额", dataIndex: "actualAmount", width: 180 }, { title: '是否已关联寄送单', dataIndex: 'isSend', width: 180, scopedSlots: { customRender: 'isSend' } },
{ title: "保险已支付", dataIndex: "backAmount", width: 180 }, { title: '是否已回款', dataIndex: 'isEobBack', width: 180, scopedSlots: { customRender: 'isEobBack' } },
{ title: "保险欠费", dataIndex: "insuranceArrearsAmount", width: 180 }, { title: '应收金额', dataIndex: 'chargeAmount', width: 180 },
{ title: "个人欠费", dataIndex: "arrearsAmount", width: 180 }, { title: '折扣（%）', dataIndex: 'discountAmount', width: 180 },
{ title: "备注", dataIndex: "remark", width: 200 }, { title: '减免金额', dataIndex: 'reduceAmount', width: 180 },
{ title: "未清余额", dataIndex: "residueBackAmount", width: 180 }, { title: '应付金额', dataIndex: 'payableAmount', width: 180 },
{ title: "账龄", dataIndex: "diffDay", width: 180 }, { title: '客户自付', dataIndex: 'selfpaidAmount', width: 180 },
{ title: "操作", key: "operation", width: "175px",fixed: "right",scopedSlots: { customRender: "operation" }, align: "center"}, { title: '理赔金额', dataIndex: 'actualAmount', width: 180 },
{ title: '保险已支付', dataIndex: 'backAmount', width: 180 },
{ title: '保险欠费', dataIndex: 'insuranceArrearsAmount', width: 180 },
{ title: '个人欠费', dataIndex: 'arrearsAmount', width: 180, scopedSlots: { customRender: 'redText' } },
{ title: '备注', dataIndex: 'remark', width: 200, scopedSlots: { customRender: 'redText' } },
{ title: '未清余额', dataIndex: 'residueBackAmount', width: 180 },
{ title: '账龄', dataIndex: 'diffDay', width: 180 },
{
title: '操作',
key: 'operation',
width: '175px',
fixed: 'right',
scopedSlots: { customRender: 'operation' },
align: 'center'
}
]; ];
return { return {
columns, columns,
receiptTypeOptions, receiptTypeOptions,
form: {}, form: {},
pageForm: { pageForm: {
doctorCode: "", doctorCode: '',
patientName: "", patientName: '',
mrnNo: "", mrnNo: '',
paymentCode: "", paymentCode: '',
payorIds: [], payorIds: [],
visitTimeEnd: "", visitTimeEnd: '',
visitTimeStart: "", visitTimeStart: '',
receiptType: "", receiptType: '',
receiptNo: "" receiptNo: ''
}, },
patientTypeOptions: [ patientTypeOptions: [
{ {
name: "商保", name: '商保',
code: 1, code: 1
}, }
], //客户类型 ], //客户类型
companyOptions: [], //保险公司 companyOptions: [], //保险公司
doctorOptions: [], //就诊医生 doctorOptions: [], //就诊医生
paymentOptions: [ paymentOptions: [
{ {
name: "商保", name: '商保',
code: 1, code: 1
}, }
], //支付方式 ], //支付方式
dataList: [], dataList: [],
pagination: { pagination: {
pageNum: 1, pageNum: 1,
pageSize: 10, pageSize: 10,
total: 0, total: 0
}, },
receiptTypeDict: { receiptTypeDict: {
'1': '收费', 1: '收费',
'2': '退费' 2: '退费'
}, },
statusOptions: [ statusOptions: [
{ {
name: '无效', name: '无效',
code:2 code: 2
}, },
{ {
name: '有效', name: '有效',
...@@ -222,7 +242,7 @@ export default { ...@@ -222,7 +242,7 @@ export default {
}; };
}, },
components: { components: {
BurtPagination, BurtPagination
}, },
computed: { computed: {
...mapState({ ...mapState({
...@@ -231,29 +251,26 @@ export default { ...@@ -231,29 +251,26 @@ export default {
}, },
created() { created() {
this._getCompanyOptions(); this._getCompanyOptions();
this._getDoctorListNoPage();//获取医生下拉选项 this._getDoctorListNoPage(); //获取医生下拉选项
}, },
methods: { methods: {
moment, moment,
// 选择框筛选 // 选择框筛选
filterCode(input, option) { filterCode(input, option) {
return ( return option.componentOptions.children[0].text.toLowerCase().indexOf(input.toLowerCase()) >= 0;
option.componentOptions.children[0].text
.toLowerCase()
.indexOf(input.toLowerCase()) >= 0
);
}, },
// 获取列表数据 // 获取列表数据
_getChargeList() { _getChargeList() {
const data = { const data = {
...this.pageForm, ...this.pageForm,
...this.pagination, ...this.pagination
}; };
this.$apis.GETCHARGELIST(data).then((res) => { this.$apis.GETCHARGELIST(data).then((res) => {
let content = res.content || {}; let content = res.content || {};
this.dataList = content.list.map(item => { this.dataList =
item.receiptTypeStr = this.receiptTypeDict[item.receiptType] || '' content.list.map((item) => {
return item item.receiptTypeStr = this.receiptTypeDict[item.receiptType] || '';
return item;
}) || []; }) || [];
this.pagination.total = content.total || 0; this.pagination.total = content.total || 0;
}); });
...@@ -265,53 +282,55 @@ export default { ...@@ -265,53 +282,55 @@ export default {
}); });
}, },
// 获取看诊医生下拉选项 // 获取看诊医生下拉选项
_getDoctorListNoPage(){ _getDoctorListNoPage() {
this.$apis.GETDOCTORlISTNOPAGE({"providerId": this.userInfo.providerId}).then((res) => { this.$apis.GETDOCTORlISTNOPAGE({ providerId: this.userInfo.providerId }).then((res) => {
if (res.returnCode === "0000") { if (res.returnCode === '0000') {
this.doctorOptions = res.content || []; this.doctorOptions = res.content || [];
}else{ } else {
this.$message.success(res.returnMsg); this.$message.success(res.returnMsg);
} }
}); });
}, },
// 选中就诊时间 // 选中就诊时间
onSelectVisitTime(date, dateString) { onSelectVisitTime(date, dateString) {
this.form.visitTimeStart = dateString[0] + ' 00:00:00' this.form.visitTimeStart = dateString[0] + ' 00:00:00';
this.form.visitTimeEnd = dateString[1] + ' 23:59:59' this.form.visitTimeEnd = dateString[1] + ' 23:59:59';
console.log(date, dateString); console.log(date, dateString);
}, },
// 重置 // 重置
handlerReset() { handlerReset() {
this.form = {} this.form = {};
}, },
//查看 //查看
detailEvt(record) { detailEvt(record) {
localStorage.setItem('chargeQueryDetail', JSON.stringify(record)); localStorage.setItem('chargeQueryDetail', JSON.stringify(record));
const { receiptNo } = record; const { receiptNo } = record;
this.$router.push({ this.$router.push({
name: "chargeQueryDetail", name: 'chargeQueryDetail',
query: { receiptNo }, query: { receiptNo }
}); });
}, },
//账单结算 //账单结算
receiptEvt(record){ receiptEvt(record) {
this.$modal.confirm({ this.$modal.confirm({
title: "结算", title: '结算',
content: "确定结算该账单？", content: '确定结算该账单？',
okText: "确定", okText: '确定',
cancelText: "取消", cancelText: '取消',
onOk: () => { onOk: () => {
this.$apis.RECEIPTSETTLEMENT({ this.$apis
.RECEIPTSETTLEMENT({
id: record.id id: record.id
}).then((res) => { })
if (res.returnCode === "0000") { .then((res) => {
if (res.returnCode === '0000') {
this.$message.success('结算成功'); this.$message.success('结算成功');
this._getChargeList(); this._getChargeList();
}else{ } else {
this.$message.error(res.returnMsg); this.$message.error(res.returnMsg);
} }
}); });
}, }
}); });
}, },
handlerSearch() { handlerSearch() {
...@@ -320,7 +339,7 @@ export default { ...@@ -320,7 +339,7 @@ export default {
return false; return false;
} }
this.pagination.pageNum = 1; this.pagination.pageNum = 1;
this.pageForm = this.$lodash.cloneDeep({...this.form, dateRange: undefined}); this.pageForm = this.$lodash.cloneDeep({ ...this.form, dateRange: undefined });
this._getChargeList(); this._getChargeList();
}); });
}, },
...@@ -329,15 +348,15 @@ export default { ...@@ -329,15 +348,15 @@ export default {
// this.$router.push("/customer/edit"); // this.$router.push("/customer/edit");
}, },
//导出报表 //导出报表
exportExcel(){ exportExcel() {
let filter = { let filter = {
...this.form, ...this.form
} };
this.$apis.RceiptListReport(filter).then(res => { this.$apis.RceiptListReport(filter).then((res) => {
exportFile(res, '账单报表.xls'); exportFile(res, '账单报表.xls');
}) });
}
} }
},
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
......
src/views/verification/collectionDetail.vue
View file @ 519332d8
...@@ -5,6 +5,7 @@ ...@@ -5,6 +5,7 @@
<a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title"> <a-tab-pane v-for="pane in panes" :key="pane.key" :tab="pane.title">
<a-form-model ref="ruleForm" :model="form" :rules="rules"> <a-form-model ref="ruleForm" :model="form" :rules="rules">
<a-row :gutter="30"> <a-row :gutter="30">
<template v-if="activeKey === '0'">
<a-col :lg="7" :sm="12"> <a-col :lg="7" :sm="12">
<a-form-model-item label="保险公司" prop="payorCode"> <a-form-model-item label="保险公司" prop="payorCode">
<a-select <a-select
...@@ -13,7 +14,7 @@ ...@@ -13,7 +14,7 @@
allow-clear allow-clear
show-search show-search
:disabled="!isEdit" :disabled="!isEdit"
style="min-width: 200px" style="min-width: 200px; max-width: 250px"
@change="changePayor" @change="changePayor"
:filterOption="filterCode" :filterOption="filterCode"
> >
...@@ -23,7 +24,6 @@ ...@@ -23,7 +24,6 @@
</a-select> </a-select>
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<template v-if="activeKey === '0'">
<a-col :lg="5" :sm="12"> <a-col :lg="5" :sm="12">
<a-form-model-item label="回款日期" prop="backDate"> <a-form-model-item label="回款日期" prop="backDate">
<a-date-picker <a-date-picker
...@@ -36,10 +36,10 @@ ...@@ -36,10 +36,10 @@
/> />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</template>
<a-col :lg="6" :sm="12"> <a-col :lg="6" :sm="12">
<a-form-model-item label="回款金额(人民币)" prop="backAmountCny"> <a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
<a-input <a-input
class="fixed_width"
type="number" type="number"
v-model="form.backAmountCny" v-model="form.backAmountCny"
placeholder="请输入金额" placeholder="请输入金额"
...@@ -50,13 +50,13 @@ ...@@ -50,13 +50,13 @@
</a-col> </a-col>
<a-col :lg="5" :sm="12"> <a-col :lg="5" :sm="12">
<a-form-model-item label="可核销余额"> <a-form-model-item label="可核销余额">
<a-input v-model="residueBackAmount" disabled /> <a-input class="fixed_width" v-model="residueBackAmount" disabled />
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
<template v-if="activeKey === '0'">
<a-col :lg="7" :sm="12"> <a-col :lg="7" :sm="12">
<a-form-model-item label="回款金额(美元)"> <a-form-model-item label="回款金额(美元)">
<a-input <a-input
class="fixed_width"
type="number" type="number"
v-model="form.backAmountUsd" v-model="form.backAmountUsd"
placeholder="请输入金额" placeholder="请输入金额"
...@@ -97,6 +97,43 @@ ...@@ -97,6 +97,43 @@
</a-form-model-item> </a-form-model-item>
</a-col> </a-col>
</template> </template>
<template v-else>
<a-col :lg="9" :sm="12">
<a-form-model-item label="保险公司" prop="payorCode">
<a-select
v-model="form.payorCode"
placeholder="请选择保险公司"
allow-clear
show-search
:disabled="!isEdit"
style="min-width: 200px"
@change="changePayor"
:filterOption="filterCode"
>
<a-select-option v-for="item in companyOptions" :key="item.payorCode" :value="item.payorCode">
{{ item.longName }}
</a-select-option>
</a-select>
</a-form-model-item>
</a-col>
<a-col :lg="8" :sm="12">
<a-form-model-item label="回款金额(人民币)" prop="backAmountCny">
<a-input
class="fixed_width"
type="number"
v-model="form.backAmountCny"
placeholder="请输入金额"
allow-clear
:disabled="!isEdit"
/>
</a-form-model-item>
</a-col>
<a-col :lg="7" :sm="12">
<a-form-model-item label="可核销余额">
<a-input class="fixed_width" v-model="residueBackAmount" disabled />
</a-form-model-item>
</a-col>
</template>
</a-row> </a-row>
</a-form-model> </a-form-model>
<template v-if="activeKey === '1'"> <template v-if="activeKey === '1'">
...@@ -212,7 +249,7 @@ ...@@ -212,7 +249,7 @@
class="table-content all-list" class="table-content all-list"
:columns="columns" :columns="columns"
:data-source="dataList" :data-source="dataList"
:scroll="{ x: '100%', y: tableHeight }" :scroll="{ x: '100%', y: tableHeight1 }"
:pagination="false" :pagination="false"
:rowKey="'id'" :rowKey="'id'"
:row-selection="{ :row-selection="{
...@@ -314,7 +351,8 @@ export default { ...@@ -314,7 +351,8 @@ export default {
code: 1 code: 1
} }
], ],
tableHeight: 200 // 表格高度 tableHeight: 200, // 已关联账单表格高度
tableHeight1: 200 // 全部账单表格高度
}; };
}, },
mixins: [mixins], mixins: [mixins],
...@@ -519,15 +557,6 @@ export default { ...@@ -519,15 +557,6 @@ export default {
return Number(totalMoney.toFixed(2)); return Number(totalMoney.toFixed(2));
} }
}, },
watch: {
selectedRows: {
handler(val) {
console.log(val);
},
deep: true,
immediate: true
}
},
created() { created() {
this.simpleImage = Empty.PRESENTED_IMAGE_SIMPLE; this.simpleImage = Empty.PRESENTED_IMAGE_SIMPLE;
const { backMoneyNo, isEdit } = this.$route.query; const { backMoneyNo, isEdit } = this.$route.query;
...@@ -569,9 +598,10 @@ export default { ...@@ -569,9 +598,10 @@ export default {
const paddingT = parseFloat(style.getPropertyValue('padding-top')); const paddingT = parseFloat(style.getPropertyValue('padding-top'));
const paddingB = parseFloat(style.getPropertyValue('padding-bottom')); const paddingB = parseFloat(style.getPropertyValue('padding-bottom'));
const paddingSum = paddingT + paddingB; const paddingSum = paddingT + paddingB;
this.tableHeight = containterH - 350 - gobackH - paddingSum; this.tableHeight = containterH - 300 - gobackH - paddingSum;
this.tableHeight1 = containterH - 340 - gobackH - paddingSum;
// 设置每页展示条数 // 设置每页展示条数
const pageSize = Math.floor((this.tableHeight - 10) / 32); const pageSize = Math.floor((this.tableHeight1 - 10) / 32);
this.$set(this.pagination, 'pageSize', pageSize); this.$set(this.pagination, 'pageSize', pageSize);
}, },
// 已关联账单表格行类名 // 已关联账单表格行类名
...@@ -623,16 +653,17 @@ export default { ...@@ -623,16 +653,17 @@ export default {
this.addNewEvt(0); this.addNewEvt(0);
}, },
onSelectAll(selected, selectedRows, changeRows) { onSelectAll(selected, selectedRows, changeRows) {
let chgRows = changeRows.map((item) => { if (selected) {
return { this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id));
changeRows.forEach((item) => {
const obj = {
...item, ...item,
backAmount: backAmount:
this.residueBackAmount > item.currentReceiptAmount ? item.currentReceiptAmount : this.residueBackAmount this.residueBackAmount > item.currentReceiptAmount ? item.currentReceiptAmount : this.residueBackAmount
}; };
this.selectedRows.push(obj);
}); });
if (selected) { // this.selectedRows = this.selectedRows.concat(chgRows);
this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id));
this.selectedRows = this.selectedRows.concat(chgRows);
} else { } else {
changeRows.forEach((item) => { changeRows.forEach((item) => {
const findIndex = this.selectedRowKeys.findIndex((rowId) => rowId === item.id); const findIndex = this.selectedRowKeys.findIndex((rowId) => rowId === item.id);
...@@ -710,7 +741,9 @@ export default { ...@@ -710,7 +741,9 @@ export default {
// 获取已关联的账单 // 获取已关联的账单
getData() { getData() {
if (!this.backMoneyNo) { if (!this.backMoneyNo) {
if (this.activeKey1 === '0') {
this.$message.error('暂未关联账单，请在全部账单中添加账单'); this.$message.error('暂未关联账单，请在全部账单中添加账单');
}
return; return;
} }
let billDate = this.searchForm.billDate || []; let billDate = this.searchForm.billDate || [];
...@@ -816,10 +849,11 @@ export default { ...@@ -816,10 +849,11 @@ export default {
}); });
this.$apis.SAVEBACKMONEY(formData).then((res) => { this.$apis.SAVEBACKMONEY(formData).then((res) => {
const msg = backStatus === 1 ? '结案' : '暂存';
if (res.returnCode == '0000') { if (res.returnCode == '0000') {
this.backMoneyNo = res.content; this.backMoneyNo = res.content;
this.savedStatus = true; this.savedStatus = true;
this.$message.success('成功'); this.$message.success(`${msg}成功`);
this.selectedRowKeys = []; this.selectedRowKeys = [];
this.getData(); this.getData();
this._getNewEOBList(); this._getNewEOBList();
...@@ -895,7 +929,7 @@ export default { ...@@ -895,7 +929,7 @@ export default {
} }
} }
.all-list_box { .all-list_box {
height: calc(100vh - 430px); height: calc(100vh - 400px);
overflow-y: auto; overflow-y: auto;
&.no-data { &.no-data {
display: flex; display: flex;
...@@ -951,6 +985,9 @@ export default { ...@@ -951,6 +985,9 @@ export default {
min-height: 0; min-height: 0;
} }
} }
.fixed_width {
max-width: 150px;
}
} }
.bill-content { .bill-content {
overflow-y: auto; overflow-y: auto;
...@@ -981,4 +1018,20 @@ export default { ...@@ -981,4 +1018,20 @@ export default {
color: red; color: red;
} }
} }
@media screen and (min-width: 1920px) {
.all-list_box {
height: calc(100vh - 420px);
}
}
@media screen and (min-width: 1920px) {
.all-list_box {
height: calc(100vh - 420px);
}
}
@media screen and (min-width: 1440px) {
.all-list_box {
height: calc(100vh - 400px);
}
}
</style> </style>
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