From a6049c22fe3c9a690432844d2ef8085cd73a9e41 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 20 Nov 2025 16:59:44 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=89=8B=E7=BB=AD=E8=B4=B9=E4=B8=8D?=
 =?UTF-8?q?=E5=A1=AB=E4=B8=BAo=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 9 ++++++---
 src/views/moneyManage/receiveDetail/receiveManage.vue  | 9 ++++++---
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index 5a93368..a7ba2d2 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -941,7 +941,7 @@ const submitRefund = async () => {
                 freeGold: (refundFormData.value.freeGold) * 100 || 0,
                 partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
                 partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
-                handlingCharge: (refundFormData.value.handlingCharge) * 100 || 0,
+                handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
             }
         })
         if (result.code == 200) {
@@ -1085,6 +1085,8 @@ watch(auditFormisible, (val) => {
 // 2.5 编辑手续费功能
 // 打开编辑弹窗
 const openEditForm = (row) => {
+    console.log('row.aaa', row.handlingCharge);
+    
     editFormData.value = { ...row };
     // 区分金币产品与普通产品
     if (row.goodsName === '金币充值') isEditGold.value = true;
@@ -1112,12 +1114,13 @@ const submitEditForm = async () => {
         if (editFormData.value.receivedTime) {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
         }
-
+        console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
+        
         const result = await request({
             url: '/cashCollection/complete',
             data: {
                 orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位
+                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
                 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index 5a93368..a7ba2d2 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -941,7 +941,7 @@ const submitRefund = async () => {
                 freeGold: (refundFormData.value.freeGold) * 100 || 0,
                 partRefundGold: (refundFormData.value.partRefundGold) * 100 || 0,
                 partRefundFree: (refundFormData.value.partRefundFree) * 100 || 0,
-                handlingCharge: (refundFormData.value.handlingCharge) * 100 || 0,
+                handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
             }
         })
         if (result.code == 200) {
@@ -1085,6 +1085,8 @@ watch(auditFormisible, (val) => {
 // 2.5 编辑手续费功能
 // 打开编辑弹窗
 const openEditForm = (row) => {
+    console.log('row.aaa', row.handlingCharge);
+    
     editFormData.value = { ...row };
     // 区分金币产品与普通产品
     if (row.goodsName === '金币充值') isEditGold.value = true;
@@ -1112,12 +1114,13 @@ const submitEditForm = async () => {
         if (editFormData.value.receivedTime) {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
         }
-
+        console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
+        
         const result = await request({
             url: '/cashCollection/complete',
             data: {
                 orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge * 100 , // 转为分单位
+                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
                 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),

From 99f5292a5a43085a27ab834c9fe4ee448c468977 Mon Sep 17 00:00:00 2001
From: ZhangYong <zyqinghu@163.com>
Date: Thu, 20 Nov 2025 17:57:08 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E8=A2=AB=E4=BB=A3?=
 =?UTF-8?q?=E6=94=B6=E7=94=A8=E6=88=B7=E6=95=B0=E6=8D=AE=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/moneyManage/receiveDetail/receiveFinance.vue | 16 ++++++++--------
 src/views/moneyManage/receiveDetail/receiveManage.vue  | 16 ++++++++--------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue
index a7ba2d2..1d844ed 100644
--- a/src/views/moneyManage/receiveDetail/receiveFinance.vue
+++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue
@@ -200,7 +200,7 @@
                                     @click="openAuditForm(scope.row)">审核
                                 </el-link>
                                 <el-link
-                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
                                     style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
                                 </el-link>
                                 <el-link
@@ -344,8 +344,8 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="备注">
-                    <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3"
-                         maxlength="100" show-word-limit />
+                    <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
+                        show-word-limit />
                 </el-form-item>
                 <el-form-item label="驳回理由" v-if="ifReject" required>
                     <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
@@ -458,7 +458,7 @@
                 <div class="right">
                     <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
                         label-width="4.5vw" label-position="left">
-                        <el-form-item label="到账货币" >
+                        <el-form-item label="到账货币">
                             <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
                                 placeholder="请选择到账货币" />
                         </el-form-item>
@@ -468,7 +468,7 @@
                         <el-form-item label="手续费" prop="handlingCharge">
                             <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
                         </el-form-item>
-                        <el-form-item label="到账时间" >
+                        <el-form-item label="到账时间">
                             <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
                         </el-form-item>
                     </el-form>
@@ -1086,7 +1086,7 @@ watch(auditFormisible, (val) => {
 // 打开编辑弹窗
 const openEditForm = (row) => {
     console.log('row.aaa', row.handlingCharge);
-    
+
     editFormData.value = { ...row };
     // 区分金币产品与普通产品
     if (row.goodsName === '金币充值') isEditGold.value = true;
@@ -1115,12 +1115,12 @@ const submitEditForm = async () => {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
         }
         console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
-        
+
         const result = await request({
             url: '/cashCollection/complete',
             data: {
                 orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
+                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
                 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),
diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue
index a7ba2d2..1d844ed 100644
--- a/src/views/moneyManage/receiveDetail/receiveManage.vue
+++ b/src/views/moneyManage/receiveDetail/receiveManage.vue
@@ -200,7 +200,7 @@
                                     @click="openAuditForm(scope.row)">审核
                                 </el-link>
                                 <el-link
-                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4)"
+                                    v-else-if="activeTab == 'pass' && !(scope.row.status == 6 || scope.row.status == 4) && scope.row.receivedMarket == scope.row.submitterMarket"
                                     style="color: #2741DE;" @click="openEditForm(scope.row)">编辑
                                 </el-link>
                                 <el-link
@@ -344,8 +344,8 @@
                     </div>
                 </el-form-item>
                 <el-form-item label="备注">
-                    <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3"
-                         maxlength="100" show-word-limit />
+                    <el-input disabled="true" v-model="auditFormData.remark" type="textarea" :rows="3" maxlength="100"
+                        show-word-limit />
                 </el-form-item>
                 <el-form-item label="驳回理由" v-if="ifReject" required>
                     <el-input v-model="auditFormData.rejectReason" type="textarea" :rows="3" placeholder="请输入驳回理由"
@@ -458,7 +458,7 @@
                 <div class="right">
                     <el-form ref="editFormRef" :rules="editFormRule" :model="editFormData" class="editFormRighrt"
                         label-width="4.5vw" label-position="left">
-                        <el-form-item label="到账货币" >
+                        <el-form-item label="到账货币">
                             <CurrencySelect v-model="editFormData.receivedCurrency" :items="customOptions"
                                 placeholder="请选择到账货币" />
                         </el-form-item>
@@ -468,7 +468,7 @@
                         <el-form-item label="手续费" prop="handlingCharge">
                             <el-input v-model="editFormData.handlingCharge" placeholder="请输入手续费" type="number" />
                         </el-form-item>
-                        <el-form-item label="到账时间" >
+                        <el-form-item label="到账时间">
                             <el-date-picker type="datetime" v-model="editFormData.receivedTime" placeholder="请选择到账时间" />
                         </el-form-item>
                     </el-form>
@@ -1086,7 +1086,7 @@ watch(auditFormisible, (val) => {
 // 打开编辑弹窗
 const openEditForm = (row) => {
     console.log('row.aaa', row.handlingCharge);
-    
+
     editFormData.value = { ...row };
     // 区分金币产品与普通产品
     if (row.goodsName === '金币充值') isEditGold.value = true;
@@ -1115,12 +1115,12 @@ const submitEditForm = async () => {
             editFormData.value.receivedTime = moment(editFormData.value.receivedTime).format('YYYY-MM-DD HH:mm:ss');
         }
         console.log('editFormData.value.handlingCharge', editFormData.value.handlingCharge);
-        
+
         const result = await request({
             url: '/cashCollection/complete',
             data: {
                 orderCode: editFormData.value.orderCode,
-                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100 , // 转为分单位
+                handlingCharge: editFormData.value.handlingCharge == null ? null : editFormData.value.handlingCharge * 100, // 转为分单位
                 paymentCurrency: CurrencyForId(editFormData.value.paymentCurrency),
                 paymentAmount: editFormData.value.paymentAmount * 100, // 转为分单位
                 receivedCurrency: CurrencyForId(editFormData.value.receivedCurrency),