diff --git a/src/api/mes/dvrepair/index.ts b/src/api/mes/dvrepair/index.ts index 63942c09..534b4b23 100644 --- a/src/api/mes/dvrepair/index.ts +++ b/src/api/mes/dvrepair/index.ts @@ -25,6 +25,7 @@ export interface DvRepairVO { replacementParts?: string // 更换配件 repairContent?: string // 维修内容 repairedImages?: string // 维修后图片,逗号分隔 + repairReporter?: string // 报修人员 acceptedBy: string // 维修人员 confirmBy: string // 验收人员 faultLevel?: string // 故障等级 diff --git a/src/locales/en.ts b/src/locales/en.ts index 81b7d0c5..a4c33878 100644 --- a/src/locales/en.ts +++ b/src/locales/en.ts @@ -2236,6 +2236,7 @@ export default { machineryTypeId: 'Device Type', device: 'Device', component: 'Key Component', + repairReporter: 'Repair Reporter', acceptedBy: 'Repairer', confirmBy: 'Inspector', faultLevel: 'Failure Level', @@ -2284,6 +2285,7 @@ export default { placeholderRepairCode: 'Please input repair order no', placeholderRepairName: 'Please input repair order name', placeholderMachineryName: 'Please input device name', + placeholderRepairReporter: 'Please select repair reporter', placeholderAcceptedBy: 'Please input repairer', placeholderConfirmBy: 'Please input inspector', placeholderStatus: 'Please select order status', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 54c42029..8443876a 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -2229,6 +2229,7 @@ export default { machineryTypeId: '设备类型', device: '设备', component: '关键件', + repairReporter: '报修人员', acceptedBy: '维修人员', confirmBy: '验收人员', faultLevel: '故障等级', @@ -2277,6 +2278,7 @@ export default { placeholderRepairCode: '请输入维修单编号', placeholderRepairName: '请输入维修单名称', placeholderMachineryName: '请输入设备名称', + placeholderRepairReporter: '请选择报修人员', placeholderAcceptedBy: '请输入维修人员', placeholderConfirmBy: '请输入验收人员', placeholderStatus: '请选择单据状态', diff --git a/src/views/mes/dvrepair/DvRepairForm.vue b/src/views/mes/dvrepair/DvRepairForm.vue index 240b2b4f..632d85f7 100644 --- a/src/views/mes/dvrepair/DvRepairForm.vue +++ b/src/views/mes/dvrepair/DvRepairForm.vue @@ -57,6 +57,20 @@ + + + + + + + { const { t } = useI18n() const message = useMessage() +const userStore = useUserStore() const createDefaultFormData = (): DvRepairFormData => ({ id: undefined, @@ -436,6 +452,7 @@ const createDefaultFormData = (): DvRepairFormData => ({ replacementParts: undefined, repairContent: undefined, repairedImages: '', + repairReporter: undefined, acceptedBy: undefined, confirmBy: undefined, faultLevel: undefined, @@ -855,6 +872,7 @@ const open = async (type: string, id?: number) => { repairedImages: normalizeImageString(detail?.repairedImages), acceptedBy: normalizeUserId(detail?.acceptedBy), confirmBy: normalizeUserId(detail?.confirmBy), + repairReporter: normalizeUserId(detail?.repairReporter), faultLevel: detail?.faultLevel === undefined || detail?.faultLevel === null ? undefined : String(detail?.faultLevel) } @@ -889,6 +907,17 @@ const open = async (type: string, id?: number) => { formLoading.value = false } } else { + if (formType.value === 'create') { + if (!userStore.getIsSetUser) { + try { + await userStore.setUserInfoAction() + } catch (e) {} + } + const currentUserId = userStore.getUser?.id + if (currentUserId !== undefined && currentUserId !== null && Number(currentUserId) > 0) { + formData.value.repairReporter = String(currentUserId) + } + } await nextTick() formRef.value?.clearValidate?.() } @@ -921,6 +950,7 @@ const submitForm = async () => { const data = { ...(formData.value as DvRepairFormData) } as DvRepairFormData & Record data.acceptedBy = normalizeUserId(data.acceptedBy) data.confirmBy = normalizeUserId(data.confirmBy) + data.repairReporter = normalizeUserId(data.repairReporter) data.faultLevel = data.faultLevel === undefined || data.faultLevel === null || String(data.faultLevel).trim() === '' ? undefined : String(data.faultLevel) data.faultImages = normalizeImageString(data.faultImages) data.repairedImages = normalizeImageString(data.repairedImages) diff --git a/src/views/mes/dvrepair/index.vue b/src/views/mes/dvrepair/index.vue index cc777977..ca8f25c3 100644 --- a/src/views/mes/dvrepair/index.vue +++ b/src/views/mes/dvrepair/index.vue @@ -174,6 +174,7 @@ prop="confirmDate" :formatter="dateFormatter2" width="110px" sortable /> +