Merge branch 'milestone-20260212-日常优化2.0' into milestone-20260304-钱包体系

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -174,8 +174,8 @@ const openRefundConfirm = (row) => {
   refundConfirmDialog.value = true
   refundFormData.value = {
     ...row,
-    oldpermanentGold: row.permanentGold,//退款永久金币
-    oldfreeGold: row.freeGold,//退款免费金币
+    oldpermanentGold: row.permanentGold || row.gold || 0,//退款永久金币
+    oldfreeGold: row.freeGold || row.free || 0,//退款免费金币
     permanentGold: null,
     freeGold: null,
   }
@@ -206,6 +206,16 @@ const resetRefund = () => {
 }
 const handleRefund = async () => {
   try {
+    if (refundFormData.value.refundModel == 1) {
+      if (Number(refundFormData.value.permanentGold || 0) > Number(refundFormData.value.oldpermanentGold || 0)) {
+        ElMessage.error(t('elmessage.limitRefundGoldNotExceedOriginal'))
+        return
+      }
+      if (Number(refundFormData.value.freeGold || 0) > Number(refundFormData.value.oldfreeGold || 0)) {
+        ElMessage.error(t('elmessage.limitRefundGoldNotExceedOriginal'))
+        return
+      }
+    }
     if (refundFormData.value.refundModel == 0) {
       refundFormData.value.permanentGold = refundFormData.value.oldpermanentGold
       refundFormData.value.freeGold = refundFormData.value.oldfreeGold
@@ -224,8 +234,8 @@ const handleRefund = async () => {
       permanentGold: (refundFormData.value.permanentGold) * 100 || 0,
       handlingCharge: refundFormData.value.handlingCharge == null ? null : refundFormData.value.handlingCharge * 100,
       freeGold: (refundFormData.value.freeGold) * 100 || 0,
-      partRefundGold: refundFormData.value.refundModel == 1 ? (refundFormData.value.permanentGold * 100 || 0) : 0,
-      partRefundFree: refundFormData.value.refundModel == 1 ? (refundFormData.value.freeGold * 100 || 0) : 0,
+      partRefundGold: (refundFormData.value.permanentGold * 100 || 0),
+      partRefundFree: (refundFormData.value.freeGold * 100 || 0),
     }
     console.log('这是退款参数：', params);