Skip to content

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

Merge branch 'func_eccs_2250' into test

parents 454d9d2b 519332d8
Hide whitespace changes
Inline Side-by-side
Showing with 232 additions and 176 deletions
src/components/CUSTOMER/pagation/index.vue
View file @ e1b3875a
<template> <template>
<!--分页--> <!--分页-->
<div class="flex my-pagination" v-if="pagination.total > pagination.pageSize"> <div class="flex my-pagination" v-if="pagination.total > pagination.pageSize">
<a-pagination <a-pagination
v-model="pagination.pageNum" v-model="pagination.pageNum"
:total="pagination.total" :total="pagination.total"
:page-size="pagination.pageSize" :page-size="pagination.pageSize"
:item-render="itemRender" :item-render="itemRender"
@change="pageChange" @change="pageChange"
/> />
<a-input <a-input
v-model.trim="jumpPage" v-model.trim="jumpPage"
class="jump-page" class="jump-page"
type="number" type="number"
:min="0" :min="0"
@blur="inputPageChange" @blur="inputPageChange"
/> />
</div> </div>
</template> </template>
<script> <script>
export default { export default {
props: { props: {
//分页器 //分页器
pagination: { pagination: {
default: {}, default: {},
}, },
}, },
data() { data() {
return { return {
//跳转到第几页 //跳转到第几页
jumpPage: "", jumpPage: "",
}; };
}, },
methods: { methods: {
//自定义分页 //自定义分页
itemRender(current, type, originalElement) { itemRender(current, type, originalElement) {
if (type === "prev") { if (type === "prev") {
return <li class="page pre">上一页</li>; return <li class="page pre">上一页</li>;
} else if (type === "next") { } else if (type === "next") {
return <li class="page next">下一页</li>; return <li class="page next">下一页</li>;
} else if (type === "page") { } else if (type === "page") {
//当前页面 //当前页面
if (current == this.pagination.pageNum) { if (current == this.pagination.pageNum) {
return ( return (
<div class="cur-page page"> <div class="cur-page page">
<span class="cur">{current}</span>/ <span class="cur">{current}</span>/
<span class="total"> <span class="total">
{Math.ceil(this.pagination.total / this.pagination.pageSize)} {Math.ceil(this.pagination.total / this.pagination.pageSize)}
</span> </span>
</div> </div>
); );
} else { } else {
return null; return null;
} }
} else if (type == "jump-prev") { } else if (type == "jump-prev") {
return null; return null;
} else if (type == "jump-next") { } else if (type == "jump-next") {
return null; return null;
} }
return originalElement; return originalElement;
}, },
//跳转页面 //跳转页面
inputPageChange() { inputPageChange() {
this.jumpPage = parseInt(this.jumpPage); this.jumpPage = parseInt(this.jumpPage);
let pages = Math.ceil(this.pagination.total / this.pagination.pageSize); let pages = Math.ceil(this.pagination.total / this.pagination.pageSize);
this.jumpPage = this.jumpPage < 0 ? 0 : this.jumpPage; this.jumpPage = this.jumpPage < 0 ? 0 : this.jumpPage;
this.jumpPage = this.jumpPage > pages ? pages : this.jumpPage; this.jumpPage = this.jumpPage > pages ? pages : this.jumpPage;
this.pagination.pageNum = this.jumpPage; this.pagination.pageNum = this.jumpPage;
this.$emit("pageChange", { pageNum: this.jumpPage }); this.$emit("pageChange", { pageNum: this.jumpPage });
}, },
//改变分页 //改变分页
pageChange(pager) { pageChange(pager) {
this.pagination.pageNum = pager; this.pagination.pageNum = pager;
this.$emit("pageChange", { pageNum: pager }); this.$emit("pageChange", { pageNum: pager });
}, },
}, },
}; };
</script> </script>
<style lang="less" scoped> <style lang="less" scoped>
.my-pagination { .my-pagination {
justify-content: flex-end; justify-content: flex-end;
margin-top: 33px; margin-top: 33px;
.page { .page {
width: 80px; width: 80px;
height: 36px; height: 36px;
line-height: 36px; line-height: 36px;
background: #f8fafb; background: #f8fafb;
font-weight: 400; font-weight: 400;
color: #252631; color: #252631;
&.cur-page { &.cur-page {
background: transparent; background: transparent;
} }
span { span {
font-size: 16px; font-size: 16px;
font-weight: 400; font-weight: 400;
&.cur { &.cur {
color: #4d7cfe; color: #4d7cfe;
} }
} }
} }
.jump-page { .jump-page {
width: 80px; width: 80px;
margin-left: 30px; margin-left: 30px;
height: 36px; height: 36px;
text-align: center; text-align: center;
} }
} }
::v-deep .ant-pagination-jump-prev, ::v-deep .ant-pagination-jump-prev,
::v-deep .ant-pagination-jump-next { ::v-deep .ant-pagination-jump-next {
display: none !important; display: none !important;
} }
</style> </style>
src/views/charge-query/index.vue
View file @ e1b3875a
...@@ -128,6 +128,9 @@ ...@@ -128,6 +128,9 @@
<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>
<template slot="redText" slot-scope="text">
<span style="color: red">{{ text }}</span>
</template>
</a-table> </a-table>
<!--分页--> <!--分页-->
<BurtPagination :pagination="pagination" @pageChange="_getChargeList" /> <BurtPagination :pagination="pagination" @pageChange="_getChargeList" />
...@@ -171,8 +174,8 @@ export default { ...@@ -171,8 +174,8 @@ export default {
{ title: '理赔金额', dataIndex: 'actualAmount', width: 180 }, { title: '理赔金额', dataIndex: 'actualAmount', width: 180 },
{ title: '保险已支付', dataIndex: 'backAmount', width: 180 }, { title: '保险已支付', dataIndex: 'backAmount', width: 180 },
{ title: '保险欠费', dataIndex: 'insuranceArrearsAmount', width: 180 }, { title: '保险欠费', dataIndex: 'insuranceArrearsAmount', width: 180 },
{ title: '个人欠费', dataIndex: 'arrearsAmount', width: 180 }, { title: '个人欠费', dataIndex: 'arrearsAmount', width: 180, scopedSlots: { customRender: 'redText' } },
{ title: '备注', dataIndex: 'remark', width: 200 }, { title: '备注', dataIndex: 'remark', width: 200, scopedSlots: { customRender: 'redText' } },
{ title: '未清余额', dataIndex: 'residueBackAmount', width: 180 }, { title: '未清余额', dataIndex: 'residueBackAmount', width: 180 },
{ title: '账龄', dataIndex: 'diffDay', width: 180 }, { title: '账龄', dataIndex: 'diffDay', width: 180 },
{ {
......
src/views/verification/collectionDetail.vue
View file @ e1b3875a
...@@ -5,25 +5,25 @@ ...@@ -5,25 +5,25 @@
<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">
<a-col :lg="7" :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>
<template v-if="activeKey === '0'"> <template v-if="activeKey === '0'">
<a-col :lg="7" :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; max-width: 250px"
@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="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,27 +36,27 @@ ...@@ -36,27 +36,27 @@
/> />
</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="请输入金额"
allow-clear allow-clear
:disabled="!isEdit" :disabled="!isEdit"
/> />
</a-form-model-item> </a-form-model-item>
</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) => {
return {
...item,
backAmount:
this.residueBackAmount > item.currentReceiptAmount ? item.currentReceiptAmount : this.residueBackAmount
};
});
if (selected) { if (selected) {
this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id)); this.selectedRowKeys = this.selectedRowKeys.concat(changeRows.map((item) => item.id));
this.selectedRows = this.selectedRows.concat(chgRows); changeRows.forEach((item) => {
const obj = {
...item,
backAmount:
this.residueBackAmount > item.currentReceiptAmount ? item.currentReceiptAmount : this.residueBackAmount
};
this.selectedRows.push(obj);
});
// 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) {
this.$message.error('暂未关联账单，请在全部账单中添加账单'); if (this.activeKey1 === '0') {
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