From 05161ca80b0beda952e2716b2abf7148ceb508bb Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Fri, 23 Jan 2026 14:32:47 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=9C=9F=E9=9C=80=E6=B1=82=E8=A1=A5?=
 =?UTF-8?q?=E5=85=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/financialAccount/cashFlow.vue    |  2 +-
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 14 ++++++++++----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index 9414d2d..5f2805d 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -93,7 +93,7 @@ const fetchData = async () => {
       pageSize: queryParams.pageSize,
       fundsDTO: {
         jwcode: queryParams.jwcode,
-        markets: queryParams.markets,
+        localMarket:queryParams.markets,
         startTime: queryParams.timeRange?.[0] ? dayjs(queryParams.timeRange[0]).format('YYYY-MM-DD HH:mm:ss') : '',
         endTime: queryParams.timeRange?.[1] ? dayjs(queryParams.timeRange[1]).format('YYYY-MM-DD HH:mm:ss') : '',
         payType: queryParams.payType,
diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index bb20121..2948941 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -445,11 +445,11 @@
                             </div>
                         </div>
                         <el-form-item :label="t('common_add.payCurrency')">
-                            <CurrencySelect :disabled="!ifOnline" v-model="editFormData.paymentCurrency"
+                            <CurrencySelect :disabled="ifOnline" v-model="editFormData.paymentCurrency"
                                 :items="customOptions" :placeholder="t('common_add.payCurrency')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payAmount')">
-                            <el-input :disabled="!ifOnline" v-model="editFormData.paymentAmount"
+                            <el-input :disabled="ifOnline" v-model="editFormData.paymentAmount"
                                 :placeholder="t('common_add.payAmount')" />
                         </el-form-item>
                         <el-form-item :label="t('common_add.payMethod')">
@@ -1191,7 +1191,11 @@ watch(auditFormisible, (val) => {
 const openEditForm = (row) => {
     console.log('row.aaa', row.handlingCharge);
 
-    editFormData.value = { ...row };
+    editFormData.value = { 
+        ...row,
+        paymentCurrencyOrig: row.paymentCurrency,
+        paymentAmountOrig: row.paymentAmount,
+     };
     // 区分金币产品与普通产品
     if (row.goodsName === t('cash.coinRecharge')) isEditGold.value = true;
     else isEditGold.value = false;
@@ -1235,7 +1239,9 @@ const submitEditForm = async () => {
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
                 receivedAmount: editFormData.value.receivedAmount * 100 || null, // 转为分单位
                 receivedTime: editFormData.value.receivedTime,
-                receivedRemark: editFormData.value.receivedRemark || ''
+                receivedRemark: editFormData.value.receivedRemark || '',
+                paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
+                paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
             }
         });