diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index 85b325071..6b187c0f0 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -89,7 +89,7 @@ {{ t('ts.下一步') }} - {{ t('ts.好的') }} + {{ t('ts.取 消') }} @@ -312,6 +312,7 @@ const isShowLoading = ref(false) /** 提交表单 */ const submitForm = async () => { + debugger // 如果当前在确认数据步骤,调用确认函数 if (active.value === 1) { isShowLoading.value = true @@ -321,7 +322,24 @@ const submitForm = async () => { isShowLoading.value = false }else{ if (props.confirmFormSuccess) { - await props.confirmFormSuccess(props.tableObject.tableList, + const pars= props.tableObject.tableList.map(obj => { + return { + id: obj.id || null , + type: formRef.value.formModel.productionLineCode, + orderNumber: formRef.value.formModel.customerOrderNumber, + materialCode: obj.materialCode, + backNumber: obj.backNumber, + quantity: obj.incorporationQuantity, + materialDesc: obj.materialDesc, + startDate: formRef.value.formModelstartDate, + startNo: formRef.value.formModel.startNo, + endDate: formRef.value.formModel.endDate, + endNo: formRef.value.formModel.endNo, + customerCode: formRef.value.formModel.customerCode, + notIncludedList: [], + } + }) + await props.confirmFormSuccess(pars, (msg)=>{ if(msg){ message.error(msg) diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 67810e69c..de979f060 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -490,7 +490,8 @@ const searchFormClick = (searchData) => { const confirmFormSuccess = (dataList,callback) => { - DeliverRecordMainApi.inducedProductBatchUpdate(dataList).then(res=>{ + MaintenanceBillDateApi.inducedProductBatchUpdate(dataList).then(res => { + console.log(res) if (res && res.code == 200) { getList() }