diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 5a0e401..0db6533 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 + checkRefundgolds: "Refund gold cannot be empty", checkPermanentGold: "Permanent gold cannot be empty", loginSuccess: "Login successful", languageChangedSuccess: 'Language switched to {lang}', diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index d4d08d4..f285323 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -185,6 +185,7 @@ export default { // 提示信息组 elmessage: { // 通用 + checkRefundgolds: "退款金币总数不能为0", checkPermanentGold: "永久金币不能为空", loginSuccess: "登录成功", languageChangedSuccess: "语言已切换到{lang}", diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index d3e9713..1abd733 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -805,7 +805,6 @@ const handleAddForm = async () => { ElMessage.error(t('elmessage.checkPermanentGold')); return; } - } // 处理时间格式 if (addFormData.value.payTime) { diff --git a/src/views/moneyManage/refundDetail/refundService.vue b/src/views/moneyManage/refundDetail/refundService.vue index 0063f1a..7813a84 100644 --- a/src/views/moneyManage/refundDetail/refundService.vue +++ b/src/views/moneyManage/refundDetail/refundService.vue @@ -425,16 +425,20 @@ const submitEdit = async function () { ElMessage.error(t('elmessage.inputRefundBeansBoth')) return } - const isPositiveInteger = /^[1-9]\d*$/.test(editForm.value.partRefundGold) + const isPositiveInteger = /^[0-9]\d*$/.test(editForm.value.partRefundGold) if (!isPositiveInteger) { ElMessage.error(t('elmessage.checkPermanentFormat')) return } - const isPositiveInteger1 = /^[1-9]\d*$/.test(editForm.value.partRefundFree) + const isPositiveInteger1 = /^[0-9]\d*$/.test(editForm.value.partRefundFree) if (!isPositiveInteger1) { ElMessage.error(t('elmessage.checkFreeFormat')) return } + if(editForm.value.partRefundFree == 0 && editForm.value.partRefundGold == 0){ + ElMessage.error(t('elmessage.checkRefundgolds')) + return + } } let params = { id: editRow.value.id,