Browse Source

三期补充3

zhangrenyuan/feature-20260128093451-日常优化1.0
ZhangYong 1 month ago
parent
commit
32d344c78b
  1. 1
      src/components/locales/lang/en.js
  2. 1
      src/components/locales/lang/zh-CN.js
  3. 1
      src/views/moneyManage/receiveDetail/receiveFinance.vue
  4. 1
      src/views/moneyManage/receiveDetail/receiveManage.vue
  5. 7
      src/views/moneyManage/receiveDetail/receiveService.vue
  6. 2
      src/views/moneyManage/receiveDetail/utils/staticData.js

1
src/components/locales/lang/en.js

@ -185,6 +185,7 @@ export default {
// Message Group // Message Group
elmessage: { elmessage: {
// Common // Common
checkPermanentGold: "Permanent gold cannot be empty",
loginSuccess: "Login successful", loginSuccess: "Login successful",
languageChangedSuccess: 'Language switched to {lang}', languageChangedSuccess: 'Language switched to {lang}',
refreshLoading: 'Refreshing data...', refreshLoading: 'Refreshing data...',

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

@ -185,6 +185,7 @@ export default {
// 提示信息组 // 提示信息组
elmessage: { elmessage: {
// 通用 // 通用
checkPermanentGold: "永久金币不能为空",
loginSuccess: "登录成功", loginSuccess: "登录成功",
languageChangedSuccess: "语言已切换到{lang}", languageChangedSuccess: "语言已切换到{lang}",
refreshLoading: "数据刷新中,请稍候...", refreshLoading: "数据刷新中,请稍候...",

1
src/views/moneyManage/receiveDetail/receiveFinance.vue

@ -1242,6 +1242,7 @@ const submitEditForm = async () => {
receivedRemark: editFormData.value.receivedRemark || '', receivedRemark: editFormData.value.receivedRemark || '',
paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig, paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig), paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
payType: editFormData.value.payType
} }
}); });

1
src/views/moneyManage/receiveDetail/receiveManage.vue

@ -1242,6 +1242,7 @@ const submitEditForm = async () => {
receivedRemark: editFormData.value.receivedRemark || '', receivedRemark: editFormData.value.receivedRemark || '',
paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig, paymentCurrencyOrig: editFormData.value.paymentCurrencyOrig,
paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig), paymentAmountOrig: CurrencyForId(editFormData.value.paymentAmountOrig),
payType: editFormData.value.payType
} }
}); });

7
src/views/moneyManage/receiveDetail/receiveService.vue

@ -799,6 +799,13 @@ const handleAddForm = async () => {
ElMessage.error(t('elmessage.checkNumUnit')); ElMessage.error(t('elmessage.checkNumUnit'));
return; 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) { if (addFormData.value.payTime) {
addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss')

2
src/views/moneyManage/receiveDetail/utils/staticData.js

@ -308,6 +308,8 @@ export const CurrencyForId = (name) => {
return 7 return 7
} else if (name == t('cash.currency.krw') || name == '韩元(KRW)' || name == 'South Korean Won(KRW)') { } else if (name == t('cash.currency.krw') || name == '韩元(KRW)' || name == 'South Korean Won(KRW)') {
return 8 return 8
}else if (name == t('cash.currency.rmb') || name == '人民币(CNY)' || name == 'CNY') {
return 9
} else { } else {
return name return name
} }

Loading…
Cancel
Save