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 @@
-
+
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 () => {
-
+
+ {{ row.goodsName || '-' }}
+
@@ -783,7 +775,9 @@ onMounted(async () => {
show-overflow-tooltip />
-
+
+ {{ row.paymentAmount || 0 }}
+