From 887495f8b2baa5f795181e8b9696e84bc342df26 Mon Sep 17 00:00:00 2001
From: hwj <huangweijie@gdngsk.com>
Date: Thu, 26 Mar 2026 11:39:53 +0800
Subject: [PATCH] =?UTF-8?q?style=EF=BC=9A=E7=BC=96=E7=A0=81=E8=A7=84?=
 =?UTF-8?q?=E5=88=99=E6=B7=BB=E5=8A=A0=E7=A0=81=E7=B1=BB=E5=9E=8B=E5=88=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/erp/autocode/index.ts            |  3 ++-
 src/locales/en.ts                        |  1 +
 src/locales/zh-CN.ts                     |  1 +
 src/views/erp/autocode/AutocodeIndex.vue | 12 ++++++++++++
 4 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/api/erp/autocode/index.ts b/src/api/erp/autocode/index.ts
index be66689f..6eaacff1 100644
--- a/src/api/erp/autocode/index.ts
+++ b/src/api/erp/autocode/index.ts
@@ -52,6 +52,7 @@ export interface AutocodeRuleVO {
   id: number // ID
   ruleCode: string // 规则编码
   ruleName: string // 规则名称
+  barcodeType?: number | string
   ruleDesc: string // 描述
   maxLength: number // 最大长度
   isPadded: string // 是否补齐
@@ -102,4 +103,4 @@ getTestCode: async (ruleCode: string) => {
   getAutocodePartListByRuleId: async (ruleId) => {
     return await request.get({ url: `/erp/autocode-rule/autocode-part/list-by-rule-id?ruleId=` + ruleId })
   }
-}
\ No newline at end of file
+}
diff --git a/src/locales/en.ts b/src/locales/en.ts
index af7f1607..bf042f4c 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1886,6 +1886,7 @@ export default {
       exportButtonText: 'Export',
       tableRuleCodeColumn: 'Rule Code',
       tableRuleNameColumn: 'Rule Name',
+      tableBarcodeTypeColumn: 'Code Type',
       tableRuleDescColumn: 'Description',
       tableMaxLengthColumn: 'Max Length',
       tableIsPaddedColumn: 'Pad',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index 8e0409cc..e4beaf26 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2691,6 +2691,7 @@ export default {
       exportButtonText: '导出',
       tableRuleCodeColumn: '规则编码',
       tableRuleNameColumn: '规则名称',
+      tableBarcodeTypeColumn: '码类型',
       tableRuleDescColumn: '描述',
       tableMaxLengthColumn: '最大长度',
       tableIsPaddedColumn: '是否补齐',
diff --git a/src/views/erp/autocode/AutocodeIndex.vue b/src/views/erp/autocode/AutocodeIndex.vue
index 153ce78c..dafc70ac 100644
--- a/src/views/erp/autocode/AutocodeIndex.vue
+++ b/src/views/erp/autocode/AutocodeIndex.vue
@@ -100,6 +100,11 @@
       <!-- <el-table-column label="ID" align="center" prop="id" /> -->
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleCodeColumn')" align="center" prop="ruleCode" sortable/>
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleNameColumn')" align="center" prop="ruleName" sortable/>
+      <el-table-column :label="t('FactoryModeling.AutocodeRule.tableBarcodeTypeColumn')" align="center">
+        <template #default="scope">
+          <el-tag type="primary">{{ getBarcodeTypeLabel(scope.row.barcodeType) }}</el-tag>
+        </template>
+      </el-table-column>
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableRuleDescColumn')" align="center" prop="ruleDesc" />
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableMaxLengthColumn')" align="center" prop="maxLength" />
       <el-table-column :label="t('FactoryModeling.AutocodeRule.tableIsPaddedColumn')" align="center" prop="isPadded">
@@ -196,6 +201,13 @@ const queryParams = reactive({
 const queryFormRef = ref() // 搜索的表单
 const exportLoading = ref(false) // 导出的加载中
 
+const getBarcodeTypeLabel = (value: any) => {
+  const str = value === undefined || value === null ? '' : String(value)
+  if (str === '1') return '条码'
+  if (str === '2') return '二维码'
+  return '-'
+}
+
 /** 查询列表 */
 const getList = async () => {
   loading.value = true