diff --git a/src/components/locales/lang/en.js b/src/components/locales/lang/en.js index 4b698d2..22f703f 100644 --- a/src/components/locales/lang/en.js +++ b/src/components/locales/lang/en.js @@ -190,6 +190,7 @@ export default { // Message Group elmessage: { // Common + checkReceivedWallet: "Please select a received wallet", accountEmpty: "Account cannot be empty", passwordEmpty: "Password cannot be empty", checkRefundgolds: "Refund gold cannot be empty", diff --git a/src/components/locales/lang/zh-CN.js b/src/components/locales/lang/zh-CN.js index f7a5fc4..3c87ce2 100644 --- a/src/components/locales/lang/zh-CN.js +++ b/src/components/locales/lang/zh-CN.js @@ -190,6 +190,7 @@ export default { // 提示信息组 elmessage: { // 通用 + checkReceivedWallet: "请选择收款钱包", accountEmpty: "账号不能为空", passwordEmpty: "密码不能为空", checkRefundgolds: "退款金币总数不能为0", diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index aacb025..9750e78 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -436,7 +436,7 @@ -
{{ rejectReason }} @@ -831,6 +831,7 @@ const openAddForm = (row) => { receivedWallet: walletList.value.find(item => item.id == row.walletId)?.walletName || '' } console.log('这是编辑数据:', addFormData.value); + showWallet(addFormData.value.receivedMarket) jwcodeSeachMarket() } else { @@ -909,6 +910,10 @@ const handleAddForm = async () => { if (addFormData.value.payTime) { addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') } + if (!addFormData.value.receivedWallet) { + ElMessage.error(t('elmessage.checkReceivedWallet')); + return; + } ifAddDone.value = true const result = await request({ @@ -977,6 +982,10 @@ const handleEditForm = async () => { if (addFormData.value.payTime) { addFormData.value.payTime = moment(addFormData.value.payTime).format('YYYY-MM-DD HH:mm:ss') } + if (!addFormData.value.receivedWallet) { + ElMessage.error(t('elmessage.checkReceivedWallet')); + return; + } ifReAddDone.value = true const result = await request({ url: '/cashCollection/reSubmit', @@ -1647,9 +1656,13 @@ onMounted(async () => { background-color: #E5EBFE !important; } +:deep(.reject-dialog) { + background-color: #F3FAFE !important; +} .reject-reason-box { width: 80%; padding: 20px; + background-color: #FFF; } .rejectBtn { diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js index 1c47a88..db647c2 100644 --- a/src/views/moneyManage/receiveDetail/utils/staticData.js +++ b/src/views/moneyManage/receiveDetail/utils/staticData.js @@ -213,7 +213,9 @@ export const MarketNameForId = (name) => { return 24018 } else if (name == t('cash.markets.VietnamHCM') || name == '越南HCM' || name == 'Vietnam HCM') { return 24022 - } else if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters') { + }else if (name == t('cash.markets.Beijing')) { + return 24033 + }else if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters') { return '总部' } else { return name @@ -237,6 +239,8 @@ export const normalizeSubmitterMarket = (name) => { return '越南HCM' } else if (name == '市场部' || name == 'Marketing Dept') { return '市场部' + }else if (name == t('cash.markets.Beijing')) { + return '北京' } else { return name }