Merge branch 'zhangyong/milestone-20250913-现金管理二期' into milestone-20251104-现金二期

src/views/moneyManage/refundDetail/refundService.vue

@@ -231,7 +231,7 @@ const { adminData, menuTree } = storeToRefs(adminStore)
 import { permissionMapping, findMenuById, hasMenuPermission } from "@/utils/menuTreePermission.js"
 import ConfirmDialog from '@/components/dialogs/ConfirmDialog.vue'
 import { pa } from 'element-plus/es/locales.mjs'
-import { productList,CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
+import { productList, CurrencyForId } from '@/views/moneyManage/receiveDetail/utils/staticData.js'
 import RefundRecallBackground from '@/assets/images/refund-recall.png'
 import { isNumber } from 'lodash'
 
@@ -286,7 +286,7 @@ const getRefund = async function () {
         const goodsName = searchForm.value.goodsName && searchForm.value.goodsName.length > 0
             ? searchForm.value.goodsName[searchForm.value.goodsName.length - 1] : ''
 
-        if(searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)){
+        if (searchForm.value.jwcode && !isNumber(searchForm.value.jwcode)) {
             ElMessage.error('精网号必须为数字')
             return
         }
@@ -357,9 +357,10 @@ const submitEdit = async function () {
         ElMessage.error('无此权限')
         return
     }
+
     try {
         console.log(editRow.value)
-        const params = {
+        let params = {
             id: editRow.value.id,
             status: editRow.value.status,
             refundModel: editForm.value.refundModel,
@@ -367,8 +368,12 @@ const submitEdit = async function () {
             jwcode: editRow.value.jwcode,
             paymentAmount: editRow.value.paymentAmount,
             paymentCurrency: editRow.value.paymentCurrency,
-            partRefundGold: editForm.value.partRefundGold,
-            partRefundFree: editForm.value.partRefundFree
+            newRefundGold: editForm.value.partRefundGold,
+            newRefundFree: editForm.value.partRefundFree
+
+        }
+        if (editForm.value.goodsName == '金币充值') {
+            params.partRefundGold = editForm.value.partRefundGold
         }
         const result = await API({
             url: '/Money/update',