diff --git a/src/views/activityManage/activity.vue b/src/views/activityManage/activity.vue index 92c74a4..66dded4 100644 --- a/src/views/activityManage/activity.vue +++ b/src/views/activityManage/activity.vue @@ -81,11 +81,11 @@
- {{ t('common_add.activity') }} + {{ t('common_add.activity') }}:
- {{ t('common_add.businessBelong') }} + {{ t('common_add.businessBelong') }}: {{ t('common.customerBelong') }} {{ t('common.activityBelong') }} @@ -97,12 +97,12 @@ style="width: 12vw" />
- {{ t('common_add.startTime') }} + {{ t('common_add.startTime') }}:
- {{ t('common_add.endTime') }} + {{ t('common_add.endTime') }}:
@@ -119,24 +119,24 @@
- {{ t('common_add.businessBelong') }} + {{ t('common_add.businessBelong') }}: {{ t('common.customerBelong') }} {{ t('common.activityBelong') }}
- {{ t('common_add.market') }} + {{ t('common_add.market') }}:
- {{ t('common_add.startTime') }} + {{ t('common_add.startTime') }}:
- {{ t('common_add.endTime') }} + {{ t('common_add.endTime') }}:
@@ -171,9 +171,7 @@ const getActivityStatusText = (status) => { return status } -// 活动名称正则表达式 -const activityNameReg = /^[\\u4e00-\\u9fa5a-zA-Z0-9,。!?、;:“”()‘’《》【】{}——~,.!?:;'--()\"\"\\[\\]_&+=]+$/; -// 为什么一定要两个--才能成功????????? +const activityNameReg = /^[\u4e00-\u9fa5a-zA-Z0-9,。!?、;:“”()‘’《》【】{}——~,.!?:;'()\[\]_&+=\/-]+$/; const tableData = ref([]) const pagination = ref({ pageNum: 1, @@ -451,18 +449,19 @@ const hideAdd = () => { } } const validateActivityName = (name) => { + const value = name.trim() // 非空校验 - if (!name.trim()) { + if (!value) { ElMessage.error('活动名称不能为空'); return false; } // 长度校验(限制100字符) - if (name.length > 100) { + if (value.length > 100) { ElMessage.error('活动名称长度不能超过100字符'); return false; } // 字符格式校验 - if (!activityNameReg.test(name)) { + if (!activityNameReg.test(value)) { ElMessage.error('活动名称仅支持汉字、英文字母、数字及常见标点,中文字符,。!?、;:“ ” ‘ ’ ()《》【】——~,英文字符, . ! ? : ; " ( ) [ ] - _ & + =/') return false; } diff --git a/src/views/moneyManage/receiveDetail/receiveFinance.vue b/src/views/moneyManage/receiveDetail/receiveFinance.vue index 7fa822f..248cd4b 100644 --- a/src/views/moneyManage/receiveDetail/receiveFinance.vue +++ b/src/views/moneyManage/receiveDetail/receiveFinance.vue @@ -654,7 +654,7 @@ import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'; // 静态数据与规则(仅保留必要项) import { editFormRule } from './utils/recriveFormRules.js'; -import { productList, MarketNameForId, CurrencyForId, marketList } from './utils/staticData.js'; +import { productList, MarketNameForId, CurrencyForId, marketList, normalizeSubmitterMarket } from './utils/staticData.js'; import { useAdminStore } from '@/store/index.js'; import { hasMenuPermission } from '@/utils/menuTreePermission.js'; @@ -941,7 +941,7 @@ const getlist = async () => { // 地区财务固定参数:角色ID=1,按标签页筛选状态 const cashRoleId = '1'; - const receivedMarket = adminData.value.markets; + const receivedMarket = normalizeSubmitterMarket(adminData.value.markets); if (activeTab.value === 'wait') searchData.value.status = 0; else if (activeTab.value === 'pass') searchData.value.status = 13; else if (activeTab.value === 'done') searchData.value.status = 46; @@ -975,7 +975,7 @@ const getlist = async () => { receivedMarket: MarketNameForId(receivedMarket), cashRoleId: cashRoleId, paymentCurrency: payCurrencySelect, - submitterMarket: receivedMarket, + submitterMarket: normalizeSubmitterMarket(receivedMarket), goodsName: goodsName, // market: MarketNameForId(searchData.value.market) market: markets.value @@ -1838,4 +1838,4 @@ const handlePagination = (type, val) => { } } } - \ No newline at end of file + diff --git a/src/views/moneyManage/receiveDetail/receiveHead.vue b/src/views/moneyManage/receiveDetail/receiveHead.vue index 82d03ce..7ef59c4 100644 --- a/src/views/moneyManage/receiveDetail/receiveHead.vue +++ b/src/views/moneyManage/receiveDetail/receiveHead.vue @@ -517,7 +517,7 @@ import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'; // 静态数据与规则(仅保留必要项) import { editFormRule } from './utils/recriveFormRules.js'; -import { productList, MarketNameForId, CurrencyForId, marketList } from './utils/staticData.js'; +import { productList, MarketNameForId, CurrencyForId, marketList, normalizeSubmitterMarket } from './utils/staticData.js'; import { useAdminStore } from '@/store/index.js'; import { hasMenuPermission } from '@/utils/menuTreePermission.js'; @@ -624,7 +624,7 @@ const exportExcel = async function () { // } const cashRoleId = '2'; - const submitterMarket = adminData.value.markets; + const submitterMarket = normalizeSubmitterMarket(adminData.value.markets); searchData.value.status = 46; const params = { ...pageInfo.value, @@ -829,7 +829,7 @@ const getlist = async () => { receivedMarket: MarketNameForId(receivedMarket), cashRoleId: cashRoleId, paymentCurrency: payCurrencySelect, - submitterMarket: receivedMarket, + submitterMarket: normalizeSubmitterMarket(receivedMarket), goodsName: goodsName, //market: MarketNameForId(searchData.value.market) market: markets.value @@ -1607,4 +1607,4 @@ const handlePagination = (type, val) => { } } } - \ No newline at end of file + diff --git a/src/views/moneyManage/receiveDetail/receiveManage.vue b/src/views/moneyManage/receiveDetail/receiveManage.vue index 7fa822f..3aaac91 100644 --- a/src/views/moneyManage/receiveDetail/receiveManage.vue +++ b/src/views/moneyManage/receiveDetail/receiveManage.vue @@ -654,7 +654,7 @@ import CurrencySelect from '@/components/MoneyManage/CurrencySelect.vue'; // 静态数据与规则(仅保留必要项) import { editFormRule } from './utils/recriveFormRules.js'; -import { productList, MarketNameForId, CurrencyForId, marketList } from './utils/staticData.js'; +import { productList, MarketNameForId, CurrencyForId, marketList, normalizeSubmitterMarket } from './utils/staticData.js'; import { useAdminStore } from '@/store/index.js'; import { hasMenuPermission } from '@/utils/menuTreePermission.js'; @@ -820,7 +820,7 @@ const exportExcel = async function () { // } const cashRoleId = '1'; - const submitterMarket = adminData.value.markets; + const submitterMarket = normalizeSubmitterMarket(adminData.value.markets); searchData.value.status = 46; const params = { ...pageInfo.value, @@ -941,7 +941,7 @@ const getlist = async () => { // 地区财务固定参数:角色ID=1,按标签页筛选状态 const cashRoleId = '1'; - const receivedMarket = adminData.value.markets; + const receivedMarket = normalizeSubmitterMarket(adminData.value.markets); if (activeTab.value === 'wait') searchData.value.status = 0; else if (activeTab.value === 'pass') searchData.value.status = 13; else if (activeTab.value === 'done') searchData.value.status = 46; @@ -975,7 +975,7 @@ const getlist = async () => { receivedMarket: MarketNameForId(receivedMarket), cashRoleId: cashRoleId, paymentCurrency: payCurrencySelect, - submitterMarket: receivedMarket, + submitterMarket: normalizeSubmitterMarket(receivedMarket), goodsName: goodsName, // market: MarketNameForId(searchData.value.market) market: markets.value @@ -1838,4 +1838,4 @@ const handlePagination = (type, val) => { } } } - \ No newline at end of file + diff --git a/src/views/moneyManage/receiveDetail/receiveService.vue b/src/views/moneyManage/receiveDetail/receiveService.vue index 89314f6..24504d6 100644 --- a/src/views/moneyManage/receiveDetail/receiveService.vue +++ b/src/views/moneyManage/receiveDetail/receiveService.vue @@ -450,7 +450,7 @@ import _ from 'lodash' import { isNumber } from 'lodash' // 导入客服相关规则和静态数据 import { addFormRule } from './utils/recriveFormRules.js' -import { productList, MarketNameForId, CurrencyForId, marketList, statusList } from './utils/staticData.js' +import { productList, MarketNameForId, CurrencyForId, marketList, normalizeSubmitterMarket } from './utils/staticData.js' // 国际化 import { useI18n } from 'vue-i18n' @@ -575,7 +575,7 @@ const getlist = async () => { receivedMarket: MarketNameForId(receivedMarket), cashRoleId: cashRoleId, paymentCurrency: payCurrencySelect, - submitterMarket: adminData.value.markets, + submitterMarket: normalizeSubmitterMarket(adminData.value.markets), goodsName: goodsName, market: MarketNameForId(searchData.value.market) } @@ -1474,4 +1474,4 @@ onMounted(async () => { display: flex; justify-content: flex-end; } - \ No newline at end of file + diff --git a/src/views/moneyManage/receiveDetail/utils/staticData.js b/src/views/moneyManage/receiveDetail/utils/staticData.js index f022fa3..ea04dcd 100644 --- a/src/views/moneyManage/receiveDetail/utils/staticData.js +++ b/src/views/moneyManage/receiveDetail/utils/staticData.js @@ -213,6 +213,16 @@ 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' || name == 'HQ') { + return '总部' + } else { + return name + } +} + +export const normalizeSubmitterMarket = (name) => { + if (name == t('common.markets.headquarters') || name == '总部' || name == 'Headquarters' || name == 'HQ') { + return '总部' } else { return name }