diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue index 46fa01fc7..5d8cd7971 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/demandforecastingMain/index.vue @@ -39,29 +39,28 @@ - - - + +
+
+
+ + +
+ @@ -94,7 +93,7 @@ const updataTableColumns = (val) => { orginTableColumns.value = val } - +const formLoadingPlan = ref(false) // 查询页面返回 const searchQueryTableSuccess = (formField, searchField, val, formRef, type, row ) => { @@ -292,17 +291,23 @@ const handlePreviewPlan = async ()=>{ const buttonBaseClickPlan = async (val)=>{ if (val == 'save') { // 保存 - dialogVisiblePlan.value = false - let rows: any = [] - selectionPlanRows.value.forEach((item) => { - rows = [...rows, ...item.selectionRows.map((item1) => item1.id)] - }) - console.log('预览要货计划', selectionPlanRows.value) - console.log('预览要货计划', rows.join(',')) - let res = await DemandforecastingDetailApi.generateOrderPlan(rows) - message.success(t('common.submitSuccess')) - buttonBaseClick('refresh', null) - console.log('保存',res) + formLoadingPlan.value =true + try { + let rows: any = [] + selectionPlanRows.value.forEach((item) => { + rows = [...rows, ...item.selectionRows.map((item1) => item1.id)] + }) + console.log('预览要货计划', selectionPlanRows.value) + console.log('预览要货计划', rows.join(',')) + let res = await DemandforecastingDetailApi.generateOrderPlan(rows) + message.success(t('common.submitSuccess')) + buttonBaseClick('refresh', null) + dialogVisiblePlan.value = false + console.log('保存',res) + } finally { + formLoadingPlan.value =false + } + } // 关闭 else if (val == 'close') { diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue index 262e565a1..c9a88b9c4 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/index.vue @@ -1201,7 +1201,7 @@ const labelPrint = async (row) => { // 获得表格的各种操作 const { getList: getListPrint } = tableMethods - getListPrint() + await getListPrint() tableObject.loading = false const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns tableColumns.forEach((item) => {