Skip to content

Y
yd-csf-front
Commit d8d8f70b by yuzhenWang
Options

Merge branch 'test' into 'feature-20250827wyz-写业务' 

Test

See merge request !81
parents 4354d8ed 5acadb8b
Showing with 24 additions and 21 deletions
src/views/financialCenter/financialBilling.vue
...@@ -52,14 +52,14 @@ ...@@ -52,14 +52,14 @@
</div> </div>
</el-card> </el-card>
</el-col> </el-col>
<el-col :xs="24" :sm="12" :md="4" :lg="4"> <!-- <el-col :xs="24" :sm="12" :md="4" :lg="4">
<el-card shadow="hover" class="statistics-card"> <el-card shadow="hover" class="statistics-card">
<div class="card-content"> <div class="card-content">
<div class="card-label">差额（估）</div> <div class="card-label">差额（估）</div>
<div class="card-value">{{ statisticsData.differenceAmount ? formatCurrency(statisticsData.differenceAmount) : 0 }}</div> <div class="card-value">{{ statisticsData.differenceAmount ? formatCurrency(statisticsData.differenceAmount) : 0 }}</div>
</div> </div>
</el-card> </el-card>
</el-col> </el-col> -->
</el-row> </el-row>
</div> </div>
<el-table :data="tableData" @selection-change="handleSelectionChange" height="400" border highlight-current-row <el-table :data="tableData" @selection-change="handleSelectionChange" height="400" border highlight-current-row
...@@ -80,20 +80,22 @@ ...@@ -80,20 +80,22 @@
<el-table-column prop="broker" label="转介人" width="130" sortable /> <el-table-column prop="broker" label="转介人" width="130" sortable />
<el-table-column prop="team" label="所属团队" width="120" sortable /> <el-table-column prop="team" label="所属团队" width="120" sortable />
<el-table-column prop="exchangeRate" label="结算汇率（估）" width="140" sortable /> <el-table-column prop="exchangeRate" label="结算汇率（估）" width="140" sortable />
<el-table-column prop="amount" label="应出账金额" width="140" sortable /> <el-table-column prop="hkdAmount" label="应出账金额（HKD）" width="160" sortable/>
<el-table-column prop="currency" label="出账币种" width="130" sortable /> <el-table-column prop="currency" label="出账币种" width="130" sortable />
<el-table-column prop="fortunePaidAmount" label="已出账金额" width="120" sortable /> <el-table-column prop="fortunePaidAmount" label="已出账金额" width="160" sortable />
<el-table-column prop="fortuneUnpaidAmount" label="剩余出账金额" width="120" sortable /> <el-table-column prop="fortuneUnpaidAmount" label="剩余出账金额" width="160" sortable />
<el-table-column prop="currentPaymentAmount" label="本期出账金额" width="120" sortable/> <!-- <el-table-column prop="currentPaymentAmount" label="本期出账金额" width="120" sortable/> -->
<el-table-column prop="currentPaymentHkdAmount" label="本期出账金额（HKD）" width="160" sortable/>
<el-table-column prop="fortuneUnpaidRatio" label="剩余出账比例" width="120" sortable :formatter="(row) => `${row.fortuneUnpaidRatio }%`" /> <el-table-column prop="fortuneUnpaidRatio" label="剩余出账比例" width="120" sortable :formatter="(row) => `${row.fortuneUnpaidRatio }%`" />
<el-table-column prop="status" label="出账状态" width="120" sortable> <el-table-column prop="status" label="出账状态" width="160" sortable>
<template #default="{ row }"> <template #default="{ row }">
{{ selectDictLabel(csf_fortune_status, row.status) }} {{ selectDictLabel(csf_fortune_status, row.status) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="premium" label="期交保费" width="120" sortable /> <el-table-column prop="premium" label="期交保费" width="120" sortable />
<el-table-column prop="policyCurrency" label="保单币种" width="120" sortable /> <el-table-column prop="policyCurrency" label="保单币种" width="120" sortable />
<el-table-column prop="payoutDate" label="出账日（实）" width="120" sortable /> <el-table-column prop="payoutDate" label="出账日（估）" width="120" sortable />
<el-table-column prop="actualPayoutDate" label="出账日（实）" width="120" sortable />
<el-table-column prop="remark" label="备注" width="120" sortable /> <el-table-column prop="remark" label="备注" width="120" sortable />
<el-table-column fixed="right" label="操作" min-width="120"> <el-table-column fixed="right" label="操作" min-width="120">
<template #default="{ row }"> <template #default="{ row }">
...@@ -331,18 +333,20 @@ const setPayoutAmountDialogFlag = ref(false) ...@@ -331,18 +333,20 @@ const setPayoutAmountDialogFlag = ref(false)
const setPayoutAmountConfig = [ const setPayoutAmountConfig = [
{ {
type: 'input', type: 'input',
prop: 'currentPaymentAmount', prop: 'currentPaymentHkdAmount',
label: '出账金额', label: '本期出账金额（HKD）',
inputType: 'decimal', inputType: 'decimal',
rules: [ rules: [
{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' } { pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }
] ]
}, { },
type: 'select', // {
prop: 'currency', // type: 'select',
label: '出账币种', // prop: 'currency',
dictType: 'bx_currency_type' // label: '出账币种',
}, { // dictType: 'bx_currency_type'
// },
{
type: 'select', type: 'select',
prop: 'status', prop: 'status',
label: '出账状态', label: '出账状态',
......
src/views/financialCenter/financialSalary.vue
...@@ -25,9 +25,9 @@ ...@@ -25,9 +25,9 @@
<el-table-column type="selection" width="55" :reserve-selection="true" /> <el-table-column type="selection" width="55" :reserve-selection="true" />
<el-table-column prop="broker" label="转介人" min-width="120" sortable /> <el-table-column prop="broker" label="转介人" min-width="120" sortable />
<el-table-column prop="team" label="所属团队" min-width="120" sortable /> <el-table-column prop="team" label="所属团队" min-width="120" sortable />
<el-table-column prop="amount" label="出账金额" width="120" sortable> <el-table-column prop="hkdAmount" label="出账金额" width="120" sortable>
<template #default="scope"> <template #default="scope">
{{ formatCurrency(scope.row.amount) }} {{ formatCurrency(scope.row.hkdAmount) }}
</template> </template>
</el-table-column> </el-table-column>
<el-table-column prop="currency" label="出账币种" width="120" sortable> <el-table-column prop="currency" label="出账币种" width="120" sortable>
......
src/views/financialCenter/payables.vue
...@@ -204,7 +204,7 @@ const payableReportTableColumns = ref([ ...@@ -204,7 +204,7 @@ const payableReportTableColumns = ref([
{ prop: 'unpaidRatio', label: '待出账比例', sortable: true, width: '120', formatter: (row) => (row.unpaidRatio || 0) + '%' || '-' }, { prop: 'unpaidRatio', label: '待出账比例', sortable: true, width: '120', formatter: (row) => (row.unpaidRatio || 0) + '%' || '-' },
{ prop: 'paidAmount', label: '已出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) }, { prop: 'paidAmount', label: '已出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) },
{ prop: 'unpaidAmount', label: '待出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.unpaidAmount || 0) }, { prop: 'unpaidAmount', label: '待出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.unpaidAmount || 0) },
{ prop: 'amount', label: '应出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.amount || 0) }, { prop: 'hkdAmount', label: '应出账金额（估）', sortable: true, width: '120', formatter: (row) => formatCurrency(row.hkdAmount || 0) },
{ prop: 'currency', label: '出账币种', sortable: true, width: '120', formatter: (row) => row.currency || '-' }, { prop: 'currency', label: '出账币种', sortable: true, width: '120', formatter: (row) => row.currency || '-' },
{ prop: 'premium', label: '期交保费', sortable: true, width: '120', formatter: (row) => formatCurrency(row.premium || 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: 'insuranceCompany', label: '保险公司', sortable: true, width: '120', formatter: (row) => row.insuranceCompany || '-' },
...@@ -226,7 +226,7 @@ const payableReportListTableColumns = ref([ ...@@ -226,7 +226,7 @@ const payableReportListTableColumns = ref([
{ prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100', formatter: (row) => row.fortuneTotalPeriod || '-' }, { prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100', formatter: (row) => row.fortuneTotalPeriod || '-' },
{ prop: 'payoutDate', label: '出账日（估）', sortable: true, width: '120', formatter: (row) => row.payoutDate || '-' }, { prop: 'payoutDate', label: '出账日（估）', sortable: true, width: '120', formatter: (row) => row.payoutDate || '-' },
{ prop: 'actualPayoutDate', label: '出账日（实）', sortable: true, width: '120', formatter: (row) => row.actualPayoutDate || '-' }, { prop: 'actualPayoutDate', label: '出账日（实）', sortable: true, width: '120', formatter: (row) => row.actualPayoutDate || '-' },
{ prop: 'commissionRatio', label: '职级对应积分比例', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) || '-' }, // { prop: 'commissionRatio', label: '职级对应积分比例', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0) || '-' },
{ prop: 'hkdAmount', label: '应出账金额（估）', sortable: true, width: '120', formatter: (row) => formatCurrency(row.hkdAmount || 0) }, { prop: 'hkdAmount', label: '应出账金额（估）', sortable: true, width: '120', formatter: (row) => formatCurrency(row.hkdAmount || 0) },
{ prop: 'paidRatio', label: '已出账比例', sortable: true, width: '120', formatter: (row) => (row.paidRatio || 0) + '%' || '-' }, { prop: 'paidRatio', label: '已出账比例', sortable: true, width: '120', formatter: (row) => (row.paidRatio || 0) + '%' || '-' },
{ prop: 'paidAmount', label: '已出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) }, { prop: 'paidAmount', label: '已出账金额', sortable: true, width: '120', formatter: (row) => formatCurrency(row.paidAmount || 0) },
......
src/views/sign/underwritingMain/policyDetail.vue
...@@ -696,7 +696,6 @@ const basicPlanFormConfig = ref([ ...@@ -696,7 +696,6 @@ const basicPlanFormConfig = ref([
inputType: 'decimal', inputType: 'decimal',
decimalDigits: 4, decimalDigits: 4,
rules: [ rules: [
{ required: true, message: '请输入金额', trigger: 'blur' },
{ pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' } { pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
] ]
}, },
......
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