Commit fdc2533e by yuzhenWang

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

Test

See merge request !76
parents 91ddda18 6cf39f79
...@@ -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) },
......
...@@ -200,7 +200,7 @@ const onSubmit = async (data) => { ...@@ -200,7 +200,7 @@ const onSubmit = async (data) => {
} else if (data.activeTab === 'productPlan') { } else if (data.activeTab === 'productPlan') {
params = { params = {
policyBizId: selectedRow.value.policyBizId, policyBizId: selectedRow.value.policyBizId,
...data, apiProductPlanMainInfoDto:{...data},
activeTab: undefined activeTab: undefined
} }
const res = await updatePolicyProduct(params) const res = await updatePolicyProduct(params)
......
...@@ -613,7 +613,9 @@ const basicPlanFormConfig = ref([ ...@@ -613,7 +613,9 @@ const basicPlanFormConfig = ref([
return res?.data.records || [] return res?.data.records || []
}, },
onChangeExtraFields: { onChangeExtraFields: {
insuranceCompany: 'fullName' insuranceCompany: 'fullName',
companyId: 'insuranceCompanyId',
companyName: 'fullName'
} }
}, },
{ {
...@@ -676,17 +678,28 @@ const basicPlanFormConfig = ref([ ...@@ -676,17 +678,28 @@ const basicPlanFormConfig = ref([
type: 'input', type: 'input',
prop: 'issueNumber', prop: 'issueNumber',
label: '供款期数', label: '供款期数',
inputType: 'decimal'
}, },
{ {
type: 'input', type: 'input',
prop: 'guaranteePeriod', prop: 'guaranteePeriod',
label: '保障期限' label: '保障年期',
inputType: 'decimal',
decimalDigits: 4,
rules: [
{ required: true, message: '请输入金额', trigger: 'blur' },
{ pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
]
}, },
{ {
type: 'input', type: 'input',
prop: 'sumInsured', prop: 'sumInsured',
label: '保额(重疾险)' label: '保额(重疾险)',
inputType: 'decimal',
decimalDigits: 4,
rules: [
{ required: true, message: '请输入金额', trigger: 'blur' },
{ pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
]
}, },
{ {
type: 'select', type: 'select',
...@@ -696,7 +709,7 @@ const basicPlanFormConfig = ref([ ...@@ -696,7 +709,7 @@ const basicPlanFormConfig = ref([
}, },
{ {
type: 'input', type: 'input',
prop: 'initialPremium', prop: 'eachIssuePremium',
label: '每期保费', label: '每期保费',
inputType: 'decimal', inputType: 'decimal',
decimalDigits: 4, decimalDigits: 4,
......
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