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

src/store/modules/user.js

@@ -11,6 +11,7 @@ const useUserStore = defineStore('user', {
   state: () => ({
     token: getToken(),
     id: '',
+    realName:'',
     name: '',
     nickName: '',
     avatar: '',
@@ -74,6 +75,7 @@ const useUserStore = defineStore('user', {
 
             this.id = user.userId
             this.name = user.userName
+            this.realName = user.realName
             this.nickName = user.nickName
             this.avatar = avatar
             this.isSuperAdmin = user.isSuperAdmin

src/views/financialCenter/receivables.vue

@@ -965,19 +965,12 @@ const receivableReportTableColumns = ref([
   { prop: 'commissionDate', label: '入账年月（估）', sortable: true, width: '130' },
   {
     prop: 'commissionRatio',
-    label: '产品对应来佣率',
+    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: 'paidRatio',
     label: '已入账比例',
     sortable: true,
@@ -985,25 +978,25 @@ const receivableReportTableColumns = ref([
     formatter: row => (row.paidRatio || 0) + '%' || '-'
   },
   {
-    prop: 'paidAmount',
-    label: '已入账金额HKD',
+    prop: 'unpaidRatio',
+    label: '待入账比例',
     sortable: true,
     width: '120',
-    formatter: row => formatCurrency(row.paidAmount || 0)
+    formatter: row => (row.unpaidRatio || 0) + '%' || '-'
   },
   {
-    prop: 'unpaidRatio',
-    label: '待入账比例',
+    prop: 'paidAmount',
+    label: '已入账金额HKD',
     sortable: true,
     width: '120',
-    formatter: row => (row.unpaidRatio || 0) + '%' || '-'
+    formatter: row => formatCurrency(row.paidAmount || 0)
   },
   {
-    prop: 'unpaidAmount',
-    label: '待入账金额HKD',
+    prop: 'hkdAmount',
+    label: '待入账金额HKD(估)',
     sortable: true,
     width: '120',
-    formatter: row => formatCurrency(row.unpaidAmount || 0)
+    formatter: row => formatCurrency(row.hkdAmount || 0)
   },
   { prop: 'exchangeRate', label: '结算汇率（估）', sortable: true, width: '120' },
   {
@@ -1014,6 +1007,20 @@ const receivableReportTableColumns = ref([
     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',
     label: '投保人',
     sortable: true,
@@ -1028,24 +1035,18 @@ const receivableReportTableColumns = ref([
     formatter: row => row.policyHolderEn || '-'
   },
   {
-    prop: 'remark',
-    label: '备注',
-    width: '150',
-    formatter: row => row.remark || '-'
-  },
-  {
-    prop: 'productName',
-    label: '产品计划',
+    prop: 'insured',
+    label: '受保人',
     sortable: true,
     width: '120',
-    formatter: row => row.productName || '-'
+    formatter: row => row.insured || '-'
   },
   {
-    prop: 'premium',
-    label: '期交保费',
+    prop: 'insuredEn',
+    label: '受保人(英文)',
     sortable: true,
     width: '120',
-    formatter: row => formatCurrency(row.premium || 0)
+    formatter: row => row.insuredEn || '-'
   },
   {
     prop: 'policyCurrency',
@@ -1053,6 +1054,19 @@ const receivableReportTableColumns = ref([
     sortable: true,
     width: '120',
     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()
 const router = useRouter()
 const activeName = ref()
 const loading = ref(false)
+console.log('userStore', userStore)
+
 const processInfo = ref({
   fnaNo: '--',
   status: '未保存',
   createTime: proxy.parseTime(new Date()),
-  creatorName: userStore.name
+  creatorName: userStore.realName
 }) // 流程详情信息
 const updateStatus = ref(false)
 const dictTypeLists = ref([])
@@ -399,9 +401,9 @@ function getProcessInfo(fnaBizId, changeTab, currentTab) {
   getProcessDetail(fnaBizId).then(async res => {
     if (res.code == 200) {
       processInfo.value = res.data
-      if (!processInfo.value.creatorName) {
-        processInfo.value.creatorName = userStore.name
-      }
+      // if (!processInfo.value.creatorName) {
+      //   processInfo.value.creatorName = userStore.realName
+      // }
       tabsList.value.forEach(item => {
         if (res.data[item.key] && item.status) {
           item.status = '1'

src/views/sign/policyReceipts/premiumRecon.vue

@@ -550,7 +550,7 @@ const affirmConfig = [
     type: 'select',
     prop: 'status',
     label: '保单状态',
-    dictType: 'csf_policy_status_new',
+    dictType: 'csf_policy_follow_status_new',
     visible: formData =>
       (formData.remainingUnpaidAmount && Number(formData.remainingUnpaidAmount) < 0) ||
       Number(formData.remainingUnpaidAmount) == 0