fix: 补充

4 weeks ago · 5c595b7fb1
6 changed files with 39 additions and 30 deletions
--- a/src/views/activityManage/activity.vue
+++ b/src/views/activityManage/activity.vue
@ -81,11 +81,11 @@

    <el-dialog v-model="showAdd" width="20vw" draggable align-center style="background-color: rgb(243,250,254);">
        <div class="add-item">
-            <el-text size="large">{{ t('common_add.activity') }}</el-text>
+            <el-text size="large">{{ t('common_add.activity') }}：</el-text>
            <el-input v-model="addForm.activityName" style="width: 12vw" :placeholder="t('common_add.activityPlaceholder')" maxlength="200" clearable />
        </div>
        <div class="add-item">
-            <el-text size="large">{{ t('common_add.businessBelong') }}</el-text>
+            <el-text size="large">{{ t('common_add.businessBelong') }}：</el-text>
            <el-radio-group v-model="addForm.businessBelong" style="width: 12vw">
                <el-radio size="large" value="客户归属地">{{ t('common.customerBelong') }}</el-radio>
                <el-radio size="large" value="活动归属地">{{ t('common.activityBelong') }}</el-radio>
@ -97,12 +97,12 @@
                style="width: 12vw" />
        </div>
        <div class="add-item">
-            <el-text size="large">{{ t('common_add.startTime') }}</el-text>
+            <el-text size="large">{{ t('common_add.startTime') }}：</el-text>
            <el-date-picker v-model="addForm.startTime" type="datetime" :placeholder="t('common_add.startTime')"
                :default-time="defaultStartTime" style="width: 12vw" />
        </div>
        <div class="add-item">
-            <el-text size="large">{{ t('common_add.endTime') }}</el-text>
+            <el-text size="large">{{ t('common_add.endTime') }}：</el-text>
            <el-date-picker v-model="addForm.endTime" type="datetime" :placeholder="t('common_add.endTime')"
                :default-time="defaultEndTime" style="width: 12vw" />
        </div>
@ -119,24 +119,24 @@
        </div>

        <div class="edit-item">
-            <el-text size="large">{{ t('common_add.businessBelong') }}</el-text>
+            <el-text size="large">{{ t('common_add.businessBelong') }}：</el-text>
            <el-radio-group v-model="editForm.businessBelong" style="width: 12vw">
                <el-radio size="large" value="客户归属地">{{ t('common.customerBelong') }}</el-radio>
                <el-radio size="large" value="活动归属地">{{ t('common.activityBelong') }}</el-radio>
            </el-radio-group>
        </div>
        <div class="edit-item" v-show="editForm.businessBelong === '活动归属地'">
-            <el-text size="large">{{ t('common_add.market') }}</el-text>
+            <el-text size="large">{{ t('common_add.market') }}：</el-text>
            <el-cascader v-model="editForm.area" :options="marketOptions" :placeholder="t('common_add.marketPlaceholder')" clearable
                style="width: 12vw" />
        </div>
        <div class="edit-item">
-            <el-text size="large">{{ t('common_add.startTime') }}</el-text>
+            <el-text size="large">{{ t('common_add.startTime') }}：</el-text>
            <el-date-picker v-model="editForm.startTime" type="datetime" :placeholder="t('common_add.startTime')"
                :default-time="defaultStartTime" style="width: 12vw" />
        </div>
        <div class="edit-item">
-            <el-text size="large">{{ t('common_add.endTime') }}</el-text>
+            <el-text size="large">{{ t('common_add.endTime') }}：</el-text>
            <el-date-picker v-model="editForm.endTime" type="datetime" :placeholder="t('common_add.endTime')"
                :default-time="defaultEndTime" style="width: 12vw" />
        </div>
@ -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;
    }
--- 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
--- 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
--- 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
--- 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)
                }
--- 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
  }