Merge branch 'wyz' into 'test'

对接应付明细

See merge request !130

src/views/financialCenter/payables.vue

@@ -373,6 +373,20 @@ const payableReportListTableColumns = ref([
   // { prop: 'fortuneBizType', label: '应付款类型', sortable: true, width: '120', formatter: (row) => getFortuneBizTypeLabel(row.fortuneBizType) || '-' },
   // { prop: 'fortuneBizType', label: '应付款类型', sortable: true, width: '120', formatter: (row) => getFortuneBizTypeLabel(row.fortuneBizType) || '-' },
   // { prop: 'payableNo', label: '应付账款编号', sortable: true, width: '120', formatter: (row) => row.payableNo || '-' },
   // { prop: 'payableNo', label: '应付账款编号', sortable: true, width: '120', formatter: (row) => row.payableNo || '-' },
   {
   {
+    prop: 'payableNo',
+    label: '业务编号',
+    sortable: true,
+    width: '130',
+    formatter: row => row.payableNo || '-'
+  },
+  {
+    prop: 'policyNo',
+    label: '关联业务编号',
+    sortable: true,
+    width: '130',
+    formatter: row => row.policyNo || '-'
+  },
+  {
     prop: 'policyNo',
     prop: 'policyNo',
     label: '保单号',
     label: '保单号',
     sortable: true,
     sortable: true,
@@ -430,53 +444,77 @@ const payableReportListTableColumns = ref([
   },
   },
   {
   {
     prop: 'payoutDate',
     prop: 'payoutDate',
-    label: '出账日（估）',
+    label: '出账年月（估）',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
     formatter: row => row.payoutDate || '-'
     formatter: row => row.payoutDate || '-'
   },
   },
+
   {
   {
     prop: 'actualPayoutDate',
     prop: 'actualPayoutDate',
-    label: '出账日（实）',
+    label: '出账年月（实）',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
     formatter: row => row.actualPayoutDate || '-'
     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: 'commissionRatio', label: '职级对应积分比例', sortable: true, width: '120', formatter: (row) => (row.commissionRatio || 0)  || '-' },
   {
   {
     prop: 'hkdAmount',
     prop: 'hkdAmount',
-    label: '应出账金额（估）',
+    label: 'HKD应出账金额',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
     formatter: row => formatCurrency(row.hkdAmount || 0)
     formatter: row => formatCurrency(row.hkdAmount || 0)
   },
   },
   {
   {
-    prop: 'paidRatio',
-    label: '已出账比例',
+    prop: 'exchangeRate',
+    label: '保单币种->HKD汇率',
     sortable: true,
     sortable: true,
-    width: '120',
-    formatter: row => (row.paidRatio || 0) + '%' || '-'
+    width: '140',
+    formatter: row => formatCurrency(row.exchangeRate || 0)
   },
   },
+
   {
   {
     prop: 'paidAmount',
     prop: 'paidAmount',
-    label: '已出账金额',
+    label: '已出账金额(HKD)',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
     formatter: row => formatCurrency(row.paidAmount || 0)
     formatter: row => formatCurrency(row.paidAmount || 0)
   },
   },
+
   {
   {
-    prop: 'unpaidRatio',
-    label: '待出账比例',
+    prop: 'unpaidAmount',
+    label: '待出账金额(估)',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
-    formatter: row => (row.unpaidRatio || 0) + '%' || '-'
+    formatter: row => formatCurrency(row.unpaidAmount || 0)
   },
   },
   {
   {
-    prop: 'unpaidAmount',
-    label: '待出账金额(估)',
+    prop: 'currentPaymentHkdAmount',
+    label: '本期待出账金额',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
-    formatter: row => formatCurrency(row.unpaidAmount || 0)
+    formatter: row => formatCurrency(row.currentPaymentHkdAmount || 0)
+  },
+  {
+    prop: 'exchangeRate',
+    label: '本期结算汇率(实)',
+    sortable: true,
+    width: '120',
+    formatter: row => formatCurrency(row.exchangeRate || 0)
   },
   },
   {
   {
     prop: 'brokerRatio',
     prop: 'brokerRatio',
@@ -507,32 +545,32 @@ const payableReportListTableColumns = ref([
     formatter: row => row.productName || '-'
     formatter: row => row.productName || '-'
   },
   },
   {
   {
-    prop: 'statusDesc',
-    label: '修改理由',
+    prop: 'remark',
+    label: '备注',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
-    formatter: row => row.statusDesc || '-'
+    formatter: row => row.remark || '-'
   },
   },
+  // {
+  //   prop: 'statusDesc',
+  //   label: '修改理由',
+  //   sortable: true,
+  //   width: '120',
+  //   formatter: row => row.statusDesc || '-'
+  // },
   {
   {
     prop: 'creatorName',
     prop: 'creatorName',
-    label: '操作人',
+    label: '创建人',
     sortable: true,
     sortable: true,
     width: '120',
     width: '120',
     formatter: row => row.creatorName || '-'
     formatter: row => row.creatorName || '-'
   },
   },
   {
   {
-    prop: 'updateTime',
-    label: '操作时间',
+    prop: 'createTime',
+    label: '创建时间',
     sortable: true,
     sortable: true,
     width: '180',
     width: '180',
-    formatter: row => row.updateTime || '-'
-  },
-  {
-    prop: 'remark',
-    label: '备注',
-    sortable: true,
-    width: '120',
-    formatter: row => row.remark || '-'
+    formatter: row => row.createTime || '-'
   }
   }
 ])
 ])