Browse Source

修改北京地区审核问题,修改驳回弹窗样式

jiangcheng/feature-20260306102603-钱包体系
ZhangYong 4 weeks ago
parent
commit
a23b91a6bb
  1. 1
      src/components/locales/lang/en.js
  2. 1
      src/components/locales/lang/zh-CN.js
  3. 15
      src/views/moneyManage/receiveDetail/receiveService.vue
  4. 6
      src/views/moneyManage/receiveDetail/utils/staticData.js

1
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",

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

@ -190,6 +190,7 @@ export default {
// 提示信息组
elmessage: {
// 通用
checkReceivedWallet: "请选择收款钱包",
accountEmpty: "账号不能为空",
passwordEmpty: "密码不能为空",
checkRefundgolds: "退款金币总数不能为0",

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

@ -436,7 +436,7 @@
</el-dialog>
<!-- 查看驳回理由 -->
<el-dialog :title="t('common_add.rejectReason')" v-model="rejectReasonVisible" width="50%" top="30vh"
<el-dialog class="reject-dialog" :title="t('common_add.rejectReason')" v-model="rejectReasonVisible" width="50%" top="30vh"
style="min-width: 200px; max-width: 500px;" :before-close="closeRejectForm">
<div class="reject-reason-box">
{{ 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 {

6
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
}

Loading…
Cancel
Save