Merge branch 'swhotfix' into test

src/views/financialCenter/financialBilling.vue

@@ -203,7 +203,7 @@ import {
   getPolicyFortuneList,
   getPolicyFortuneList,
   addCheckRecordaddBatch,
   addCheckRecordaddBatch,
   updatePayoutAmount,
   updatePayoutAmount,
-  downloadPolicyFortuneAccount
+  downloadPolicyFortuneAccount,
 } from '@/api/financial/commission'
 } from '@/api/financial/commission'
 import useUserStore from '@/store/modules/user'
 import useUserStore from '@/store/modules/user'
 
 
@@ -378,11 +378,13 @@ const addCheckRecordConfig = [
     requestParams: { pageNo: 1, pageSize: 20 },
     requestParams: { pageNo: 1, pageSize: 20 },
     placeholder: '输入转介人名称搜索',
     placeholder: '输入转介人名称搜索',
     debounceWait: 500, // 自定义防抖时间
     debounceWait: 500, // 自定义防抖时间
-    valueKey: 'userSaleBizId',
+    valueKey: 'clientUserBizId',
     labelKey: 'realName',
     labelKey: 'realName',
     onChangeExtraFields: {
     onChangeExtraFields: {
       broker: 'realName', // 自动同步 raw.name 到 reconciliationCompany
       broker: 'realName', // 自动同步 raw.name 到 reconciliationCompany
-      reconciliationCompanyCode: 'code'
+      reconciliationCompanyCode: 'code',
+      team:'deptName',
+      teamBizId:'deptBizId',
     },
     },
     transform: res => {
     transform: res => {
       return res?.data.records || []
       return res?.data.records || []

src/views/financialCenter/payables.vue

@@ -122,7 +122,7 @@
 
 
 <script setup name="Payables">
 <script setup name="Payables">
 import CommonPage from '@/components/commonPage'
 import CommonPage from '@/components/commonPage'
-import { ref, reactive } from 'vue'
+import { ref, reactive,nextTick } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { formatCurrency } from '@/utils/number'
 import { formatCurrency } from '@/utils/number'
 import { expectedFortuneList, payRecordList, addPayRecord, updatePayRecord, exportPayRecord, payableReport } from '@/api/financial/commission'
 import { expectedFortuneList, payRecordList, addPayRecord, updatePayRecord, exportPayRecord, payableReport } from '@/api/financial/commission'
@@ -161,7 +161,7 @@ const payableReportListTableColumns = ref([
   { prop: 'broker', label: '转介人', sortable: true, width: '120', formatter: (row) => row.broker || '-' },
   { prop: 'broker', label: '转介人', sortable: true, width: '120', formatter: (row) => row.broker || '-' },
   { prop: 'fortuneName', label: '出账项目', sortable: true, width: '120', formatter: (row) => row.fortuneName || '-' },
   { prop: 'fortuneName', label: '出账项目', sortable: true, width: '120', formatter: (row) => row.fortuneName || '-' },
   { prop: 'status', label: '出账状态', sortable: true, width: '120', formatter: (row) => getDictLabel('csf_expected_fortune_status', row.status) || '-' },
   { prop: 'status', label: '出账状态', sortable: true, width: '120', formatter: (row) => getDictLabel('csf_expected_fortune_status', row.status) || '-' },
-  { prop: 'currency', label: '出账币种', sortable: true, width: '100', formatter: (row) => row.currency || '-' },
+  { prop: 'currencyName', label: '出账币种', sortable: true, width: '100', formatter: (row) => row.currencyName || '-' },
   { prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '100', formatter: (row) => row.fortunePeriod || '-' },
   { prop: 'fortunePeriod', label: '出账期数', sortable: true, width: '100', formatter: (row) => row.fortunePeriod || '-' },
   { prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100', formatter: (row) => row.fortuneTotalPeriod || '-' },
   { prop: 'fortuneTotalPeriod', label: '出账总期数', sortable: true, width: '100', formatter: (row) => row.fortuneTotalPeriod || '-' },
   { prop: 'payoutDate', label: '出账日（估）', sortable: true, width: '120', formatter: (row) => row.payoutDate || '-' },
   { prop: 'payoutDate', label: '出账日（估）', sortable: true, width: '120', formatter: (row) => row.payoutDate || '-' },
@@ -387,7 +387,7 @@ const addPayRecordFormConfig = [
     requestParams: { pageNo: 1, pageSize: 20 },
     requestParams: { pageNo: 1, pageSize: 20 },
     placeholder: '输入转介人名称搜索',
     placeholder: '输入转介人名称搜索',
     debounceWait: 500, // 自定义防抖时间
     debounceWait: 500, // 自定义防抖时间
-    valueKey: 'userSaleBizId',
+    valueKey: 'clientUserBizId',
     labelKey: 'realName',
     labelKey: 'realName',
     onChangeExtraFields: {
     onChangeExtraFields: {
       broker: 'realName',// 自动同步 raw.name 到 reconciliationCompany
       broker: 'realName',// 自动同步 raw.name 到 reconciliationCompany
@@ -480,12 +480,13 @@ const handleSelect = async (e, row) => {
   } else if (e === 'updateData') {
   } else if (e === 'updateData') {
     editStatus.value = 'edit'
     editStatus.value = 'edit'
     addPayRecordDialogVisible.value = true
     addPayRecordDialogVisible.value = true
-    if (addPayRecordFormRef.value) {
-      addPayRecordFormModel.value = {
-        ...selectedRow.value
+              // 2. 使用 nextTick 等待 DOM 更新
+        nextTick(() => {
+            // 3. 此时 addRecordRef.value 一定存在了
+            if (addPayRecordFormRef.value && selectedRow.value) {
+                addPayRecordFormModel.value = { ...selectedRow.value };
             }
             }
-    }
-
+        });
     console.log(addPayRecordFormModel.value)
     console.log(addPayRecordFormModel.value)
   }
   }
 
 

src/views/financialCenter/receivables.vue

@@ -196,7 +196,7 @@
 <script setup name="Receivables">
 <script setup name="Receivables">
 import CommonPage from '@/components/commonPage'
 import CommonPage from '@/components/commonPage'
 import CommonDialog from '@/components/commonDialog'
 import CommonDialog from '@/components/commonDialog'
-import { ref, reactive, onMounted, computed } from 'vue'
+import { ref, reactive, onMounted, computed,nextTick  } from 'vue'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { ElMessage, ElMessageBox } from 'element-plus'
 import { MoreFilled } from '@element-plus/icons-vue'
 import { MoreFilled } from '@element-plus/icons-vue'
 import {
 import {
@@ -696,11 +696,14 @@ const handleSelect = async (e, row) => {
     } else if (e === 'updateData') {
     } else if (e === 'updateData') {
         editStatus.value = 'update'
         editStatus.value = 'update'
         addReceivablesDialogVisible.value = true
         addReceivablesDialogVisible.value = true
-        if (addRecordRef.value) {
-            addReceivablesFormModel.value = {
-                ...selectedRow.value
-            }
+          // 2. 使用 nextTick 等待 DOM 更新
+        nextTick(() => {
+            // 3. 此时 addRecordRef.value 一定存在了
+            if (addRecordRef.value && selectedRow.value) {
+                addReceivablesFormModel.value = { ...selectedRow.value };
+                console.log('赋值成功:', addReceivablesFormModel.value);
             }
             }
+        });
         console.log('更新数据', selectedRow.value)
         console.log('更新数据', selectedRow.value)
     }
     }
 }
 }