diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index b14158e..5a0e401 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -185,6 +185,7 @@ export default { // Message Group elmessage: { // Common + checkPermanentGold: "Permanent gold cannot be empty", loginSuccess: "Login successful", languageChangedSuccess: 'Language switched to {lang}', refreshLoading: 'Refreshing data...', diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index acd3f15..d4d08d4 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -185,6 +185,7 @@ export default { // 提示信息组 elmessage: { // 通用 + checkPermanentGold: "永久金币不能为空", loginSuccess: "登录成功", languageChangedSuccess: "语言已切换到{lang}", refreshLoading: "数据刷新中,请稍候...", diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 29b7899..98dca99 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -1242,6 +1242,7 @@ const submitEditForm = async () => { receivedRemark: editFormData.value.receivedRemark || '', paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig, paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig), + payType: editFormData.value.payType } }); diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 29b7899..98dca99 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -1242,6 +1242,7 @@ const submitEditForm = async () => { receivedRemark: editFormData.value.receivedRemark || '', paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig, paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig), + payType: editFormData.value.payType } }); diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 61b2906..1bbad07 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -799,6 +799,13 @@ const handleAddForm = async () => { ElMessage.error(t('elmessage.checkNumUnit')); return; } + if (addFormData.value.goodsName == t('cash.coinRecharge')) { + if (addFormData.value.permanentGold == null || addFormData.value.permanentGold == 0) { + ElMessage.error(t('elmessage.checkPermanentGold')); + return; + } + + } // 处理时间格式 if (addFormData.value.payTime) { addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js index 18a5ce2..cdb41f9 100644 --- a/src/views/moneyManage/receiveDetail/utils/staticData.js +++ b/src/views/moneyManage/receiveDetail/utils/staticData.js @@ -308,6 +308,8 @@ export const CurrencyForId = (name) => { return 7 } else if (name == t('cash.currency.krw') || name == '韩元(KRW)' || name == 'South Korean Won(KRW)') { return 8 + }else if (name == t('cash.currency.rmb') || name == '人民币(CNY)' || name == 'CNY') { + return 9 } else { return name }