合并

src/components/locales/lang/en.js

@@ -1332,6 +1332,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",

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

@@ -1341,10 +1341,10 @@ export default {
       otherIncomeYes:"其他收入-算业绩",
       quantity:"个数",
       quantityPlaceholder:"请输入个数",
-      payType: "支付方式",
-      payTypePlaceholder: "请选择支付方式",
-      paymentCurrency: "付款币种",
-      paymentCurrencyPlaceholder: "请选择付款币种",
+      payType:"付款方式",
+      payTypePlaceholder:"请选择付款方式",
+      paymentCurrency:"币种",
+      paymentCurrencyPlaceholder:"请选择币种",
       paymentAmount:"付款金额",
       paymentAmountPlaceholder:"请输入付款金额",
       paymentTime:"付款时间",

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">

src/views/moneyManage/financialAccount/cashFlow.vue

@@ -505,7 +505,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)
@@ -564,7 +567,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' }
@@ -625,19 +628,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' }],
@@ -787,7 +777,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"  />
@@ -795,7 +787,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">
@@ -879,8 +873,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">
@@ -1005,13 +999,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">