diff --git a/src/components/DictTag/src/DictTag.vue b/src/components/DictTag/src/DictTag.vue index 6414eaab..7f3b0213 100644 --- a/src/components/DictTag/src/DictTag.vue +++ b/src/components/DictTag/src/DictTag.vue @@ -4,7 +4,8 @@ import { isHexColor } from '@/utils/color' import { ElTag } from 'element-plus' import { DictDataType, getDictOptions } from '@/utils/dict' import { isArray, isBoolean, isNumber, isString } from '@/utils/is' - +import {useLocaleStoreWithOut} from "@/store/modules/locale"; +const localeStore = useLocaleStoreWithOut() export default defineComponent({ name: 'DictTag', props: { @@ -68,6 +69,7 @@ export default defineComponent({ if (dict.colorType + '' === 'primary' || dict.colorType + '' === 'default') { dict.colorType = '' } + const label = localeStore.getCurrentLocale?.lang === 'en' ? (dict.labelEn || dict.label) : dict.label return ( // 添加标签的文字颜色为白色,解决自定义背景颜色时标签文字看不清的问题 - {dict?.label} + {label} ) } diff --git a/src/views/erp/component/product/index.vue b/src/views/erp/component/product/index.vue index 2331fb01..24c6ee75 100644 --- a/src/views/erp/component/product/index.vue +++ b/src/views/erp/component/product/index.vue @@ -55,7 +55,7 @@ - + diff --git a/src/views/erp/moldlist/index.vue b/src/views/erp/moldlist/index.vue index e15b8a17..49b265bc 100644 --- a/src/views/erp/moldlist/index.vue +++ b/src/views/erp/moldlist/index.vue @@ -54,7 +54,7 @@ type="success" plain @click="handleExport" :loading="exportLoading" - + diff --git a/src/views/mes/dvrepair/index.vue b/src/views/mes/dvrepair/index.vue index d0133fca..7c9a1dc3 100644 --- a/src/views/mes/dvrepair/index.vue +++ b/src/views/mes/dvrepair/index.vue @@ -111,11 +111,11 @@ :show-overflow-tooltip="true" row-key="id" @selection-change="handleSelectionChange"> - - + + - - + + @@ -141,9 +141,9 @@ prop="confirmDate" :formatter="dateFormatter2" width="110px" sortable /> - - - + + + - + - + - + diff --git a/src/views/mold/taskConfiguration/index.vue b/src/views/mold/taskConfiguration/index.vue index 07624bc4..00a2df8d 100644 --- a/src/views/mold/taskConfiguration/index.vue +++ b/src/views/mold/taskConfiguration/index.vue @@ -69,7 +69,7 @@ > - +