Merge branch 'feature-20250827wyz-写业务' into 'test'

修复bug2发布测试

See merge request !26

src/api/financial/commission.js

@@ -190,3 +190,27 @@ export function salaryStatistics(data) {
     data: data
   })
 }
+// 薪资管理修订记录
+export function salaryEditRecords(data) {
+  return request({
+    url: '/csf/api/fortune/editRecords/fortuneAccount',
+    method: 'post',
+    data: data
+  })
+}
+// 入账管理操作记录
+export function incomeEditRecords(data) {
+  return request({
+    url: '/csf/api/commission/edit/records',
+    method: 'post',
+    data: data
+  })
+}
+// 入账管理比对记录列表
+export function incomeCompareRecords(data) {
+  return request({
+    url: '/csf/api/commission/compare/records',
+    method: 'post',
+    data: data
+  })
+}

src/views/financialCenter/financialBilling.vue

@@ -305,8 +305,6 @@ const clearAllSelection = () => {
   if (tableRef.value) {
     tableRef.value.clearSelection()
   }
-  console.log('allSelectedRows', allSelectedRows.value)
-  console.log('selectedRows', selectedRows.value)
 }
 // 下载选中项
 const downloadSelected = async () => {

src/views/financialCenter/financialSalary.vue

@@ -176,15 +176,15 @@
     </el-dialog>
     <el-dialog title="修订记录" v-model="showReviseRecord" width="1000px" append-to-body>
       <el-table :data="reviseList" border>
-        <el-table-column prop="createTime" label="修订时间" align="center" width="150">
+        <el-table-column prop="createTime" label="修订时间" align="center" width="180">
           <template #default="scope">
             <span>{{ parseTime(scope.row.createTime) }}</span>
           </template>
         </el-table-column>
-        <el-table-column label="修订人" prop="policyNo" align="center" width="150">
+        <el-table-column label="修订人" prop="userName" align="center" width="150">
         </el-table-column>
 
-        <el-table-column label="修订内容" prop="errorMsg" align="center"></el-table-column>
+        <el-table-column label="修订内容" prop="editContent" align="center"></el-table-column>
       </el-table>
       <pagination
         v-show="revisePages.total >= 0"
@@ -209,7 +209,8 @@ import { SuccessFilled } from '@element-plus/icons-vue'
 import {
   getReferrerFortuneList,
   updatePolicyFortuneStatus,
-  salaryStatistics
+  salaryStatistics,
+  salaryEditRecords
 } from '@/api/financial/commission'
 
 // 添加表格引用
@@ -266,7 +267,26 @@ const referrerOptions = [
   { label: '王五', value: 'wangwu' },
   { label: '赵六', value: 'zhaoliu' }
 ]
-const getReviseData = () => {}
+const currentRow = ref({})
+const getReviseData = () => {
+  let data = {
+    pageNo: revisePages.pageNo,
+    pageSize: revisePages.pageSize,
+    fortuneAccountBizId: currentRow.value.fortuneAccountBizId
+  }
+  salaryEditRecords(data).then(response => {
+    if (response.code == 200) {
+      reviseList.value = response.data.records
+      revisePages.total = response.data.total
+      showReviseRecord.value = true
+    } else {
+      ElMessage.error(response.msg)
+      showReviseRecord.value = false
+      revisePages.total = 0
+      reviseList.value = []
+    }
+  })
+}
 // 设置当前页的选中状态
 const setCurrentPageSelection = () => {
   if (!tableRef.value) return
@@ -451,9 +471,9 @@ const handleEdit = row => {
   ElMessage.info(`编辑转介人：${row.referrer}`)
 }
 const handleRevise = row => {
-  showReviseRecord.value = true
+  currentRow.value = row
+  getReviseData()
 }
-import { addPolicyFortuneAccount } from '@/api/financial/commission'
 
 const deletePolicyFortuneO = async fortuneAccountBizId => {
   try {

src/views/sign/underwritingMain/components/expectedCommission.vue

@@ -40,10 +40,10 @@
               />
             </template>
           </el-table-column> -->
-          <el-table-column label="来佣比例" prop="ratio" align="center" width="120">
+          <el-table-column label="来佣比例" prop="commissionRatio" align="center" width="120">
             <template #default="scope">
               <el-input
-                v-model="scope.row.ratio"
+                v-model="scope.row.commissionRatio"
                 size="default"
                 type="number"
                 placeholder="请输入"