From d123ba8dcf228fe0b86782c5c4c59ae0f7f8ae5f Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Tue, 30 Jul 2024 19:40:12 +0800 Subject: [PATCH] loading --- .../count/countRequestMain/index.vue | 1 + .../countadjustRequestMain/index.vue | 1 + .../wms/inventoryManage/package/index.vue | 20 ++++++++++++------- .../containerMainRequest/index.vue | 1 + .../initialContainerMainRequest/index.vue | 1 + .../scrapContainerMainRequest/index.vue | 1 + .../inventoryinitRequestMain/index.vue | 1 + .../packageoverRequestMain/index.vue | 3 +-- .../scrap/scrapRequestMain/index.vue | 3 ++- .../index.vue | 3 ++- .../transferissueRequestMain/index.vue | 3 ++- .../transferreceiptRequestMain/index.vue | 1 + .../unplannedissueRequestMain/index.vue | 3 ++- .../unplannedreceiptRequestMain/index.vue | 3 ++- .../inventorychangeRequestMain/index.vue | 2 +- .../inventorymoveRequestMain/index.vue | 1 + 16 files changed, 33 insertions(+), 15 deletions(-) diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index 9f5f3efda..d912ae06b 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -518,6 +518,7 @@ const tableSelectionDelete = (selection) => { // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + formRef.value.formLoading = true try { if (formType === 'create') { await CountRequestMainApi.createCountRequestMain(data) diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index 68430d969..fb5ee8361 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -348,6 +348,7 @@ const tableSelectionDelete = (selection) => { // 主子数据 提交 const submitForm = async (formType, data) => { data.subList = tableData.value // 拼接子表数据参数 + formRef.value.formLoading = true try { if (formType === 'create') { await CountadjustRequestMainApi.createCountadjustRequestMain(data) diff --git a/src/views/wms/inventoryManage/package/index.vue b/src/views/wms/inventoryManage/package/index.vue index 387e54f14..db7d03d83 100644 --- a/src/views/wms/inventoryManage/package/index.vue +++ b/src/views/wms/inventoryManage/package/index.vue @@ -243,13 +243,19 @@ const BASE_URL = getJmreportBaseUrl() // form表单提交 const formsSuccess = async (formType,data) => { - if (formType === 'create') { - await PackageApi.createPackage(data) - message.success(t('common.createSuccess')) - } else { - await message.confirm('包装修改后需重新打印标签，是否继续保存？') - await PackageApi.updatePackage(data) - message.success(t('包装信息已修改，请重新打印标签')) + basicFormRef.value.formLoading = true + try { + if (formType === 'create') { + await PackageApi.createPackage(data) + message.success(t('common.createSuccess')) + } else { + await message.confirm('包装修改后需重新打印标签，是否继续保存？') + await PackageApi.updatePackage(data) + message.success(t('包装信息已修改，请重新打印标签')) + } + + } finally { + basicFormRef.value.formLoading = false } basicFormRef.value.dialogVisible = false getList() diff --git a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue index 56c7fe1f9..011b6b43d 100644 --- a/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/containerMainRequest/index.vue @@ -466,6 +466,7 @@ const submitForm = async (formType,submitData) => { return; } }) + basicFormRef.value.formLoading = true try { if (formType === 'create') { data.businessType = businessType.value diff --git a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue index 20028f7e2..4563f3671 100644 --- a/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/initialContainerMainRequest/index.vue @@ -419,6 +419,7 @@ const submitForm = async (formType,submitData) => { return; } }) + basicFormRef.value.formLoading = true try { if (formType === 'create') { data.businessType = businessType.value diff --git a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue index 2255710a7..34eb56e4c 100644 --- a/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue +++ b/src/views/wms/inventoryjobManage/containermanage/scrapContainerMainRequest/index.vue @@ -444,6 +444,7 @@ const submitForm = async (formType,submitData) => { return; } }) + basicFormRef.value.formLoading = true try { if (formType === 'create') { data.businessType = businessType.value diff --git a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue index c659954a2..e72e9c064 100644 --- a/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/inventoryinitial/inventoryinitRequestMain/index.vue @@ -442,6 +442,7 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 + formRef.value.formLoading = true try { if (formType === 'create') { await InventoryinitRequestMainApi.createInventoryinitRequestMain(data) diff --git a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue index 14e25e038..1ac4e1452 100644 --- a/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/packageManage/packageoverMain/packageoverRequestMain/index.vue @@ -402,14 +402,13 @@ const submitForm = async (formType, submitData) => { data.subList = tableData.value // 拼接子表数据参数 if(tableData.value.find(item => (item.toPackUnit == item.fromPackUnit))) { message.warning('从包装规格与到包装规格不能相同') - formRef.value.formLoading = false return } if(tableData.value.find(item => (item.qty <= 0))) { message.warning('数量必须大于0') - formRef.value.formLoading = false return } + formRef.value.formLoading = true try { if (formType === 'create') { await PackageoverRequestMainApi.createPackageoverRequestMain(data) diff --git a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue index 3503f9f1a..814dab997 100644 --- a/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/scrap/scrapRequestMain/index.vue @@ -449,12 +449,13 @@ const submitForm = async (formType, submitData) => { } }) if(flag){ - formRef.value.formLoading = false return } + formRef.value.formLoading = true await ScrapRequestMainApi.createScrapRequestMain(data) message.success(t('common.createSuccess')) } else { + formRef.value.formLoading = true await ScrapRequestMainApi.updateScrapRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue index 69d31a86d..040be1d7b 100644 --- a/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/sparepartsrequisition/sparepartsrequisitionRequestMain/index.vue @@ -456,14 +456,15 @@ const submitForm = async (formType, submitData) => { } }) if(flag){ - formRef.value.formLoading = false return } data.dataType='2' + formRef.value.formLoading = true await UnplannedissueRequestMainApi.createUnplannedissueRequestMain(data) message.success(t('common.createSuccess')) } else { data.dataType='2' + formRef.value.formLoading = true await UnplannedissueRequestMainApi.updateUnplannedissueRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue index 7648b471c..a9052abb3 100644 --- a/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferissue/transferissueRequestMain/index.vue @@ -447,12 +447,13 @@ const submitForm = async (formType, submitData) => { } }) if(flag){ - formRef.value.formLoading = false return } + formRef.value.formLoading = true await TransferissueRequestMainApi.createTransferissueRequestMain(data) message.success(t('common.createSuccess')) } else { + formRef.value.formLoading = true await TransferissueRequestMainApi.updateTransferissueRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue index 909159740..4cf20d1f1 100644 --- a/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/transferreceipt/transferreceiptRequestMain/index.vue @@ -394,6 +394,7 @@ const submitForm = async (formType, submitData) => { data.id = data.masterId } data.subList = tableData.value // 拼接子表数据参数 + formRef.value.formLoading = true try { if (formType === 'create') { await TransferreceiptRequestMainApi.createTransferreceiptRequestMain(data) diff --git a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue index ac6b09607..aa62f4d82 100644 --- a/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedissue/unplannedissueRequestMain/index.vue @@ -467,14 +467,15 @@ const submitForm = async (formType, submitData) => { } }) if(flag){ - formRef.value.formLoading = false return } data.dataType='1' + formRef.value.formLoading = true await UnplannedissueRequestMainApi.createUnplannedissueRequestMain(data) message.success(t('common.createSuccess')) } else { data.dataType='1' + formRef.value.formLoading = true await UnplannedissueRequestMainApi.updateUnplannedissueRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index 91d5fb334..a77e37b73 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -729,12 +729,13 @@ const submitForm = async (formType, submitData) => { } }) if(flag){ - formRef.value.formLoading = false return } + formRef.value.formLoading = true await UnplannedreceiptRequestMainApi.createUnplannedreceiptRequestMain(data) message.success(t('common.createSuccess')) } else { + formRef.value.formLoading = true await UnplannedreceiptRequestMainApi.updateUnplannedreceiptRequestMain(data) message.success(t('common.updateSuccess')) } diff --git a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue index b2eba54fc..3fd65259a 100644 --- a/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorychange/inventorychangeRequestMain/index.vue @@ -472,9 +472,9 @@ const submitForm = async (formType, submitData) => { } }) if(flag.value){ - formRef.value.formLoading = false return } + formRef.value.formLoading = true try { if (formType === 'create') { console.log(data) diff --git a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue index 42a7afe8b..68c9aa499 100644 --- a/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue +++ b/src/views/wms/moveManage/inventorymove/inventorymoveRequestMain/index.vue @@ -722,6 +722,7 @@ const submitForm = async (formType, submitData) => { formRef.value.formLoading = false return } + formRef.value.formLoading = true try { if (formType === 'create') { await InventorymoveRequestMainApi.createInventorymoveRequestMain(data)