Skip to content

Y
yd-csf-front
Commit 294926dc by yuzhenWang
Options

Merge branch 'test' into 'wyz' 

Test

See merge request !157
parents c0cd282e a8d564c0
Showing with 50 additions and 219 deletions
nginx.conf
...@@ -2,6 +2,14 @@ server { ...@@ -2,6 +2,14 @@ server {
listen 6688; listen 6688;
server_name 139.224.145.34; server_name 139.224.145.34;
location ~ \.mjs$ {
root /usr/share/nginx/html;
default_type application/javascript; # 设置默认 MIME 类型
add_header 'Access-Control-Allow-Origin' '*';
expires 1y;
add_header Cache-Control "public, immutable";
}
# 处理前端静态资源（Vue应用） # 处理前端静态资源（Vue应用）
location / { location / {
root /usr/share/nginx/html; root /usr/share/nginx/html;
......
src/views/financialCenter/payables.vue
...@@ -148,8 +148,8 @@ ...@@ -148,8 +148,8 @@
> >
<el-table-column <el-table-column
v-for="item in payableReportListTableColumns" v-for="item in payableReportListTableColumns"
:key="item.property" :key="item.prop"
:property="item.property" :property="item.prop"
:label="item.label" :label="item.label"
:width="item.width" :width="item.width"
:formatter="item.formatter" :formatter="item.formatter"
...@@ -396,223 +396,45 @@ const detailDialogVisible = ref(false) ...@@ -396,223 +396,45 @@ const detailDialogVisible = ref(false)
// 应付明细列表 // 应付明细列表
const payableReportListTableColumns = ref([ const payableReportListTableColumns = ref([
// { prop: 'fortuneBizType', label: '应付款类型', sortable: true, width: '120', formatter: (row) => getFortuneBizTypeLabel(row.fortuneBizType) || '-' }, { prop: 'type', label: '是否实际出账', sortable: true, width: '120', formatter: row => getTypeLabel(row.type) || '-' },
// { prop: 'payableNo', label: '应付账款编号', sortable: true, width: '120', formatter: (row) => row.payableNo || '-' }, { prop: 'payableNo', label: '业务编号', sortable: true, width: '120' },
{ { prop: 'policyNo', label: '保单号', sortable: true, width: '120' },
prop: 'type', { prop: 'broker', label: '转介人', sortable: true, width: '120' },
label: '是否实际出账', { prop: 'brokerGradeName', label: '职级', sortable: true, width: '100' },
sortable: true, { prop: 'fortuneName', label: '出账项目', sortable: true, width: '150' },
width: '80', { prop: 'amountSourceName', label: '关联人员', sortable: true, width: '120' },
formatter: row => getTypeLabel(row.type) || '-' { prop: 'status', label: '出账状态', sortable: true, width: '120',formatter: row => getDictLabel('csf_expected_fortune_status', row.status) || '-' },
}, { prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '100' },
{ prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100' },
{ { prop: 'payoutDate', label: '出账年月（估）', sortable: true, width: '120' },
prop: 'payableNo', { prop: 'actualPayoutDate', label: '出账年月（实）', sortable: true, width: '120' },
label: '业务编号', { prop: 'exchangeRate', label: '入账检核汇率', sortable: true, width: '120',formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-') },
sortable: true, { prop: 'defaultExchangeRate', label: '保单币种->HKD汇率', sortable: true, width: '160',formatter: row => formatNumberToMaxDigits(row.defaultExchangeRate, 5, '-') },
width: '130', { prop: 'hkdToPayoutRate', label: 'HKD->发放币种汇率', sortable: true, width: '160',formatter: row => formatNumberToMaxDigits(row.hkdToPayoutRate, 5, '-') },
formatter: row => row.payableNo || '-' { prop: 'ruleCurrency', label: '保单币种', sortable: true, width: '100' },
}, { prop: 'originalCurrency', label: '原币种', sortable: true, width: '100' },
// { { prop: 'payoutCurrency', label: '发放币种', sortable: true, width: '100' },
// prop: 'policyNo', { prop: 'originalAmount', label: '原币种金额', sortable: true, width: '120' },
// label: '关联业务编号', { prop: 'hkdAmount', label: '应发港币金额（估）', sortable: true, width: '140' },
// sortable: true, { prop: 'ruleAmount', label: '应发保单记账金额', sortable: true, width: '140' },
// width: '130', { prop: 'currentPaymentRuleAmount', label: '本次发放保单记账金额', sortable: true, width: '160' },
// formatter: row => row.policyNo || '-' { prop: 'currentPayoutAmount', label: '本次发放金额', sortable: true, width: '120' },
// }, { prop: 'currentPaymentHkdAmount', label: '本次发放折合港币金额', sortable: true, width: '160' },
{ { prop: 'currentPaymentRatio', label: '本次发放比例', sortable: true, width: '120' },
prop: 'policyNo', { prop: 'paidRuleAmount', label: '累积已发放保单记账金额', sortable: true, width: '180' },
label: '保单号', { prop: 'paidAmount', label: '累积已发放港币金额', sortable: true, width: '160' },
sortable: true, { prop: 'paidRatio', label: '累积已发放比例%', sortable: true, width: '140' },
width: '130', { prop: 'unpaidRatio', label: '剩余发放比例%', sortable: true, width: '120' },
formatter: row => row.policyNo || '-' { prop: 'unpaidRuleAmount', label: '剩余保单记账金额', sortable: true, width: '160' },
}, { prop: 'unpaidRuleAmounthHkd', label: '剩余发放折合港币金额', sortable: true, width: '180' },
{ { prop: 'premium', label: '期交保费', sortable: true, width: '120' },
prop: 'broker', { prop: 'fortuneTotalPeriod', label: '供款期数', sortable: true, width: '100' },
label: '转介人', { prop: 'productName', label: '产品计划', sortable: true, width: '150' },
sortable: true, { prop: 'brokerRatio', label: '持有比例%', sortable: true, width: '100' },
width: '120', { prop: 'remark', label: '备注', sortable: false, width: '200' },
formatter: row => row.broker || '-' { prop: 'creatorName', label: '创建人', sortable: true, width: '100' },
}, { prop: 'createTime', label: '创建时间', sortable: true, width: '160' },
{ { prop: 'updateTime', label: '更新时间', sortable: true, width: '160' }
prop: 'brokerGradeName',
label: '职级',
sortable: true,
width: '120',
formatter: row => row.brokerGradeName || '-'
},
{
prop: 'fortuneName',
label: '出账项目',
sortable: true,
width: '120',
formatter: row => row.fortuneName || '-'
},
{
prop: 'status',
label: '出账状态',
sortable: true,
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: '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: '本期待出账金额',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.currentPaymentHkdAmount || 0)
},
{
prop: 'exchangeRate',
label: '本期结算汇率(实)',
sortable: true,
width: '120',
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: '创建时间',
sortable: true,
width: '180',
formatter: row => row.createTime || '-'
}
]) ])
// 设置出账状态 // 设置出账状态
...@@ -1893,6 +1715,7 @@ const expectedFortuneListData = async () => { ...@@ -1893,6 +1715,7 @@ const expectedFortuneListData = async () => {
} }
const response = await expectedFortuneList(params) const response = await expectedFortuneList(params)
payableReportTableData.value = response.data.page.records payableReportTableData.value = response.data.page.records
console.log('payableReportTableData', payableReportTableData.value)
detailPageInfo.value.total = response.data.page.total detailPageInfo.value.total = response.data.page.total
detailPageInfo.value.pageSize = response.data.page.size detailPageInfo.value.pageSize = response.data.page.size
// 统计信息 // 统计信息
......
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