diff --git a/src/api/erp/autocode/index.ts b/src/api/erp/autocode/index.ts
index 6eaacff1..60c12a7e 100644
--- a/src/api/erp/autocode/index.ts
+++ b/src/api/erp/autocode/index.ts
@@ -53,6 +53,7 @@ export interface AutocodeRuleVO {
   ruleCode: string // 规则编码
   ruleName: string // 规则名称
   barcodeType?: number | string
+  barCodeType?: number | string
   ruleDesc: string // 描述
   maxLength: number // 最大长度
   isPadded: string // 是否补齐
diff --git a/src/locales/en.ts b/src/locales/en.ts
index bf042f4c..2edee44e 100644
--- a/src/locales/en.ts
+++ b/src/locales/en.ts
@@ -1904,6 +1904,9 @@ export default {
       dialogRuleCodePlaceholder: 'Please enter rule code',
       dialogRuleNameLabel: 'Rule Name',
       dialogRuleNamePlaceholder: 'Please enter rule name',
+      dialogBarcodeTypeLabel: 'Code Type',
+      barcodeTypeBarcodeLabel: 'Barcode',
+      barcodeTypeQrcodeLabel: 'QR Code',
       dialogRuleDescLabel: 'Description',
       dialogRuleDescPlaceholder: 'Please enter description',
       dialogMaxLengthLabel: 'Max Length',
diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts
index e4beaf26..6f66ec17 100644
--- a/src/locales/zh-CN.ts
+++ b/src/locales/zh-CN.ts
@@ -2709,6 +2709,9 @@ export default {
       dialogRuleCodePlaceholder: '请输入规则编码',
       dialogRuleNameLabel: '规则名称',
       dialogRuleNamePlaceholder: '请输入规则名称',
+      dialogBarcodeTypeLabel: '码类型',
+      barcodeTypeBarcodeLabel: '条形码',
+      barcodeTypeQrcodeLabel: '二维码',
       dialogRuleDescLabel: '描述',
       dialogRuleDescPlaceholder: '请输入描述',
       dialogMaxLengthLabel: '最大长度',
diff --git a/src/views/erp/autocode/AutocodeIndex.vue b/src/views/erp/autocode/AutocodeIndex.vue
index dafc70ac..d3e06ba6 100644
--- a/src/views/erp/autocode/AutocodeIndex.vue
+++ b/src/views/erp/autocode/AutocodeIndex.vue
@@ -203,7 +203,7 @@ const exportLoading = ref(false) // 导出的加载中
 
 const getBarcodeTypeLabel = (value: any) => {
   const str = value === undefined || value === null ? '' : String(value)
-  if (str === '1') return '条码'
+  if (str === '1') return '条形码'
   if (str === '2') return '二维码'
   return '-'
 }
diff --git a/src/views/erp/autocode/AutocodeRuleForm.vue b/src/views/erp/autocode/AutocodeRuleForm.vue
index c0aa5106..ca14a976 100644
--- a/src/views/erp/autocode/AutocodeRuleForm.vue
+++ b/src/views/erp/autocode/AutocodeRuleForm.vue
@@ -20,6 +20,12 @@
           :placeholder="t('FactoryModeling.AutocodeRule.dialogRuleNamePlaceholder')"
         />
       </el-form-item>
+      <el-form-item :label="t('FactoryModeling.AutocodeRule.dialogBarcodeTypeLabel')" prop="barcodeType">
+        <el-radio-group v-model="formData.barcodeType">
+          <el-radio :label="1">{{ t('FactoryModeling.AutocodeRule.barcodeTypeBarcodeLabel') }}</el-radio>
+          <el-radio :label="2">{{ t('FactoryModeling.AutocodeRule.barcodeTypeQrcodeLabel') }}</el-radio>
+        </el-radio-group>
+      </el-form-item>
       <el-form-item :label="t('FactoryModeling.AutocodeRule.dialogRuleDescLabel')" prop="ruleDesc">
         <el-input
           v-model="formData.ruleDesc"
@@ -110,6 +116,7 @@ const formData = ref({
   id: undefined,
   ruleCode: undefined,
   ruleName: undefined,
+  barcodeType: 1,
   ruleDesc: undefined,
   maxLength: undefined,
   isPadded: undefined,
@@ -139,7 +146,12 @@ const open = async (type: string, id?: number) => {
   if (id) {
     formLoading.value = true
     try {
-      formData.value = await AutocodeRuleApi.getAutocodeRule(id)
+      const data = await AutocodeRuleApi.getAutocodeRule(id)
+      const barcodeType = Number(data?.barcodeType ?? data?.barCodeType) === 2 ? 2 : 1
+      formData.value = {
+        ...data,
+        barcodeType
+      }
     } finally {
       formLoading.value = false
     }
@@ -162,7 +174,12 @@ const submitForm = async () => {
   // 提交请求
   formLoading.value = true
   try {
-    const data = formData.value as unknown as AutocodeRuleVO
+    const barcodeType = Number(formData.value.barcodeType) === 2 ? 2 : 1
+    const data = {
+      ...formData.value,
+      barcodeType,
+      barCodeType: barcodeType
+    } as unknown as AutocodeRuleVO
     // 拼接子表的数据
     data.autocodeParts = autocodePartFormRef.value.getData()
     if (formType.value === 'create') {
@@ -186,6 +203,7 @@ const resetForm = () => {
     id: undefined,
     ruleCode: undefined,
     ruleName: undefined,
+    barcodeType: 1,
     ruleDesc: undefined,
     maxLength: undefined,
     isPadded: undefined,