diff --git a/src/api/mes/itemrequisition/index.ts b/src/api/mes/itemrequisition/index.ts index 9f45274a..7206cfcf 100644 --- a/src/api/mes/itemrequisition/index.ts +++ b/src/api/mes/itemrequisition/index.ts @@ -7,6 +7,7 @@ export interface ItemRequisitionVO { requisitionDate: Date // 下料时间 deliveryDate: Date // 创建时间 status: number // 状态 + feedingPipeline: string, processInstanceId: string // 流程实例的编号 planId: number // 计划ID remark: string // 备注 @@ -51,4 +52,4 @@ export const ItemRequisitionApi = { getItemRequisitionDetailListByItemRequisitionId: async (itemRequisitionId) => { return await request.get({ url: `/mes/item-requisition/item-requisition-detail/list-by-item-requisition-id?itemRequisitionId=` + itemRequisitionId }) } -} \ No newline at end of file +} diff --git a/src/views/mes/feedingrecord/FeedingRecordForm.vue b/src/views/mes/feedingrecord/FeedingRecordForm.vue index 4404d552..9294cb81 100644 --- a/src/views/mes/feedingrecord/FeedingRecordForm.vue +++ b/src/views/mes/feedingrecord/FeedingRecordForm.vue @@ -125,19 +125,23 @@ const emit = defineEmits(['success']) // 定义 success 事件,用于操作成 const submitForm = async () => { // 校验表单 await formRef.value.validate() - // 校验子表单 - try { - await feedingRecordDetailFormRef.value.validate() - } catch (e) { - subTabsName.value = 'feedingRecordDetail' - return + if(formData.value.feedingType == 'org'){ + // 校验子表单 + try { + await feedingRecordDetailFormRef.value.validate() + } catch (e) { + subTabsName.value = 'feedingRecordDetail' + return + } } // 提交请求 formLoading.value = true try { const data = formData.value as unknown as FeedingRecordVO // 拼接子表的数据 - data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData() + if(formData.value.feedingType == 'org'){ + data.feedingRecordDetails = feedingRecordDetailFormRef.value.getData() + } if (formType.value === 'create') { await FeedingRecordApi.createFeedingRecord(data) message.success(t('common.createSuccess')) diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue index 27b80af9..21b21240 100644 --- a/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue +++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailForm.vue @@ -47,10 +47,10 @@ - + diff --git a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue index 1099d1b3..d4d8ab8f 100644 --- a/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue +++ b/src/views/mes/feedingrecord/components/FeedingRecordDetailList.vue @@ -4,7 +4,7 @@ - + diff --git a/src/views/mes/feedingrecord/index.vue b/src/views/mes/feedingrecord/index.vue index 2608d7b4..c3e58cab 100644 --- a/src/views/mes/feedingrecord/index.vue +++ b/src/views/mes/feedingrecord/index.vue @@ -156,7 +156,7 @@ - +