Merge branch 'wyz' into 'test'

按需求修改

See merge request !144

src/views/financialCenter/financialBilling.vue

@@ -273,7 +273,7 @@
     </CommonDialog>
     <!-- 设置出账年月弹窗 -->
     <CommonDialog
-      dialogTitle="设置本期出账金额"
+      dialogTitle="设置本期出账年月(实)"
       dialogWidth="80%"
       :openDialog="settingBillYearMonthFlag"
       :showAction="true"
@@ -452,7 +452,7 @@ const editTableRef = ref(null)
 const splitTableColumns = ref([
   {
     prop: 'splitRatio',
-    label: '出账比例',
+    label: '出账比例(%)',
     editType: 'input',
     inputType: 'decimal', // integer / decimalNumber / decimal
     decimalDigits: 2, // 小数位数，默认2
@@ -542,38 +542,7 @@ const splitTableColumns = ref([
     required: true,
     width: 150
   },
-  // {
-  //   prop: 'amount',
-  //   label: '原币种金额',
-  //   editType: 'input',
-  //   inputType: 'decimalNumber', // integer / decimalNumber / decimal
-  //   decimalDigits: 2, // 小数位数，默认2
-  //   required: true
-  // },
-  // {
-  //   prop: 'originalAmount',
-  //   label: '本次出账原币种金额',
-  //   editType: 'input',
-  //   inputType: 'decimalNumber', // integer / decimalNumber / decimal
-  //   decimalDigits: 2, // 小数位数，默认2
-  //   required: true
-  // },
-  // {
-  //   prop: 'exchangeRate',
-  //   label: '结算汇率',
-  //   editType: 'input',
-  //   inputType: 'decimal', // integer / decimalNumber / decimal
-  //   decimalDigits: 2, // 小数位数，默认2
-  //   required: true
-  // },
-  // {
-  //   prop: 'hkdAmount',
-  //   label: '港币出账金额',
-  //   editType: 'input',
-  //   inputType: 'decimalNumber', // integer / decimalNumber / decimal
-  //   decimalDigits: 2, // 小数位数，默认2
-  //   required: true
-  // },
+
   {
     prop: 'payoutYearMonth',
     label: '出账年月（估）',
@@ -710,7 +679,8 @@ const confirmRateExchange = async () => {
     const res = await editExchangeRateApi(formData)
     ElMessage.success('结算汇率修改成功')
     rateExchangeFlag.value = false
-    loadTableData()
+    const params = searchFormRef.value.getFormData()
+    loadTableData(params)
   } catch (error) {
     ElMessage.error('结算汇率修改失败')
     rateExchangeFlag.value = true
@@ -1006,7 +976,8 @@ const handleSpiltSubmit = async () => {
       console.log('分期出账结果', res)
       installmentsBillFlag.value = false
       ElMessage.success('分期出账已保存')
-      loadTableData()
+      const searchParams = searchFormRef.value.getFormData()
+      loadTableData(searchParams)
     } catch (error) {
       installmentsBillFlag.value = true
       console.log('分期出账错误', error)
@@ -1039,9 +1010,18 @@ const addSpiltRecord = () => {
     id: generateId(), // 必须有 rowIdKey 对应的字段（默认 'id'）
     payoutCurrency: 'HKD',
     ruleCurrency: selectedRow.value.ruleCurrency,
-    originalCurrency: selectedRow.value.originalCurrency
+    originalCurrency: selectedRow.value.originalCurrency,
+    hkdToPayoutRate: '1'
   }
-
+  if (selectedRow.value.originalCurrency && selectedRow.value.originalCurrency == 'HKD') {
+    newRow.originalToHkdRate = '1'
+  }
+  // if (selectedRow.value.payoutCurrency && selectedRow.value.payoutCurrency == 'HKD') {
+  //   newRow.hkdToPayoutRate = '1'
+  // }
+  console.log('====================================')
+  console.log('newRow', newRow)
+  console.log('====================================')
   // 插入到表格数据最前面
   splitTableData.value.push(newRow)
 }
@@ -1380,11 +1360,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([])
@@ -1407,15 +1389,13 @@ const handleSelect = (e, row) => {
       ruleCurrency: row.ruleCurrency,
       originalCurrency: row.originalCurrency,
       payoutCurrency: row.payoutCurrency,
-      hkdToPayoutRate: row.hkdToPayoutRate ? row.hkdToPayoutRate : '',
+      hkdToPayoutRate: '',
       exchangeRate: row.exchangeRate ? row.exchangeRate : '',
-      originalToHkdRate: row.originalToHkdRate ? row.originalToHkdRate : '',
+      originalToHkdRate: '',
       payoutAmount: row.payoutAmount ? Number(row.payoutAmount).toFixed(2) : '',
-
       ruleAmount: row.ruleAmount ? Number(row.ruleAmount).toFixed(2) : '',
       hkdAmount: row.hkdAmount ? Number(row.hkdAmount).toFixed(2) : ''
     }
-
     rateExchangeFlag.value = true
   }
 }
@@ -1465,6 +1445,7 @@ const updatePayoutAmountapi = async data => {
 const updatePayRollStatusDisable = ref(true)
 const multipleSelection = ref([])
 const handleSelectionChange = val => {
+  
   multipleSelection.value = val
   console.log('全选:', val)
   // 完成检核按钮是否禁用
@@ -1481,7 +1462,8 @@ const submitSettingBillYearMonth = async () => {
       if (res.code === 200) {
         settingBillYearMonthFlag.value = false
         ElMessage.success('完成检核，等待关账')
-        loadTableData()
+        const params = searchFormRef.value.getFormData()
+        loadTableData(params)
       }
     } catch (error) {
       console.error('检核失败:', error)

src/views/financialCenter/receivables.vue

@@ -376,10 +376,9 @@ const addReceivablesFormConfig = [
     visible: formData => formData.commissionBizType === 'R',
     rules: [{ pattern: /^\d+$/, message: '只能输入正整数', trigger: 'blur' }]
   },
-  // 等待key
   {
     type: 'month',
-    prop: 'commissionDateMonth',
+    prop: 'commissionDate',
     label: '入账月（估）',
     placeholder: '请选择'
   },