Merge remote-tracking branch 'origin/dev' into prod

src/api/financial/commission.js

@@ -499,3 +499,12 @@ export function billCalculateToAmount(data) {
     data: data
   })
 }
+
+// 应收款管理修改应收记录状态
+export function CommissionExpectedChangeStatus(data) {
+  return request({
+    url: 'csf/api/CommissionExpected/change_status',
+    method: 'post',
+    data: data
+  })
+}

src/components/SearchForm/SearchForm.vue

@@ -24,10 +24,19 @@
             :disabled="item.disabled"
             @input="val => handleNumberInput(val, item)"
             @change="val => handleModelChange(val, item)"
-            :formatter="
-              value => (item.inputType ? `${value}`.replace(/\B(?=(\d{3})+(?!\d))/g, ',') : value)
-            "
-            :parser="value => value.replace(/\$\s?|(,*)/g, '')"
+           :formatter="value => {
+            if (!item.inputType || !value) return value;
+            const str = String(value);
+            // 如果包含小数点
+            if (str.indexOf('.') > -1) {
+              const [int, dec] = str.split('.');
+              // 只格式化整数部分，保留小数部分原样
+              return int.replace(/\B(?=(\d{3})+(?!\d))/g, ',') + '.' + dec;
+            }
+            // 如果没有小数点，直接格式化
+            return str.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
+          }"
+          :parser="value => value.replace(/\$\s?|(,*)/g, '')"
           />
 
           <!-- Select (支持 dictType / api / options) -->

src/views/financialCenter/financialIncome.vue

@@ -407,6 +407,12 @@ const checkConfig = ref([
     label: '检核年月',
     placeholder: '检核年月',
     rules: [{ required: true, message: '请选择检核年月', trigger: 'blur' }]
+  },
+  {
+    type: 'input',
+    prop: 'policyNo',
+    label: '保单号',
+    placeholder: '保单号'
   }
 ])
 const checkRecordEdit = (row) => {
@@ -528,11 +534,11 @@ const addCheckRecordConfig = ref([
     type: 'input',
     prop: 'amount',
     label: '入账金额',
-    inputType: 'decimal',
+    inputType: 'decimalNumber',
     decimalDigits: 4,
     rules: [
       { required: true, message: '请输入金额', trigger: 'blur' },
-      { pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
+      { pattern: /^-?\d+(\.\d+)?$/, message: '请输入有效的数字', trigger: 'blur' }
     ]
   }, {
     type: 'select',
@@ -655,7 +661,7 @@ const generateCommissionRecordapi = async () => {
 const dropdownItems = [
   { label: '设置比对状态', value: 'setStatus', confirm: '' },
   { label: '同步到应收款管理', value: 'syncToReceivable', confirm: '确认要同步到应收款管理吗？' },
-  // { label: '更新数据', value: 'editRecord' },
+  // { label: '更新检核数据', value: 'editRecord' },
   // { label: '查看记录', value: 'viewRecord' }
 ]
 const handleMenuConfirm = async (action, row) => {
@@ -712,6 +718,7 @@ const checkRecordQuery = async () => {
   try {
     const params = {
       reconciliationYearMonth: checkFormData.value.reconciliationYearMonth,
+      policyNo:checkFormData.value.policyNo,
       pageNo: checkRecordPageInfo.currentPage,
       pageSize: checkRecordPageInfo.pageSize
     }
@@ -805,7 +812,7 @@ const handleSelect = (e, row) => {
     setCompareStatusDialogFlag.value = true
     return
   } else if (e === 'editRecord') {
-    updateDataDialogFlag.value = true
+    // updateDataDialogFlag.value = true
     return
   } else if (e === 'viewRecord') {
     viewRecordDialogFlag.value = true

src/views/financialCenter/financialSalary.vue

@@ -42,6 +42,7 @@
           :border="true"
         >
           <el-table-column type="selection" width="55" :reserve-selection="true" />
+          <el-table-column prop="fortuneAccountBizId" label="业务ID" min-width="120" sortable />
           <el-table-column prop="broker" label="转介人" min-width="120" sortable />
           <el-table-column prop="team" label="所属团队" min-width="120" sortable />
           <el-table-column prop="hkdAmount" label="出账金额" width="120" sortable>

src/views/financialCenter/payables.vue

@@ -365,7 +365,7 @@ const addPayRecordFormConfig = [
     maxDate: 'today'
   }, {
     type: 'input',
-    prop: 'amount',
+    prop: 'hkdAmount',
     label: '出账金额',
     rules: [
       { pattern: /^-?\d+(\.\d{1,2})?$/, message: '小数（最多两位）', trigger: 'blur' }
@@ -413,7 +413,7 @@ const handleConfirmAddPayRecord = async () => {
       ElMessage.success('新增出账记录成功')
       addPayRecordDialogVisible.value = false
       addPayRecordFormRef.value.resetForm()
-
+      expectedFortuneListData()
     } catch (error) {
       ElMessage.error(error.message)
     }
@@ -427,7 +427,9 @@ const handleConfirmAddPayRecord = async () => {
       ElMessage.success('更新出账记录成功')
       addPayRecordDialogVisible.value = false
       addPayRecordFormRef.value.resetForm()
-      editStatus.value = 'add'
+      editStatus.value = 'add';
+      loadPayRecordTableData(selectedRow.value.expectedFortuneBizId)
+      expectedFortuneListData()
     } catch (error) {
       ElMessage.error(error.message)
     }

src/views/financialCenter/receivables.vue

@@ -201,7 +201,7 @@ import { ElMessage, ElMessageBox } from 'element-plus'
 import { MoreFilled } from '@element-plus/icons-vue'
 import {
     receivedFortuneList, updateCommissionExpected, commissionEntryEditRecords,
-    exportReceivedFortune, commissionExpectedRecord, addReceivedFortune, receivableReport
+    exportReceivedFortune, commissionExpectedRecord, addReceivedFortune, receivableReport,CommissionExpectedChangeStatus
 } from '@/api/financial/commission'
 import { numberWithCommas } from '@/utils/index'
 import SearchForm from '@/components/SearchForm/SearchForm.vue'
@@ -284,12 +284,10 @@ const addReceivablesFormConfig = [
         type: 'input',
         prop: 'commissionRatio',
         label: '入账比例（%）',
-        inputType: 'decimal',
-        decimalDigits: 4,
         visible: (formData) => formData.commissionBizType === 'R',
         rules: [
             { required: true, message: '请输入入账比例', trigger: 'blur' },
-            { pattern: /^\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
+            { pattern: /^-?\d+(\.\d{1,4})?$/, message: '最多四位小数', trigger: 'blur' }
         ]
     }, {
         type: 'select',
@@ -323,6 +321,11 @@ const addReceivablesFormConfig = [
             console.log('对账公司', res)
             return res.data.records || []
         }
+    },
+    {
+        type: 'input',
+        prop: 'remark',
+        label: '备注',
     }
 ]
 // 弹窗表单重置
@@ -742,7 +745,7 @@ const handleConfirmSetStatus = () => {
         type: 'warning'
     }).then(async () => {
         try {
-            const res = await updateCommissionExpected({
+            const res = await CommissionExpectedChangeStatus({
                 commissionExpectedBizId: selectedRow.value.commissionExpectedBizId,
                 ...formData
             })