Merge branch 'milestone-20260402-现金4期' of http://39.101.133.168:8807/huangqizhen/gold-vue into milestone-20260402-现金4期

src/components/locales/lang/en.js

@@ -204,6 +204,7 @@ export default {
     refreshFailed: 'Refresh failed: {msg}',
     unknownError: 'Unknown error',
     refreshError: 'Refresh error, try again',
+    refundagain:'Refund submitted. Please do not submit again',
     logoutSuccess: 'Logged out',
     staffHidden: 'Staff data hidden',
     staffShown: 'Staff data shown',

src/components/locales/lang/zh-CN.js

@@ -211,6 +211,7 @@ export default {
     jumpSuccess: "跳转成功",
     jumpFailed: "跳转失败",
     refundFailed: "退款失败",
+    refundagain:"已提交退款，请勿重复提交",
     oldPasswordError: "原密码错误，请重新输入",
     addSuccess: "添加成功", // 大写是添加成功，小写是新增
     addsuccess: "新增成功",
@@ -1353,6 +1354,7 @@ export default {
       bankHandlingFeePlaceholder:"请输入银行手续费",
       remarks:"备注",
       remarksPlaceholder:"请输入备注 (选填，限制100字)",
+      remarkPlaceholderDate:"需填写手续费结算周期（如“2026年3月12日iPay88手续费”）",
       cancel: "取消",
       submit: "提交",
       ipay88: "iPay88",

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -273,7 +273,6 @@ const openRefundConfirm = () => {
     permanentGold: null,
     freeGold: null,
   }
-  
 }
 const openRefundDialog = () => {
   refundDialog.value = true
@@ -297,6 +296,10 @@ const resetRefund = () => {
 }
 const handleRefund = async () => {
   try {
+    if(refundFormData.value.status == 6){
+      ElMessage.error(t('elmessage.refundagain'))
+        return
+    }
     if (refundFormData.value.refundModel == 1) {
       if (Number(refundFormData.value.permanentGold || 0) > Number(refundFormData.value.oldpermanentGold || 0)) {
         ElMessage.error(t('elmessage.limitRefundGoldNotExceedOriginal'))
@@ -634,7 +637,7 @@ const ipay88Rules = {
   handlingCharge: [
     { required: true, message: t("common_add.feePlaceholder"),trigger: 'change'},
     { pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: t('cash.cashFlow.invalidFormat'),trigger: 'change' } ],
-  remark: [{ max: 100, message: t('cash.cashFlow.remarksexceed'), trigger: 'change' }]
+  remark: [ {required: true, max: 100, message: t('cash.cashFlow.remarksexceed'), trigger: 'change' }]
   };
 const handleIpay88 =async () =>{
   if (!ipay88FormRef.value) return;
@@ -907,7 +910,7 @@ onMounted(async () => {
       </el-form>
       <div style="display:flex;justify-content: center;margin-top: 5vh;" class="btnDiv">
         <el-button type="default" style="background-color: #7E91FF;" @click="showDetail = false">{{t('common.cancel')}}</el-button>
-        <el-button type="primary" style="background-color: #2741DE; margin-left: 2.5vw;" @click="openRefundConfirm">{{ t('common.refund') }}</el-button>
+        <el-button v-show="formDataRow.orderCode.slice(0, 4) == 'GOLD' && formDataRow.status === 4 " type="primary" style="background-color: #2741DE; margin-left: 2.5vw;" @click="openRefundConfirm">{{ t('common.refund') }}</el-button>
       </div>
     </el-dialog>
 
@@ -1014,7 +1017,6 @@ onMounted(async () => {
         </div>
       </div>
     </el-dialog>
-
     <!-- 导出列表弹窗 -->
     <el-dialog v-model="exportListVisible" :title="t('common_export.exportList')" width="80%">
       <el-table :data="exportList" style="width: 100% ;height: 60vh;" :loading="exportListLoading">
@@ -1333,6 +1335,7 @@ onMounted(async () => {
 }
 
 .newAdd {
+  margin-left: auto;
   display: flex;
   width: 240px;
   justify-content: flex-end;