Skip to content

Y
yd-csf-front
Commit f51c60b8 by yuzhenWang
Options

测试出账检核--分期出账

parent 35494bf9
Showing with 52 additions and 34 deletions
src/store/modules/user.js
...@@ -11,6 +11,7 @@ const useUserStore = defineStore('user', { ...@@ -11,6 +11,7 @@ const useUserStore = defineStore('user', {
state: () => ({ state: () => ({
token: getToken(), token: getToken(),
id: '', id: '',
realName:'',
name: '', name: '',
nickName: '', nickName: '',
avatar: '', avatar: '',
...@@ -74,6 +75,7 @@ const useUserStore = defineStore('user', { ...@@ -74,6 +75,7 @@ const useUserStore = defineStore('user', {
this.id = user.userId this.id = user.userId
this.name = user.userName this.name = user.userName
this.realName = user.realName
this.nickName = user.nickName this.nickName = user.nickName
this.avatar = avatar this.avatar = avatar
this.isSuperAdmin = user.isSuperAdmin this.isSuperAdmin = user.isSuperAdmin
......
src/views/financialCenter/receivables.vue
...@@ -965,19 +965,12 @@ const receivableReportTableColumns = ref([ ...@@ -965,19 +965,12 @@ const receivableReportTableColumns = ref([
{ prop: 'commissionDate', label: '入账年月（估）', sortable: true, width: '130' }, { prop: 'commissionDate', label: '入账年月（估）', sortable: true, width: '130' },
{ {
prop: 'commissionRatio', prop: 'commissionRatio',
label: '产品对应来佣率', label: '保单来佣率',
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => (row.commissionRatio || 0) + '%' || '-' formatter: row => (row.commissionRatio || 0) + '%' || '-'
}, },
{ {
prop: 'hkdAmount',
label: '预估入账金额HKD',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.hkdAmount || 0)
},
{
prop: 'paidRatio', prop: 'paidRatio',
label: '已入账比例', label: '已入账比例',
sortable: true, sortable: true,
...@@ -985,25 +978,25 @@ const receivableReportTableColumns = ref([ ...@@ -985,25 +978,25 @@ const receivableReportTableColumns = ref([
formatter: row => (row.paidRatio || 0) + '%' || '-' formatter: row => (row.paidRatio || 0) + '%' || '-'
}, },
{ {
prop: 'paidAmount', prop: 'unpaidRatio',
label: '已入账金额HKD', label: '待入账比例',
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => formatCurrency(row.paidAmount || 0) formatter: row => (row.unpaidRatio || 0) + '%' || '-'
}, },
{ {
prop: 'unpaidRatio', prop: 'paidAmount',
label: '待入账比例', label: '已入账金额HKD',
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => (row.unpaidRatio || 0) + '%' || '-' formatter: row => formatCurrency(row.paidAmount || 0)
}, },
{ {
prop: 'unpaidAmount', prop: 'hkdAmount',
label: '待入账金额HKD', label: '待入账金额HKD(估)',
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => formatCurrency(row.unpaidAmount || 0) formatter: row => formatCurrency(row.hkdAmount || 0)
}, },
{ prop: 'exchangeRate', label: '结算汇率（估）', sortable: true, width: '120' }, { prop: 'exchangeRate', label: '结算汇率（估）', sortable: true, width: '120' },
{ {
...@@ -1014,6 +1007,20 @@ const receivableReportTableColumns = ref([ ...@@ -1014,6 +1007,20 @@ const receivableReportTableColumns = ref([
formatter: row => row.insuranceCompany || '-' formatter: row => row.insuranceCompany || '-'
}, },
{ {
prop: 'productName',
label: '产品计划',
sortable: true,
width: '120',
formatter: row => row.productName || '-'
},
{
prop: 'premium',
label: '期交保费',
sortable: true,
width: '120',
formatter: row => formatCurrency(row.premium || 0)
},
{
prop: 'policyHolder', prop: 'policyHolder',
label: '投保人', label: '投保人',
sortable: true, sortable: true,
...@@ -1028,24 +1035,18 @@ const receivableReportTableColumns = ref([ ...@@ -1028,24 +1035,18 @@ const receivableReportTableColumns = ref([
formatter: row => row.policyHolderEn || '-' formatter: row => row.policyHolderEn || '-'
}, },
{ {
prop: 'remark', prop: 'insured',
label: '备注', label: '受保人',
width: '150',
formatter: row => row.remark || '-'
},
{
prop: 'productName',
label: '产品计划',
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => row.productName || '-' formatter: row => row.insured || '-'
}, },
{ {
prop: 'premium', prop: 'insuredEn',
label: '期交保费', label: '受保人(英文)',
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => formatCurrency(row.premium || 0) formatter: row => row.insuredEn || '-'
}, },
{ {
prop: 'policyCurrency', prop: 'policyCurrency',
...@@ -1053,6 +1054,19 @@ const receivableReportTableColumns = ref([ ...@@ -1053,6 +1054,19 @@ const receivableReportTableColumns = ref([
sortable: true, sortable: true,
width: '120', width: '120',
formatter: row => row.policyCurrency || '-' formatter: row => row.policyCurrency || '-'
},
// {
// prop: 'unpaidAmount',
// label: '待入账金额HKD',
// sortable: true,
// width: '120',
// formatter: row => formatCurrency(row.unpaidAmount || 0)
// },
{
prop: 'remark',
label: '备注',
width: '150',
formatter: row => row.remark || '-'
} }
]) ])
// 应收明细 // 应收明细
......
src/views/sign/FnaList/edit.vue
...@@ -157,11 +157,13 @@ const route = useRoute() ...@@ -157,11 +157,13 @@ const route = useRoute()
const router = useRouter() const router = useRouter()
const activeName = ref() const activeName = ref()
const loading = ref(false) const loading = ref(false)
console.log('userStore', userStore)
const processInfo = ref({ const processInfo = ref({
fnaNo: '--', fnaNo: '--',
status: '未保存', status: '未保存',
createTime: proxy.parseTime(new Date()), createTime: proxy.parseTime(new Date()),
creatorName: userStore.name creatorName: userStore.realName
}) // 流程详情信息 }) // 流程详情信息
const updateStatus = ref(false) const updateStatus = ref(false)
const dictTypeLists = ref([]) const dictTypeLists = ref([])
...@@ -399,9 +401,9 @@ function getProcessInfo(fnaBizId, changeTab, currentTab) { ...@@ -399,9 +401,9 @@ function getProcessInfo(fnaBizId, changeTab, currentTab) {
getProcessDetail(fnaBizId).then(async res => { getProcessDetail(fnaBizId).then(async res => {
if (res.code == 200) { if (res.code == 200) {
processInfo.value = res.data processInfo.value = res.data
if (!processInfo.value.creatorName) { // if (!processInfo.value.creatorName) {
processInfo.value.creatorName = userStore.name // processInfo.value.creatorName = userStore.realName
} // }
tabsList.value.forEach(item => { tabsList.value.forEach(item => {
if (res.data[item.key] && item.status) { if (res.data[item.key] && item.status) {
item.status = '1' item.status = '1'
......
src/views/sign/policyReceipts/premiumRecon.vue
...@@ -550,7 +550,7 @@ const affirmConfig = [ ...@@ -550,7 +550,7 @@ const affirmConfig = [
type: 'select', type: 'select',
prop: 'status', prop: 'status',
label: '保单状态', label: '保单状态',
dictType: 'csf_policy_status_new', dictType: 'csf_policy_follow_status_new',
visible: formData => visible: formData =>
(formData.remainingUnpaidAmount && Number(formData.remainingUnpaidAmount) < 0) || (formData.remainingUnpaidAmount && Number(formData.remainingUnpaidAmount) < 0) ||
Number(formData.remainingUnpaidAmount) == 0 Number(formData.remainingUnpaidAmount) == 0
......
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