diff --git a/src/api/wms/deliverRecordMain/index.ts b/src/api/wms/deliverRecordMain/index.ts index 155d1f193..0a59935f4 100644 --- a/src/api/wms/deliverRecordMain/index.ts +++ b/src/api/wms/deliverRecordMain/index.ts @@ -92,4 +92,12 @@ export const importDirectSupplyTemplate = () => { return request.download({ url: '/wms/deliver-record-main/get-direct-supply-import-template' }) } +//纳入受领书导入成功,入库 +export const inducedProductBatchUpdate = (data) => { + return request.post({ url: '/wms/leadership-incorporation-doc-request/induced-product-batch-update',data }) +} + + + + diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index 956748d1d..44fe0bd04 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -47,23 +47,24 @@ -
-
+
+
纳入受领书数量与顺引发货记录数量不一致,无法导入。以下是差异数据。
- - +
+
+
@@ -175,6 +176,11 @@ const props = defineProps({ required: false, default: true }, + // 成功入库接口 + confirmFormSuccess: { + type: Function, + required: false, + }, }) // 确保 tableObject 是响应式的 @@ -206,10 +212,26 @@ const formRef = ref() /** 提交表单 */ const submitForm = async () => { - // 如果当前在确认数据步骤,直接进入下一步 + // 如果当前在确认数据步骤,调用确认函数 if (active.value === 1) { - active.value = 2 - return + if (props.confirmFormSuccess) { + const result = await props.confirmFormSuccess(props.tableObject.tableList, + (msg)=>{ + if(msg){ + message.error(msg) + return + }else{ + message.success(msg) + active.value = 2 // 设置为第三步 + return + } + } + ) + } + } + if(active.value === 2){ + dialogVisible.value = false + return; } const elForm = unref(formRef)?.getElFormRef() @@ -441,4 +463,37 @@ const importTemplate = () => { align-items: center; margin-top: 8px; } +.step-two-container { + display: flex; + flex-direction: column; + height: 400px; // 根据实际需求调整 + + .warning-message { + margin-bottom: 10px; + color: #E44033; + display: flex; + align-items: center; + } + + .table-container { + flex: 1; + overflow: hidden; + display: flex; + flex-direction: column; + + :deep(.el-table) { + flex: 1; + overflow: hidden; + + .el-table__body-wrapper { + overflow-y: auto; + } + } + + :deep(.el-pagination) { + margin-top: 10px; + padding: 5px 0; + } + } +} \ No newline at end of file diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue index 2021a83d9..434685ead 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/index.vue @@ -71,6 +71,7 @@ @success="importSuccess" accept=".txt" :isShowDownloadBtn="false" + :confirmFormSuccess="confirmFormSuccess" />