diff --git a/src/views/mes/dv/subject/SubjectForm.vue b/src/views/mes/dv/subject/SubjectForm.vue index 30c547694..bcf94f04e 100644 --- a/src/views/mes/dv/subject/SubjectForm.vue +++ b/src/views/mes/dv/subject/SubjectForm.vue @@ -72,7 +72,8 @@ import { getIntDictOptions, DICT_TYPE } from '@/utils/dict' import { DvSubjectApi, DvSubjectVO } from '@/api/mes/dv/subject' import { CommonStatusEnum } from '@/utils/constants' -import { generateRandomStr } from '@/utils' +import { MesAutoCodeRuleCode } from '@/views/mes/utils/constants' +import { AutoCodeRecordApi } from '@/api/mes/md/autocode/record' defineOptions({ name: 'SubjectForm' }) @@ -102,8 +103,10 @@ const formRules = reactive({ const formRef = ref() // 表单 Ref /** 生成项目编码 */ -const generateCode = () => { - formData.value.code = 'SUBJECT' + generateRandomStr(8) +const generateCode = async () => { + formData.value.code = await AutoCodeRecordApi.generateAutoCode( + MesAutoCodeRuleCode.DV_SUBJECT_CODE + ) } /** 打开弹窗 */ diff --git a/src/views/mes/utils/constants.ts b/src/views/mes/utils/constants.ts index b0130cbfd..0f9999817 100644 --- a/src/views/mes/utils/constants.ts +++ b/src/views/mes/utils/constants.ts @@ -449,7 +449,8 @@ export const MesAutoCodeRuleCode = { CAL_PLAN_CODE: 'CAL_PLAN_CODE', // 排班计划编码 DV_MACHINERY_CODE: 'DV_MACHINERY_CODE', // 设备编码 DV_MACHINERY_TYPE_CODE: 'DV_MACHINERY_TYPE_CODE', // 设备类型编码 - DV_CHECK_PLAN_CODE: 'DV_CHECK_PLAN_CODE' // 点检保养方案编码 + DV_CHECK_PLAN_CODE: 'DV_CHECK_PLAN_CODE', // 点检保养方案编码 + DV_SUBJECT_CODE: 'DV_SUBJECT_CODE' // 点检保养项目编码 } as const /** 获取物料/产品标识的标签 */