From 64a557bd22ebbcb277584d1dec89d133e6471a23 Mon Sep 17 00:00:00 2001
From: jiangcheng <jiangcheng@123>
Date: Fri, 10 Apr 2026 11:46:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E5=A4=9A=E8=AF=AD=E8=A8=80?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E3=80=81=E8=B5=84=E9=87=91=E6=B5=81=E6=B0=B4?=
 =?UTF-8?q?=E8=B4=A6=E5=AD=97=E6=AE=B5=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/locales/lang/en.js                  |  1 +
 src/components/locales/lang/zh-CN.js               |  9 +++---
 src/views/activityManage/activity.vue              |  2 +-
 .../moneyManage/financialAccount/cashFlow.vue      | 36 +++++++++-------------
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js
index 543d703..68f710b 100644
--- a/src/components/locales/lang/en.js
+++ b/src/components/locales/lang/en.js
@@ -1331,6 +1331,7 @@ export default {
       bankHandlingFeePlaceholder: "Please enter bank handling fee",
       remarks: "Remarks",
       remarksPlaceholder: "Please enter remarks (optional, limit 100 characters)",
+      remarkPlaceholderDate:"Need to fill in the handling fee settlement period (e.g. 'March 12, 2026 iPay88 handling fee')",
       cancel: "Cancel",
       submit: "Submit",
       ipay88:"iPay88",
diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js
index 9d5c4cf..26080a1 100644
--- a/src/components/locales/lang/zh-CN.js
+++ b/src/components/locales/lang/zh-CN.js
@@ -1339,10 +1339,10 @@ export default {
       otherIncomeYes:"其他收入-算业绩",
       quantity:"个数",
       quantityPlaceholder:"请输入个数",
-      payType:"支付方式",
-      payTypePlaceholder:"请选择支付方式",
-      paymentCurrency:"付款币种",
-      paymentCurrencyPlaceholder:"请选择付款币种",
+      payType:"付款方式",
+      payTypePlaceholder:"请选择付款方式",
+      paymentCurrency:"币种",
+      paymentCurrencyPlaceholder:"请选择币种",
       paymentAmount:"付款金额",
       paymentAmountPlaceholder:"请输入付款金额",
       paymentTime:"付款时间",
@@ -1351,6 +1351,7 @@ export default {
       bankHandlingFeePlaceholder:"请输入银行手续费",
       remarks:"备注",
       remarksPlaceholder:"请输入备注 (选填，限制100字)",
+      remarkPlaceholderDate:"需填写手续费结算周期（如“2026年3月12日iPay88手续费”）",
       cancel:"取消",
       submit:"提交",
       ipay88:"iPay88",
diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue
index f5b072e..73e8b39 100644
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@@ -45,7 +45,7 @@
                     </template>
                 </el-table-column>
                 <el-table-column prop="activityName" :label="t('common_list.activity')" width="150px" show-overflow-tooltip />
-                <el-table-column prop="businessBelong" :label="t('common_list.businessBelong')" width="150px" />
+                <el-table-column prop="businessBelong" :label="t('common_add.businessBelong')" width="150px" />
                 <el-table-column prop="areaName" :label="t('common_list.market')" width="150px" />
                 <el-table-column prop="startTime" :label="t('common_list.startTime')" width="200px">
                     <template #default="scope">
diff --git a/src/views/moneyManage/financialAccount/cashFlow.vue b/src/views/moneyManage/financialAccount/cashFlow.vue
index 1ea0cf4..cb2da83 100644
--- a/src/views/moneyManage/financialAccount/cashFlow.vue
+++ b/src/views/moneyManage/financialAccount/cashFlow.vue
@@ -494,7 +494,10 @@ const formDataRow = ref({
 const showDetail=ref(false)
 const showRecordDetail = async (row) => {
   showDetail.value=true
-  formDataRow.value=row
+  formDataRow.value={
+    ...row,
+    handlingCharge:row.handlingCharge || 0
+  }
 }
 const paymentCurrency = ref([
     t('cash.currency.usd'),   // 美元(USD)
@@ -553,7 +556,7 @@ const otherRules = {
     ],
       paymentAmount: [
       { required: true, message: t('common_add.payAmountPlaceholder'), trigger: 'blur' },
-      { pattern: /^[0-9]+(\.[0-9]{1,2})?$/, message: t('cash.cashFlow.invalidFormat'), trigger: 'blur' }
+      { pattern: /^-?[0-9]+(\.[0-9]{1,2})?$/, message: t('cash.cashFlow.invalidFormat'), trigger: 'blur' }
     ],
       payTime: [
       { required: true, message: t('common_add.payTimePlaceholder'), trigger: 'change' }
@@ -614,19 +617,6 @@ const addIpay88Form=ref({
 const ipay88Rules = {
   performanceMarket: [{ required: true, message: t('common.performanceByRegionPlaceholder'), trigger: 'change' } ],
   goodsName: [{ required: true, message: t('cash.cashFlow.incomeCategoryPlaceholder'), trigger: 'change' }],
-  // 付款金额固定为0（根据表格要求）
-  paymentAmount: [
-    { required: true, message: t('cash.cashFlow.paymentMust'), trigger: 'change',
-      validator: (rule, value, callback) => {
-        const numValue = Number(value);
-        if (numValue !== 0 && numValue !== 0.0) {
-          callback(new Error(t('cash.cashFlow.paymentMust')));
-        } else {
-          callback();
-        }
-      }
-    }
-  ],
   payType: [ { required: true, message: t('common.payModelPlaceholder'), trigger: 'change' } ],
   paymentCurrency: [{ required: true, message: t('common.payCurrencyPlaceholder'), trigger: 'change' }],
   payTime: [{ required: true, message: t('common_add.payTimePlaceholder'), trigger: 'change' }],
@@ -775,7 +765,9 @@ onMounted(async () => {
           </template></el-table-column>
         <el-table-column prop="name" :label="t('common_list.name')" width="150" show-overflow-tooltip />
         <el-table-column prop="jwcode" :label="t('common_list.jwcode')" width="120"  />
-        <el-table-column prop="goodsName" :label="t('common_list.receiveType')" width="120"  />
+        <el-table-column prop="goodsName" :label="t('common_list.receiveType')" width="120"  >
+          <template #default="{ row }">{{ row.goodsName || '-' }}</template>
+        </el-table-column>
         <el-table-column prop="remark" :label="t('common_list.remark')" width="120"  />
         <el-table-column prop="goodNum" :label="t('common_list.nums')" width="120"  />
         <el-table-column prop="payType" :label="t('common_list.paymentMethod')" width="120"  />
@@ -783,7 +775,9 @@ onMounted(async () => {
           show-overflow-tooltip />
         <el-table-column prop="paymentAmount" :label="t('common_list.payAmount')" width="150" align="right">
         </el-table-column>
-        <el-table-column prop="handlingCharge" :label="t('common_list.fee')" width="100" align="right" />
+        <el-table-column prop="handlingCharge" :label="t('common_list.fee')" width="100" align="right" >
+          <template #default="{ row }">{{ row.paymentAmount || 0 }}</template>
+        </el-table-column>
         <el-table-column prop="receivedAmount" :label="t('common_list.receiveAmount')" width="150" align="right">
         </el-table-column>
         <!-- <el-table-column :label="t('common_list.operation')" width="100" fixed="right" align="center">
@@ -867,8 +861,8 @@ onMounted(async () => {
           </el-form-item>
           </div>
           <div class="add-item">
-          <el-form-item :label="t('common_list.receiveCurrency')">
-            <el-input v-model="formDataRow.receiveCurrency" />
+          <el-form-item :label="t('common_add.receiveCurrency')">
+            <el-input v-model="formDataRow.receivedCurrencyName" />
           </el-form-item>
           </div>
           <div class="add-item">
@@ -993,13 +987,13 @@ onMounted(async () => {
             </el-select>
           </el-form-item>
           <el-form-item :label="t('cash.cashFlow.paymentAmount')" prop="paymentAmount">
-            <el-input v-model="addIpay88Form.paymentAmount" :placeholder="t('cash.cashFlow.paymentAmountPlaceholder')"/>
+            <el-input disabled v-model="addIpay88Form.paymentAmount" :placeholder="t('cash.cashFlow.paymentAmountPlaceholder')" value="0"/>
           </el-form-item>
           <el-form-item :label="t('cash.cashFlow.processingFee')" prop="handlingCharge">
             <el-input v-model="addIpay88Form.handlingCharge" :placeholder="t('cash.cashFlow.processingFeePlaceholder')" />
           </el-form-item>
           <el-form-item :label="t('cash.cashFlow.remarks')" prop="remark">
-            <el-input v-model="addIpay88Form.remark" type="textarea" :rows="3" :placeholder="t('cash.cashFlow.remarksPlaceholder')" :maxlength="100" show-word-limit/>
+            <el-input v-model="addIpay88Form.remark" type="textarea" :rows="3" :placeholder="t('cash.cashFlow.remarkPlaceholderDate')" :maxlength="100" show-word-limit/>
           </el-form-item>
         </el-form>
         <div class="btnDiv">