Merge branch 'wyz' into 'test'

修复出账检核--修改结算汇率回显不正确

See merge request !163

src/views/financialCenter/financialBilling.vue

@@ -366,13 +366,7 @@ const loading = ref(false)
 const selectedRow = ref(null)
 const searchFormRef = ref(null)
 const searchParams = ref({})
-// 表格操作菜单
-const dropdownItems = [
-  // { label: '设置本期出账金额', value: 'setPayRoll' }
-  { label: '分期出账', value: 'billInstallments' },
-  { label: '设置出账年月(实)', value: 'settingBillYearMonth' },
-  { label: '修改结算汇率', value: 'editExchangeRate' }
-]
+
 // 动态生成操作菜单项（根据行数据）
 const getOperateItems = row => {
   const items = []
@@ -709,7 +703,6 @@ const confirmRateExchange = async () => {
   let formData = await rateExchangeFormRef.value.validate()
   formData.fortuneBizId = selectedRow.value.fortuneBizId
   try {
-    //等待后端接口
     const res = await editExchangeRateApi(formData)
     ElMessage.success('结算汇率修改成功')
     rateExchangeFlag.value = false
@@ -1427,13 +1420,14 @@ const handleSelect = (e, row) => {
     settingBillYearMonthFlag.value = true
   } else if (e == 'editExchangeRate') {
     rateExchangeForm.value = {
+      ...row,
       originalAmount: row.originalAmount ? Number(row.originalAmount).toFixed(2) : '',
       ruleCurrency: row.ruleCurrency,
       originalCurrency: row.originalCurrency,
       payoutCurrency: row.payoutCurrency,
-      hkdToPayoutRate: '',
+      // hkdToPayoutRate: '',
       exchangeRate: row.exchangeRate ? row.exchangeRate : '',
-      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) : ''