diff --git a/src/locales/en.ts b/src/locales/en.ts
index 6211aad3..8207a9a1 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1827,6 +1827,8 @@ export default {
addButtonText: 'Add',
exportButtonText: 'Export',
expandButtonText: 'Expand/Collapse',
+ collapseText: 'Collapse',
+ expandText: 'Expand',
tableCodeColumn: 'Organization Code',
tableNameColumn: 'Organization Name',
tableSortColumn: 'Display Order',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 58df282a..4f779395 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2656,6 +2656,8 @@ export default {
addButtonText: '新增',
exportButtonText: '导出',
expandButtonText: '展开/折叠',
+ collapseText: '收起',
+ expandText: '展开',
tableCodeColumn: '组织编码',
tableNameColumn: '组织名称',
tableSortColumn: '显示顺序',
diff --git a/src/views/erp/autocode/AutocodeIndex.vue b/src/views/erp/autocode/AutocodeIndex.vue
index 671fc2f1..b90f8ed7 100644
--- a/src/views/erp/autocode/AutocodeIndex.vue
+++ b/src/views/erp/autocode/AutocodeIndex.vue
@@ -1,91 +1,56 @@
-
+
-
+
-
+
-
+
-
+
-
-
-
+
+
+
-
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}
- {{ t('FactoryModeling.AutocodeRule.searchButtonText') }}
- {{ t('FactoryModeling.AutocodeRule.resetButtonText') }}
-
+
+ {{ t('FactoryModeling.AutocodeRule.searchButtonText') }}
+
+
+ {{ t('FactoryModeling.AutocodeRule.resetButtonText') }}
+
+
{{ t('FactoryModeling.AutocodeRule.addButtonText') }}
-
+
{{ t('FactoryModeling.AutocodeRule.exportButtonText') }}
@@ -106,22 +71,27 @@
-
-
+
+
{{ getBarcodeTypeLabel(scope.row.barcodeType) }}
-
+
-
-
+
+
@@ -133,42 +103,26 @@
-
+
-
+
{{ t('FactoryModeling.AutocodeRule.tableEditAction') }}
-
+
{{ t('FactoryModeling.AutocodeRule.tableDeleteAction') }}
-
+
{{ t('FactoryModeling.AutocodeRule.tableTestCodeAction') }}
-
+
@@ -263,17 +217,17 @@ const handleDelete = async (id: number) => {
message.success(t('common.delSuccess'))
// 刷新列表
await getList()
- } catch {}
+ } catch { }
}
/** 测试编码按钮操作 */
const handleTestCode = async (ruleCode: string) => {
try {
-
+
// 发起测试
const data = await AutocodeRuleApi.getTestCode(ruleCode)
message.success(data)
-
- } catch {}
+
+ } catch { }
}
/** 导出按钮操作 */
diff --git a/src/views/mes/bom/index.vue b/src/views/mes/bom/index.vue
index 6d1d8d06..e09a0102 100644
--- a/src/views/mes/bom/index.vue
+++ b/src/views/mes/bom/index.vue
@@ -54,10 +54,10 @@
-
-
+
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') : t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/capacityReport/index.vue b/src/views/mes/capacityReport/index.vue
index 26e8de5f..4f42f55b 100644
--- a/src/views/mes/capacityReport/index.vue
+++ b/src/views/mes/capacityReport/index.vue
@@ -46,9 +46,10 @@
-
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue
index b433e728..a386c518 100644
--- a/src/views/mes/feedingrecord/index.vue
+++ b/src/views/mes/feedingrecord/index.vue
@@ -60,9 +60,10 @@
-
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/organization/index.vue b/src/views/mes/organization/index.vue
index 0fd42f0c..ad633553 100644
--- a/src/views/mes/organization/index.vue
+++ b/src/views/mes/organization/index.vue
@@ -71,9 +71,9 @@
-
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') : t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/plan/index.vue b/src/views/mes/plan/index.vue
index 1036d8ea..31cc1d24 100644
--- a/src/views/mes/plan/index.vue
+++ b/src/views/mes/plan/index.vue
@@ -35,10 +35,11 @@
:default-time="[new Date('1 00:00:00'), new Date('1 23:59:59')]" class="!w-240px" />
-
-
+
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/productionReport/index.vue b/src/views/mes/productionReport/index.vue
index eb99f6a9..bd1c4016 100644
--- a/src/views/mes/productionReport/index.vue
+++ b/src/views/mes/productionReport/index.vue
@@ -63,10 +63,11 @@
/>
-
-
+
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/task/index.vue b/src/views/mes/task/index.vue
index ebcf579d..9a2881be 100644
--- a/src/views/mes/task/index.vue
+++ b/src/views/mes/task/index.vue
@@ -65,9 +65,10 @@
-
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}
diff --git a/src/views/mes/tasksummary/index.vue b/src/views/mes/tasksummary/index.vue
index 382bb5e3..9771982d 100644
--- a/src/views/mes/tasksummary/index.vue
+++ b/src/views/mes/tasksummary/index.vue
@@ -37,9 +37,10 @@ v-model="queryParams.createTime" @change="handleQuery" value-format="YYYY-MM-DD
-
+
- {{ showAllFilters ? '收起' : '更多' }}
+ {{ showAllFilters ? t('FactoryModeling.FactoryStructure.collapseText') :
+ t('FactoryModeling.FactoryStructure.expandText') }}