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 @@
+
+
+ {{ getBarcodeTypeLabel(scope.row.barcodeType) }}
+
+
@@ -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