Merge branch 'wyz' into 'test'

Wyz

See merge request !159

src/views/financialCenter/financialBilling.vue

@@ -1115,7 +1115,7 @@ const addCheckRecordConfig = [
     prop: 'payoutDate',
     prop: 'payoutDate',
     label: '出账月(估)',
     label: '出账月(估)',
     placeholder: '请选择',
     placeholder: '请选择',
-    maxDate: 'today',
+    // maxDate: 'today',
     rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
     rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
   },
   },
   {
   {

src/views/financialCenter/payables.vue

@@ -396,45 +396,75 @@ const detailDialogVisible = ref(false)
 
 
 // 应付明细列表
 // 应付明细列表
 const payableReportListTableColumns = ref([
 const payableReportListTableColumns = ref([
-{ prop: 'type', label: '是否实际出账', sortable: true, width: '120', formatter: row => getTypeLabel(row.type) || '-' },
-{ prop: 'payableNo', label: '业务编号', sortable: true, width: '120' },
-{ prop: 'policyNo', label: '保单号', sortable: true, width: '120' },
-{ prop: 'broker', label: '转介人', sortable: true, width: '120' },
-{ prop: 'brokerGradeName', label: '职级', sortable: true, width: '100' },
-{ prop: 'fortuneName', label: '出账项目', sortable: true, width: '150' },
-{ prop: 'amountSourceName', label: '关联人员', sortable: true, width: '120' },
-{ prop: 'status', label: '出账状态', sortable: true, width: '120',formatter: row => getDictLabel('csf_expected_fortune_status', row.status) || '-' },
-{ prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '100' },
-{ prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100' },
-{ prop: 'payoutDate', label: '出账年月（估）', sortable: true, width: '120' },
-{ prop: 'actualPayoutDate', label: '出账年月（实）', sortable: true, width: '120' },
-{ prop: 'exchangeRate', label: '入账检核汇率', sortable: true, width: '120',formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-') },
-{ prop: 'defaultExchangeRate', label: '保单币种->HKD汇率', sortable: true, width: '160',formatter: row => formatNumberToMaxDigits(row.defaultExchangeRate, 5, '-') },
-{ prop: 'hkdToPayoutRate', label: 'HKD->发放币种汇率', sortable: true, width: '160',formatter: row => formatNumberToMaxDigits(row.hkdToPayoutRate, 5, '-') },
-{ prop: 'ruleCurrency', label: '保单币种', sortable: true, width: '100' },
-{ prop: 'originalCurrency', label: '原币种', sortable: true, width: '100' },
-{ prop: 'payoutCurrency', label: '发放币种', sortable: true, width: '100' },
-{ prop: 'originalAmount', label: '原币种金额', sortable: true, width: '120' },
-{ prop: 'hkdAmount', label: '应发港币金额（估）', sortable: true, width: '140' },
-{ prop: 'ruleAmount', label: '应发保单记账金额', sortable: true, width: '140' },
-{ prop: 'currentPaymentRuleAmount', label: '本次发放保单记账金额', sortable: true, width: '160' },
-{ prop: 'currentPayoutAmount', label: '本次发放金额', sortable: true, width: '120' },
-{ prop: 'currentPaymentHkdAmount', label: '本次发放折合港币金额', sortable: true, width: '160' },
-{ prop: 'currentPaymentRatio', label: '本次发放比例', sortable: true, width: '120' },
-{ prop: 'paidRuleAmount', label: '累积已发放保单记账金额', sortable: true, width: '180' },
-{ prop: 'paidAmount', label: '累积已发放港币金额', sortable: true, width: '160' },
-{ prop: 'paidRatio', label: '累积已发放比例%', sortable: true, width: '140' },
-{ prop: 'unpaidRatio', label: '剩余发放比例%', sortable: true, width: '120' },
-{ prop: 'unpaidRuleAmount', label: '剩余保单记账金额', sortable: true, width: '160' },
-{ prop: 'unpaidRuleAmounthHkd', label: '剩余发放折合港币金额', sortable: true, width: '180' },
-{ prop: 'premium', label: '期交保费', sortable: true, width: '120' },
-{ prop: 'fortuneTotalPeriod', label: '供款期数', sortable: true, width: '100' },
-{ prop: 'productName', label: '产品计划', sortable: true, width: '150' },
-{ prop: 'brokerRatio', label: '持有比例%', sortable: true, width: '100' },
-{ prop: 'remark', label: '备注', sortable: false, width: '200' },
-{ prop: 'creatorName', label: '创建人', sortable: true, width: '100' },
-{ prop: 'createTime', label: '创建时间', sortable: true, width: '160' },
-{ prop: 'updateTime', label: '更新时间', sortable: true, width: '160' }
+  {
+    prop: 'type',
+    label: '是否实际出账',
+    sortable: true,
+    width: '120',
+    formatter: row => getTypeLabel(row.type) || '-'
+  },
+  { prop: 'payableNo', label: '业务编号', sortable: true, width: '120' },
+  { prop: 'policyNo', label: '保单号', sortable: true, width: '120' },
+  { prop: 'broker', label: '转介人', sortable: true, width: '120' },
+  { prop: 'brokerGradeName', label: '职级', sortable: true, width: '100' },
+  { prop: 'fortuneName', label: '出账项目', sortable: true, width: '150' },
+  { prop: 'amountSourceName', label: '关联人员', sortable: true, width: '120' },
+  {
+    prop: 'status',
+    label: '出账状态',
+    sortable: true,
+    width: '120',
+    formatter: row => getDictLabel('csf_expected_fortune_status', row.status) || '-'
+  },
+  { prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '100' },
+  { prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100' },
+  { prop: 'payoutDate', label: '出账年月（估）', sortable: true, width: '120' },
+  { prop: 'actualPayoutDate', label: '出账年月（实）', sortable: true, width: '120' },
+  {
+    prop: 'exchangeRate',
+    label: '入账检核汇率',
+    sortable: true,
+    width: '120',
+    formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-')
+  },
+  {
+    prop: 'exchangeRate',
+    label: '保单币种->HKD汇率',
+    sortable: true,
+    width: '160',
+    formatter: row => formatNumberToMaxDigits(row.exchangeRate, 5, '-')
+  },
+  {
+    prop: 'hkdToPayoutRate',
+    label: 'HKD->发放币种汇率',
+    sortable: true,
+    width: '160',
+    formatter: row => formatNumberToMaxDigits(row.hkdToPayoutRate, 5, '-')
+  },
+  { prop: 'ruleCurrency', label: '保单币种', sortable: true, width: '100' },
+  { prop: 'originalCurrency', label: '原币种', sortable: true, width: '100' },
+  { prop: 'payoutCurrency', label: '发放币种', sortable: true, width: '100' },
+  { prop: 'originalAmount', label: '原币种金额', sortable: true, width: '120' },
+  { prop: 'hkdAmount', label: '应发港币金额（估）', sortable: true, width: '140' },
+  { prop: 'ruleAmount', label: '应发保单记账金额', sortable: true, width: '140' },
+  { prop: 'currentPaymentRuleAmount', label: '本次发放保单记账金额', sortable: true, width: '160' },
+  { prop: 'currentPayoutAmount', label: '本次发放金额', sortable: true, width: '120' },
+  { prop: 'currentPaymentHkdAmount', label: '本次发放折合港币金额', sortable: true, width: '160' },
+  { prop: 'currentPaymentRatio', label: '本次发放比例', sortable: true, width: '120' },
+  { prop: 'paidRuleAmount', label: '累积已发放保单记账金额', sortable: true, width: '180' },
+  { prop: 'paidAmount', label: '累积已发放港币金额', sortable: true, width: '160' },
+  { prop: 'paidRatio', label: '累积已发放比例%', sortable: true, width: '140' },
+  { prop: 'unpaidRatio', label: '剩余发放比例%', sortable: true, width: '120' },
+  { prop: 'unpaidRuleAmount', label: '剩余保单记账金额', sortable: true, width: '160' },
+  { prop: 'unpaidRuleAmounthHkd', label: '剩余发放折合港币金额', sortable: true, width: '180' },
+  { prop: 'premium', label: '期交保费', sortable: true, width: '120' },
+  { prop: 'fortuneTotalPeriod', label: '供款期数', sortable: true, width: '100' },
+  { prop: 'productName', label: '产品计划', sortable: true, width: '150' },
+  { prop: 'brokerRatio', label: '持有比例%', sortable: true, width: '100' },
+  { prop: 'remark', label: '备注', sortable: false, width: '200' },
+  { prop: 'creatorName', label: '创建人', sortable: true, width: '100' },
+  { prop: 'createTime', label: '创建时间', sortable: true, width: '160' },
+  { prop: 'updateTime', label: '更新时间', sortable: true, width: '160' }
 ])
 ])
 
 
 // 设置出账状态
 // 设置出账状态
@@ -971,7 +1001,7 @@ const addPayRecordFormConfig = [
     prop: 'payoutDate',
     prop: 'payoutDate',
     label: '出账月(估)',
     label: '出账月(估)',
     placeholder: '请选择',
     placeholder: '请选择',
-    maxDate: 'today',
+    // maxDate: 'today',
     rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
     rules: [{ required: true, message: '出账月(估)必填', trigger: 'blur' }]
   },
   },
   {
   {