From 203a140f912570899fe03af3daf8822d5bc2b3e1 Mon Sep 17 00:00:00 2001 From: wangyufei <2267742828@qq.com> Date: Fri, 2 Aug 2024 08:51:24 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=98=E7=82=B9=E5=8A=A0loading?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../countManage/count/countJobMain/index.vue | 28 ++++++++++++++----- .../countManage/count/countPlanMain/index.vue | 5 +++- .../count/countRequestMain/index.vue | 20 +++++++++++-- .../countadjustRequestMain/index.vue | 16 +++++++---- 4 files changed, 54 insertions(+), 15 deletions(-) diff --git a/src/views/wms/countManage/count/countJobMain/index.vue b/src/views/wms/countManage/count/countJobMain/index.vue index a20f145ae..4fa64e3cd 100644 --- a/src/views/wms/countManage/count/countJobMain/index.vue +++ b/src/views/wms/countManage/count/countJobMain/index.vue @@ -236,13 +236,23 @@ const buttonTableClick = async (val, row) => { console.log('列表-操作按钮事件-执行') } else if (val == 'mainJobAba') { // 放弃 console.log('列表-操作按钮事件-放弃') - await CountJobMainApi.abandonCountJobMain(row.id) - await getList() + tableObject.loading = true + try { + await CountJobMainApi.abandonCountJobMain(row.id) + await getList() + } finally { + tableObject.loading = false + } } else if (val == 'mainJobClo') { // 关闭 handleClose(row.id) } else if (val == 'mainJobAcc') { // 承接 - await CountJobMainApi.acceptCountJobMain(row.id) - await getList() + tableObject.loading = true + try { + await CountJobMainApi.acceptCountJobMain(row.id) + await getList() + } finally { + tableObject.loading = false + } console.log('列表-操作按钮事件-承接') } else if (val == 'exportCountJob'){// 当前任务导出 handleExportCountJob(row.id,row.number) @@ -258,19 +268,23 @@ const buttonTableClick = async (val, row) => { const handleClose = async (id: number) => { try { await message.confirm(t('common.confirmColse')) + tableObject.loading = true await CountJobMainApi.closeCountJobMain(id) message.success(t('common.closeSuccess')) await getList() - } catch {} + } finally { + tableObject.loading = false + } } // 完成 const handleDone = async (id: number) => { try { await message.confirm('确认完成吗？') + tableObject.loading = true await CountJobMainApi.doneCountJobMain(id) await getList() - } catch { - + } finally { + tableObject.loading = true } } diff --git a/src/views/wms/countManage/count/countPlanMain/index.vue b/src/views/wms/countManage/count/countPlanMain/index.vue index 195ea6553..252a39a52 100644 --- a/src/views/wms/countManage/count/countPlanMain/index.vue +++ b/src/views/wms/countManage/count/countPlanMain/index.vue @@ -607,7 +607,9 @@ const handleDelete = async (id: number) => { message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } finally { + tableObject.loading = false + } } /** 导出按钮操作 */ @@ -676,6 +678,7 @@ const submitForm = async (formType, data) => { value: item.value } }) // 拼接子表数据参数 + formRef.value.formLoading = true try { if (formType === 'create') { await CountPlanMainApi.createCountPlanMain(data) diff --git a/src/views/wms/countManage/count/countRequestMain/index.vue b/src/views/wms/countManage/count/countRequestMain/index.vue index d912ae06b..e1de90f2d 100644 --- a/src/views/wms/countManage/count/countRequestMain/index.vue +++ b/src/views/wms/countManage/count/countRequestMain/index.vue @@ -169,6 +169,11 @@ const searchTableSuccess = (formField, searchField, val, formRef, type, row) => // 重盘和监盘点击去确定的时候返回 const searchTableSuccessCount = (formField, searchField, val, type,row,count) => { nextTick(() => { + let getLoading = ElLoading.service({ + lock: true, + text: 'loading...', + background: 'rgba(0, 0, 0, 0.7)' + }) if (formField == 'reCount') { // 重盘 if(type == 3){ @@ -177,7 +182,10 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) => row.type = type CountRequestMainApi.reCount(row).then((res)=>{ message.success('重盘成功') + getLoading?.close() getList() + }).catch((err) => { + getLoading?.close() }) } else { // 监盘 @@ -189,7 +197,10 @@ const searchTableSuccessCount = (formField, searchField, val, type,row,count) => row.type = type CountRequestMainApi.superviseCount(row).then((res)=>{ message.success('监盘成功') + getLoading?.close() getList() + }).catch((err) => { + getLoading?.close() }) } }) @@ -413,12 +424,15 @@ const buttonTableClick = async (val, row) => { } else if (val == 'countAdjustRequest') { // 生成盘点调整申请 await message.confirm('确认要生成盘点调整申请吗？') + tableObject.loading = true CountRequestMainApi.generateCountadjustRequest(row.id) .then(() => { message.success(t('已生成盘点调整申请')) + tableObject.loading = false getList() }) .catch((err) => { + tableObject.loading = false console.log(err) }) } else if (val == 'mainThaw') { @@ -469,11 +483,13 @@ const handleDelete = async (id: number) => { tableObject.loading = true // 发起删除 await CountRequestMainApi.deleteCountRequestMain(id) - tableObject.loading = false + message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } finally { + tableObject.loading = false + } } /** 导出按钮操作 */ diff --git a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue index fb5ee8361..ee5554732 100644 --- a/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue +++ b/src/views/wms/countManage/countadjust/countadjustRequestMain/index.vue @@ -257,13 +257,18 @@ const buttonTableClick = async (val, row) => { }) } else if (val == 'mainHandle') { // 处理 await message.confirm('确认要处理吗？') - tableObject.loading = true + let getLoading = ElLoading.service({ + lock: true, + text: 'loading...', + background: 'rgba(0, 0, 0, 0.7)' + }) + CountadjustRequestMainApi.handle(row.id).then(() => { message.success(t('处理成功')) - tableObject.loading = false + getLoading?.close() getList() }).catch(err => { - tableObject.loading = false + getLoading?.close() console.log(err) }) } else if (val == 'edit') { // 编辑 @@ -299,11 +304,12 @@ const handleDelete = async (id: number) => { tableObject.loading = true // 发起删除 await CountadjustRequestMainApi.deleteCountadjustRequestMain(id) - tableObject.loading = false message.success(t('common.delSuccess')) // 刷新列表 await getList() - } catch {} + } finally { + tableObject.loading = false + } } /** 导出按钮操作 */