Merge branch 'wyz' into 'test'

Wyz

See merge request !140

src/views/financialCenter/financialIncome.vue

@@ -120,6 +120,13 @@
             </template>
           </el-table-column>
           <el-table-column
+            prop="commissionRatio"
+            label="保单本期来佣率"
+            width="120"
+            :formatter="formatRatio"
+          >
+          </el-table-column>
+          <el-table-column
             prop="currentCommissionRatio"
             label="本次实佣率"
             width="130"
@@ -161,7 +168,7 @@
           />
           <el-table-column prop="policyCurrency" label="保单币种" width="120" sortable />
           <el-table-column prop="productName" label="产品名称" width="120" />
-          <el-table-column prop="commissionRatio" label="保单本期来佣率" width="120" />
+
           <el-table-column prop="policyHolder" label="投保人" width="120" />
           <el-table-column prop="policyHolderEn" label="投保人(英文)" width="120" />
           <el-table-column prop="broker" label="转介人" width="120" />
@@ -263,7 +270,7 @@
       <el-row :gutter="10">
         <el-col :xs="24" :sm="24" :md="24" :lg="24">
           <el-table :data="checkRecordTableData" style="width: 100%" height="400">
-            <el-table-column prop="commissionBizType" label="应收款类型" width="120">
+            <el-table-column prop="commissionBizType" label="应收款类型" width="150">
               <template #default="{ row }">
                 {{ getCommissionBizTypeLabel(row.commissionBizType) }}
               </template>
@@ -277,8 +284,12 @@
             </el-table-column>
             <el-table-column prop="commissionPeriod" label="佣金期数" width="120" />
             <el-table-column prop="totalPeriod" label="总期数" width="120" />
-            <el-table-column prop="commissionDate" label="入账日（实）" width="120" />
-            <el-table-column prop="amount" label="入账金额" width="120" />
+            <el-table-column prop="commissionDate" label="入账年月（实）" width="120" />
+            <el-table-column prop="amount" label="入账金额" width="120">
+              <template #default="{ row }">
+                {{ formatCurrency(row.amount) }}
+              </template>
+            </el-table-column>
             <el-table-column prop="currency" label="入账币种" width="120" />
             <el-table-column prop="exchangeRate" label="结算汇率" width="120" />
             <el-table-column prop="commissionName" label="入账项目" width="120" />
@@ -327,7 +338,7 @@
     </CommonDialog>
     <!-- 新增检核记录弹窗 -->
     <CommonDialog
-      :dialogTitle="editStatus.value == 'add' ? '新增检核记录' : '修改检核记录'"
+      :dialogTitle="editStatus == 'add' ? '新增检核记录' : '修改检核记录'"
       dialogWidth="80%"
       :openDialog="addCheckRecordDialogFlag"
       :showAction="true"
@@ -335,6 +346,7 @@
       @close="closeDialog()"
       @confirm="handleAddCheckRecord()"
     >
+      {{}}
       <el-row>
         <el-col :xs="24" :sm="24" :md="24" :lg="24">
           <SearchForm
@@ -449,7 +461,7 @@
 </template>
 
 <script setup>
-import { ref, reactive, onMounted } from 'vue'
+import { ref, reactive, onMounted, watch } from 'vue'
 import CommonPage from '@/components/commonPage'
 import CommonDialog from '@/components/commonDialog'
 import SearchForm from '@/components/SearchForm/SearchForm.vue'
@@ -657,6 +669,7 @@ const checkRecordEdit = row => {
   selectedRowCheck.value = { ...row }
   editStatus.value = 'edit'
   addReceivablesFormModel.value = { ...row }
+  // addReceivablesFormModel.value.currency = 'HKD'
   addCheckRecordDialogFlag.value = true
   console.log('父组件赋值', addReceivablesFormModel.value)
 }
@@ -799,13 +812,22 @@ const addCheckRecordConfig = ref([
     prop: 'currency',
     label: '入账币种',
     dictType: 'bx_currency_type',
-    rules: [{ required: true, message: '请选择入账币种', trigger: 'blur' }]
+    defaultValue: 'HKD',
+    disabled: true,
+    rules: [
+      {
+        required: true,
+        message: '请选择入账币种',
+        trigger: 'blur'
+      }
+    ]
   },
   {
     type: 'select',
     prop: 'commissionType',
     label: '入账项目',
     dictType: 'csf_commission_type',
+    defaultValue: '1',
     rules: [{ required: true, message: '请选择入账项目', trigger: 'blur' }],
     onChangeExtraFields: {
       commissionName: 'itemLabel'
@@ -846,7 +868,7 @@ const addCheckRecordConfig = ref([
   },
   {
     type: 'input',
-    prop: 'remark',
+    prop: 'manualRemark',
     label: '备注'
   }
 ])
@@ -1102,6 +1124,16 @@ const handleSelect = (e, row) => {
 }
 const handleAddCheckList = () => {
   editStatus.value = 'add'
+  // addCheckRecordConfig.value  = addCheckRecordConfig.value
+  // addCheckRecordConfig.value = addCheckRecordConfig.value.map(item => {
+  //   if (item.prop == 'currency') {
+  //     item.defaultValue = 'HKD'
+  //     item.disabled = true
+  //   } else if (item.prop == 'commissionType') {
+  //     item.defaultValue = '1'
+  //   }
+  //   return item
+  // })
   addReceivablesFormModel.value = { ...selectedRow.value }
   addCheckRecordDialogFlag.value = true
   clearForm('addReceivablesFormModel')

src/views/financialCenter/receivables.vue

@@ -1103,7 +1103,7 @@ const receivableReportTableColumns = ref([
     sortable: true,
     width: '120',
     formatter: row => row.policyCurrency || '-'
-  },
+  }
   // {
   //   prop: 'unpaidAmount',
   //   label: '待入账金额HKD',
@@ -1111,12 +1111,12 @@ const receivableReportTableColumns = ref([
   //   width: '120',
   //   formatter: row => formatCurrency(row.unpaidAmount || 0)
   // },
-  {
-    prop: 'remark',
-    label: '备注',
-    width: '150',
-    formatter: row => row.remark || '-'
-  }
+  // {
+  //   prop: 'manualRemark',
+  //   label: '备注',
+  //   width: '150',
+  //   formatter: row => row.manualRemark || '-'
+  // }
 ])
 // 应收明细
 const receivableReportItemTableColumns = ref([
@@ -1138,7 +1138,7 @@ const receivableReportItemTableColumns = ref([
     prop: 'no',
     label: '应收单编号',
     sortable: true,
-    width: '150',
+    width: '180',
     formatter: row => row.no || '-'
   },
   // {
@@ -1159,7 +1159,7 @@ const receivableReportItemTableColumns = ref([
     prop: 'reconciliationCompany',
     label: '对账公司',
     sortable: true,
-    width: '150',
+    width: '100',
     formatter: row => row.reconciliationCompany || '-'
   },
   {
@@ -1214,7 +1214,7 @@ const receivableReportItemTableColumns = ref([
 
   {
     prop: 'commissionRatio',
-    label: '产品对应来佣率',
+    label: '保单对应来佣率',
     sortable: true,
     width: '120',
     formatter: row => (row.commissionRatio || 0) + '%' || '-'
@@ -1259,7 +1259,7 @@ const receivableReportItemTableColumns = ref([
     label: '本次入账比例',
     sortable: true,
     width: '120',
-    formatter: row => (row.revenueRatio || 0) + '%' || '-'
+    formatter: row => (row.revenueRatio ? row.revenueRatio + '%' : '-')
   },
   {
     prop: 'pendingAmount',