Merge branch 'wyz' into 'test'

切换分支 See merge request !136

Merge branch 'wyz' into 'test'
切换分支 See merge request !136
721986ec · yuzhenWang · defbb186 · dbfb2eaa · 721986ec · 721986ec
Commit 721986ec authored May 12, 2026 by yuzhenWang
8 changed files
--- a/src/views/financialCenter/financialBilling.vue
+++ b/src/views/financialCenter/financialBilling.vue
@@ -163,8 +163,8 @@
            :formatter="row => formatCurrency(row.premium || 0)"
          />
          <el-table-column prop="policyCurrency" label="保单币种" width="120" sortable />
-          <el-table-column prop="payoutDate" label="出账日（估）" width="120" sortable />
+          <el-table-column prop="payoutDate" label="出账月（估）" width="120" sortable />
-          <el-table-column prop="actualPayoutDate" label="出账日（实）" width="120" sortable />
+          <el-table-column prop="actualPayoutDate" label="出账月（实）" width="120" sortable />
          <el-table-column prop="remark" label="备注" width="120" sortable />
          <el-table-column fixed="right" label="操作" min-width="120">
            <template #default="{ row }">
@@ -1174,8 +1174,8 @@ const addCheckRecordConfig = [
    },
    transform: res => {
      return res?.data.records || []
-    },
+    }
-    rules: [{ required: true, message: '所属团队必填', trigger: 'blur' }]
+    // rules: [{ required: true, message: '所属团队必填', trigger: 'blur' }]
  },
  {

--- a/src/views/financialCenter/financialIncome.vue
+++ b/src/views/financialCenter/financialIncome.vue
@@ -113,7 +113,7 @@
          <el-table-column prop="reconciliationYearMonth" label="检核年月" width="120" sortable />
          <el-table-column prop="policyNo" label="保单号" width="120" sortable />
          <el-table-column prop="reconciliationCompany" label="对账公司" width="120" sortable />
-          <el-table-column prop="commissionDate" label="入账日" width="120" sortable />
+          <el-table-column prop="commissionDate" label="入账月" width="120" sortable />
          <el-table-column prop="commissionExpectedStatus" label="入账状态" width="120" sortable>
            <template #default="{ row }">
              {{ selectDictLabel(csf_expected_commission_status, row.commissionExpectedStatus) }}
@@ -572,15 +572,15 @@ const searchConfig = ref([
    }
  },
  {
-    type: 'date',
+    type: 'month',
    prop: 'expectedDate',
-    label: '入账日（估）',
+    label: '入账月（估）',
    placeholder: '请选择'
  },
  {
-    type: 'daterange',
+    type: 'monthrange',
    prop: 'commissionDate',
-    label: '入账日（实）',
+    label: '入账月（实）',
    startPlaceholder: '开始时间',
    endPlaceholder: '结束时间'
  },
@@ -682,10 +682,9 @@ watch(
 const confirmRecordCheck = async () => {
  //等待后端接口
  try {
-    // ✅ 统一从子组件获取完整表单数据（含 extra 字段）
-    // await nextTick() // 确保子组件已同步
    const formData = updateDataFormRef.value.getFormData()
    console.log('===========', formData)
    let params
    params = {
      ...formData, // ←←← 使用 formData，不是 addReceivablesFormModel.value
@@ -777,12 +776,12 @@ const addCheckRecordConfig = ref([
    rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
  },
  {
-    type: 'date',
+    type: 'month',
    prop: 'commissionDate',
-    label: '入账日（实）',
+    label: '入账月（实）',
    placeholder: '请选择',
    maxDate: 'today',
-    rules: [{ required: true, message: '请选择入账日（实）', trigger: 'blur' }]
+    rules: [{ required: true, message: '请选择入账月（实）', trigger: 'blur' }]
  },
  {
    type: 'input',
@@ -1024,13 +1023,26 @@ const operationBtnList = ref([
 // 加载表格数据
 const loadTableData = async (searchParams = {}) => {
  loading.value = true
  try {
+    if (searchParams.commissionDate && searchParams.commissionDate.length > 0) {
+      searchParams.commissionDateStart = `${searchParams.commissionDate[0]}-01`
+      searchParams.commissionDateEnd = `${searchParams.commissionDate[1]}-01`
+    } else {
+      searchParams.commissionDateStart = ''
+      searchParams.commissionDateEnd = ''
+    }
+    if (searchParams.expectedDate) {
+      searchParams.expectedDate = `${searchParams.expectedDate}-01`
+    } else {
+      searchParams.expectedDate = ''
+    }
    const params = {
      pageNo: currentPage.value,
      pageSize: pageSize.value,
      ...searchParams,
-      commissionDateStart: searchParams.commissionDate?.[0] || undefined,
+      // commissionDateStart: searchParams.commissionDate?.[0] || undefined,
-      commissionDateEnd: searchParams.commissionDate?.[1] || undefined,
+      // commissionDateEnd: searchParams.commissionDate?.[1] || undefined,
      commissionDate: undefined
    }
    const res = await getPolicyCommissionList(params)
@@ -1050,12 +1062,13 @@ loadTableData()
 // 分页事件
 const handleSizeChange = val => {
  pageSize.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
+  const params = searchFormRef.value.getFormData()
-  loadTableData()
+  loadTableData(params)
 }
 // 表格数据
 const tableData = ref([])

--- a/src/views/financialCenter/financialSalary.vue
+++ b/src/views/financialCenter/financialSalary.vue
@@ -733,11 +733,13 @@ const salaryDataSetting = async e => {
 // 分页事件
 const handleSizeChange = val => {
  pageSize.value = val
-  getList()
+  const params = searchFormRef.value.getFormData()
+  getList(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
-  getList()
+  const params = searchFormRef.value.getFormData()
+  getList(params)
 }
 // 设置当前页的选中状态

--- a/src/views/financialCenter/payables.vue
+++ b/src/views/financialCenter/payables.vue
@@ -630,9 +630,9 @@ const searchConfig = ref([
    label: '投保人'
  },
  {
-    type: 'daterange',
+    type: 'monthrange',
    prop: 'payoutDate',
-    label: '出账日（估）',
+    label: '出账月（估）',
    startPlaceholder: '开始时间',
    endPlaceholder: '结束时间'
  },
@@ -1066,23 +1066,34 @@ const operationBtnList = ref([
 // 分页事件
 const handleSizeChange = val => {
  pageSize.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 // 加载表格数据
 const loadTableData = async () => {
  const searchParams = searchFormRef.value.getFormData() || {}
  loading.value = true
+  if (searchParams.payoutDate.length > 0) {
+    searchParams.payoutDateStart = `${searchParams.payoutDate[0]}-01`
+    searchParams.payoutDateEnd = `${searchParams.payoutDate[1]}-01`
+  } else {
+    searchParams.payoutDateStart = ''
+    searchParams.payoutDateEnd = ''
+  }
  try {
    const params = {
      ...searchParams,
-      payoutDateStart: searchParams.payoutDate?.[0] || undefined,
+      // payoutDateStart: searchParams.payoutDate?.[0] || undefined,
-      payoutDateEnd: searchParams.payoutDate?.[1] || undefined,
+      // payoutDateEnd: searchParams.payoutDate?.[1] || undefined,
      payoutDate: undefined,
      pageNo: currentPage.value,
      pageSize: pageSize.value

--- a/src/views/financialCenter/payroll.vue
+++ b/src/views/financialCenter/payroll.vue
@@ -75,7 +75,7 @@ const tableColumns = ref([
    { prop: 'fortuneAccountMonth', label: '出账月（实）', sortable: true, width: '150'},
    { prop: 'billOrg', label: '出账机构', sortable: true, width: '150'},
    { prop: 'hkdAmount', label: '本期总出账金额(原币种)', sortable: true, width: '150'},
-    { prop: 'fortuneAccountBizId', label: '出账记录业务id', sortable: true, width: '150'},
+    // { prop: 'fortuneAccountBizId', label: '出账记录业务id', sortable: true, width: '150'},
 ])
 // 添加表格引用

--- a/src/views/financialCenter/receivables.vue
+++ b/src/views/financialCenter/receivables.vue
@@ -742,12 +742,14 @@ const operationBtnList = ref([
 // 分页事件
 const handleSizeChange = val => {
  pageSize.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 // 加载表格数据

--- a/src/views/sign/policyReceipts/index.vue
+++ b/src/views/sign/policyReceipts/index.vue
@@ -422,6 +422,8 @@ const operationBtnList = ref([
 // 加载表格数据
 const loadTableData = async (searchParams = {}) => {
  loading.value = true
+  // console.log('searchFormRef.value', searchFormRef.value)
+  // const searchParams = searchFormRef.value.getFormData() || {}
  try {
    const params = {
      pageNo: currentPage.value,
@@ -444,11 +446,13 @@ loadTableData()
 // 分页事件
 const handleSizeChange = val => {
  pageSize.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 // 表格数据
 const tableData = ref([])

--- a/src/views/sign/policyReceipts/premiumRecon.vue
+++ b/src/views/sign/policyReceipts/premiumRecon.vue
@@ -1289,6 +1289,7 @@ const operationBtnList = ref([
 // 加载表格数据
 const loadTableData = async (searchParams = {}) => {
  loading.value = true
  try {
    const params = {
      pageNo: currentPage.value,
@@ -1311,11 +1312,14 @@ const loadTableData = async (searchParams = {}) => {
 // 分页事件
 const handleSizeChange = val => {
  pageSize.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 const handleCurrentChange = val => {
  currentPage.value = val
-  loadTableData()
+  const params = searchFormRef.value.getFormData()
+  loadTableData(params)
 }
 // 表格数据
 const tableData = ref([])