Skip to content

Y
yd-csf-front
Commit a4c372da by zhangxingmin
Options

Merge remote-tracking branch 'origin/dev' into prod

parents 03dddd55 2ee50ee6
Showing with 61 additions and 202 deletions
src/views/financialCenter/financialBilling.vue
......@@ -1115,7 +1115,7 @@ const addCheckRecordConfig = [
prop: 'payoutDate',
label: '出账月(估)',
placeholder: '请选择',
maxDate: 'today',
// maxDate: 'today',
rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
},
{
......
src/views/financialCenter/financialSalary.vue
......@@ -384,11 +384,11 @@ const searchConfig = ref([
}
},
{
type: 'daterange',
type: 'monthrange',
prop: 'payoutDate',
label: '出账日（实）',
startPlaceholder: '开始时间',
endPlaceholder: '结束时间'
label: '出账月（实）',
startPlaceholder: '开始',
endPlaceholder: '结束'
},
{
type: 'select',
......@@ -818,6 +818,7 @@ const getList = async (searchParams = {}) => {
pageSize: pageSize.value,
statusList: searchParams.statusList || ['6']
}
const response = await getReferrerFortuneList(params)
if (response.data.page) {
......
src/views/financialCenter/payables.vue
......@@ -148,8 +148,8 @@
>
<el-table-column
v-for="item in payableReportListTableColumns"
:key="item.property"
:property="item.property"
:key="item.prop"
:property="item.prop"
:label="item.label"
:width="item.width"
:formatter="item.formatter"
......@@ -396,58 +396,19 @@ const detailDialogVisible = ref(false)
// 应付明细列表
const payableReportListTableColumns = ref([
// { prop: 'fortuneBizType', label: '应付款类型', sortable: true, width: '120', formatter: (row) => getFortuneBizTypeLabel(row.fortuneBizType) || '-' },
// { prop: 'payableNo', label: '应付账款编号', sortable: true, width: '120', formatter: (row) => row.payableNo || '-' },
{
prop: 'type',
label: '是否实际出账',
sortable: true,
width: '80',
formatter: row => getTypeLabel(row.type) || '-'
},
{
prop: 'payableNo',
label: '业务编号',
sortable: true,
width: '130',
formatter: row => row.payableNo || '-'
},
// {
// prop: 'policyNo',
// label: '关联业务编号',
// sortable: true,
// width: '130',
// formatter: row => row.policyNo || '-'
// },
{
prop: 'policyNo',
label: '保单号',
sortable: true,
width: '130',
formatter: row => row.policyNo || '-'
},
{
prop: 'broker',
label: '转介人',
sortable: true,
width: '120',
formatter: row => row.broker || '-'
},
{
prop: 'brokerGradeName',
label: '职级',
sortable: true,
width: '120',
formatter: row => row.brokerGradeName || '-'
},
{
prop: 'fortuneName',
label: '出账项目',
sortable: true,
width: '120',
formatter: row => row.fortuneName || '-'
formatter: row => getTypeLabel(row.type) || '-'
},
{ prop: 'payableNo', label: '业务编号', sortable: true, width: '120' },
{ prop: 'policyNo', label: '保单号', sortable: true, width: '120' },
{ prop: 'broker', label: '转介人', sortable: true, width: '120' },
{ prop: 'brokerGradeName', label: '职级', sortable: true, width: '100' },
{ prop: 'fortuneName', label: '出账项目', sortable: true, width: '150' },
{ prop: 'amountSourceName', label: '关联人员', sortable: true, width: '120' },
{
prop: 'status',
label: '出账状态',
......@@ -455,164 +416,55 @@ const payableReportListTableColumns = ref([
width: '120',
formatter: row => getDictLabel('csf_expected_fortune_status', row.status) || '-'
},
{
prop: 'payoutCurrency',
label: '出账币种',
sortable: true,
width: '100',
formatter: row => row.payoutCurrency || '-'
},
{
prop: 'fortunePeriod',
label: '出账期数',
sortable: true,
width: '100',
formatter: row => row.fortunePeriod || '-'
},
{
prop: 'fortuneTotalPeriod',
label: '出账总期数',
sortable: true,
width: '100',
formatter: row => row.fortuneTotalPeriod || '-'
},
{
prop: 'payoutDate',
label: '出账年月（估）',
sortable: true,
width: '120',
formatter: row => row.payoutDate || '-'
},
{
prop: 'actualPayoutDate',
label: '出账年月（实）',
sortable: true,
width: '120',
formatter: row => row.actualPayoutDate || '-'
},
{
prop: 'paidRatio',
label: '已出账比例',
sortable: true,
width: '120',
formatter: row => (row.paidRatio || 0) + '%' || '-'
},
{
prop: 'unpaidRatio',
label: '待出账比例',
sortable: true,
width: '120',
formatter: row => (row.unpaidRatio || 0) + '%' || '-'
},
// { prop: 'commissionRatio', label: '职级对应积分比例', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) || '-' },
{
prop: 'hkdAmount',
label: 'HKD应出账金额',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.hkdAmount || 0)
},
// {
// prop: 'exchangeRate',
// label: '保单币种->HKD(汇率)',
// sortable: true,
// width: '140',
// formatter: row => formatCurrency(row.exchangeRate || 0, '', 5)
// },
{ prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '100' },
{ prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100' },
{ prop: 'payoutDate', label: '出账年月（估）', sortable: true, width: '120' },
{ prop: 'actualPayoutDate', label: '出账年月（实）', sortable: true, width: '120' },
{
prop: 'exchangeRate',
label: '保单币种->HKD(汇率)',
sortable: true,
width: '140',
formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-')
},
{
prop: 'paidAmount',
label: '已出账金额(HKD)',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.paidAmount || 0)
},
{
prop: 'unpaidAmount',
label: '待出账金额(估)',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.unpaidAmount || 0)
},
{
prop: 'currentPaymentHkdAmount',
label: '本期待出账金额',
label: '入账检核汇率',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.currentPaymentHkdAmount || 0)
formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-')
},
{
prop: 'exchangeRate',
label: '本期结算汇率(实)',
label: '保单币种->HKD汇率',
sortable: true,
width: '120',
width: '160',
formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-')
},
{
prop: 'brokerRatio',
label: '持有比例',
sortable: true,
width: '100',
formatter: row => (row.brokerRatio || 0) + '%' || '-'
},
{
prop: 'premium',
label: '期交保费',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.premium || 0)
},
{
prop: 'insuranceCompany',
label: '保险公司',
sortable: true,
width: '120',
formatter: row => row.insuranceCompany || '-'
},
{
prop: 'productName',
label: '产品计划',
sortable: true,
width: '120',
formatter: row => row.productName || '-'
},
{
prop: 'remark',
label: '备注',
sortable: true,
width: '120',
formatter: row => row.remark || '-'
},
// {
// prop: 'statusDesc',
// label: '修改理由',
// sortable: true,
// width: '120',
// formatter: row => row.statusDesc || '-'
// },
{
prop: 'creatorName',
label: '创建人',
sortable: true,
width: '120',
formatter: row => row.creatorName || '-'
},
{
prop: 'createTime',
label: '创建时间',
prop: 'hkdToPayoutRate',
label: 'HKD->发放币种汇率',
sortable: true,
width: '180',
formatter: row => row.createTime || '-'
}
width: '160',
formatter: row => formatNumberToMaxDigits(row.hkdToPayoutRate, 5, '-')
},
{ prop: 'ruleCurrency', label: '保单币种', sortable: true, width: '100' },
{ prop: 'originalCurrency', label: '原币种', sortable: true, width: '100' },
{ prop: 'payoutCurrency', label: '发放币种', sortable: true, width: '100' },
{ prop: 'originalAmount', label: '原币种金额', sortable: true, width: '120' },
{ prop: 'hkdAmount', label: '应发港币金额（估）', sortable: true, width: '140' },
{ prop: 'ruleAmount', label: '应发保单记账金额', sortable: true, width: '140' },
{ prop: 'currentPaymentRuleAmount', label: '本次发放保单记账金额', sortable: true, width: '160' },
{ prop: 'currentPayoutAmount', label: '本次发放金额', sortable: true, width: '120' },
{ prop: 'currentPaymentHkdAmount', label: '本次发放折合港币金额', sortable: true, width: '160' },
{ prop: 'currentPaymentRatio', label: '本次发放比例', sortable: true, width: '120' },
{ prop: 'paidRuleAmount', label: '累积已发放保单记账金额', sortable: true, width: '180' },
{ prop: 'paidAmount', label: '累积已发放港币金额', sortable: true, width: '160' },
{ prop: 'paidRatio', label: '累积已发放比例%', sortable: true, width: '140' },
{ prop: 'unpaidRatio', label: '剩余发放比例%', sortable: true, width: '120' },
{ prop: 'unpaidRuleAmount', label: '剩余保单记账金额', sortable: true, width: '160' },
{ prop: 'unpaidRuleAmounthHkd', label: '剩余发放折合港币金额', sortable: true, width: '180' },
{ prop: 'premium', label: '期交保费', sortable: true, width: '120' },
{ prop: 'fortuneTotalPeriod', label: '供款期数', sortable: true, width: '100' },
{ prop: 'productName', label: '产品计划', sortable: true, width: '150' },
{ prop: 'brokerRatio', label: '持有比例%', sortable: true, width: '100' },
{ prop: 'remark', label: '备注', sortable: false, width: '200' },
{ prop: 'creatorName', label: '创建人', sortable: true, width: '100' },
{ prop: 'createTime', label: '创建时间', sortable: true, width: '160' },
{ prop: 'updateTime', label: '更新时间', sortable: true, width: '160' }
])
// 设置出账状态
......@@ -1149,7 +1001,7 @@ const addPayRecordFormConfig = [
prop: 'payoutDate',
label: '出账月(估)',
placeholder: '请选择',
maxDate: 'today',
// maxDate: 'today',
rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
},
{
......@@ -1893,6 +1745,7 @@ const expectedFortuneListData = async () => {
}
const response = await expectedFortuneList(params)
payableReportTableData.value = response.data.page.records
console.log('payableReportTableData', payableReportTableData.value)
detailPageInfo.value.total = response.data.page.total
detailPageInfo.value.pageSize = response.data.page.size
// 统计信息
......
src/views/financialCenter/receivables.vue
......@@ -131,7 +131,7 @@
:formatter="value => formatCurrency(value)"
>
<template #title>
<div style="display: inline-flex; align-items: center">HKD$待入账金额</div>
<div style="display: inline-flex; align-items: center">HKD$待入账金额(估)</div>
</template>
</el-statistic>
</el-col>
......
src/views/sign/policyReceipts/premiumRecon.vue
......@@ -850,10 +850,15 @@ const handleUploadSuccess = (prop, Model) => {
;((item.fileName = newObj.originalName), //文件名
(item.fileType = newObj.fileType), //文件类型
(item.fileUrl = newObj.url), //文件URL,
(item.url = newObj.url))
(item.url = newObj.url),
(item.creatorName = newObj.creatorName),
(item.createTime = newObj.createTime))
}
})
tempOtherFileList.value = list
console.log('====================================')
console.log('tempOtherFileList.value', tempOtherFileList.value)
console.log('====================================')
}
}
// 下拉框改变
......
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