diff --git a/src/components/ImportForm/src/ImportFormStep.vue b/src/components/ImportForm/src/ImportFormStep.vue index 44fe0bd04..ecb8c13fd 100644 --- a/src/components/ImportForm/src/ImportFormStep.vue +++ b/src/components/ImportForm/src/ImportFormStep.vue @@ -48,9 +48,12 @@
-
+
纳入受领书数量与顺引发货记录数量不一致,无法导入。以下是差异数据。 +
+
+
{ dialogVisible.value = true + error.value = false resetForm() active.value = 0 // 重置步骤 // 重置表格数据 @@ -215,13 +220,15 @@ const submitForm = async () => { // 如果当前在确认数据步骤,调用确认函数 if (active.value === 1) { if (props.confirmFormSuccess) { - const result = await props.confirmFormSuccess(props.tableObject.tableList, + await props.confirmFormSuccess(props.tableObject.tableList, (msg)=>{ if(msg){ message.error(msg) + error.value = false return }else{ message.success(msg) + error.value = false active.value = 2 // 设置为第三步 return } @@ -231,6 +238,7 @@ const submitForm = async () => { } if(active.value === 2){ dialogVisible.value = false + error.value = false return; } @@ -319,18 +327,21 @@ const submitFormSuccess = (response: any) => { }); }) } else { - message.success('导入成功') + message.success('上传成功') + debugger if(response.data?.successData?.failList&&response.data?.successData?.failList.length>0) { console.log('设置差异数据:', response.data.successData.failList); console.log('使用的列定义:', props.errorTableColumns); props.tableObject.tableList = response.data.successData.failList; props.tableObject.total = response.data.successData.failList.length; + error.value = true; active.value = 1; } else { console.log('设置成功数据:', response.data.successData.successList); console.log('使用的列定义:', props.successTableColumns); props.tableObject.tableList = response.data.successData.successList; props.tableObject.total = response.data.successData.successList.length; + error.value = false; active.value = 1; } } diff --git a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts index 2c67e9075..c213c658e 100644 --- a/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts +++ b/src/views/wms/deliversettlementManage/inducedProduct/deliverRecordMain/deliverRecordMain.data.ts @@ -945,26 +945,25 @@ export const DeliverRecordImport = useCrudSchemas(reactive([ }, }, ])) + // 导入表单校验 export const DeliverRecordImportRules = reactive({ - incorporationNumber: [ - { required: true, message: '请输入纳入受领书单号', trigger: 'blur' } - ], - orderNumber: [ + customerOrderNumber: [ { required: true, message: '请输入订单号', trigger: 'blur' } ], - type: [ - { required: true, message: '请选择类型', trigger: 'change' } + startDate: [ + { required: true, message: '请选择开始日期', trigger: 'change' } ], - materialCode: [ - { required: true, message: '请输入物料代码', trigger: 'blur' } + endDate: [ + { required: true, message: '请选择结束日期', trigger: 'change' } ], - backNumber: [ - { required: true, message: '请输入背番', trigger: 'blur' } + startNo: [ + { required: true, message: '请输入开始序号', trigger: 'change' }, + { type: 'number', message: '开始序号必须为数字', trigger: 'blur' } ], - quantity: [ - { required: true, message: '请输入数量', trigger: 'change' }, - { type: 'number', message: '数量必须为数字', trigger: 'blur' } + endNo: [ + { required: true, message: '请输入结束序号', trigger: 'change' }, + { type: 'number', message: '结束序号必须为数字', trigger: 'blur' } ] })