diff --git a/snowy-admin-web/src/views/biz/org/form.vue b/snowy-admin-web/src/views/biz/org/form.vue index 99a7bdcf..744c2fb9 100644 --- a/snowy-admin-web/src/views/biz/org/form.vue +++ b/snowy-admin-web/src/views/biz/org/form.vue @@ -158,10 +158,12 @@ submitLoading.value = true formData.value.extJson = JSON.stringify(extJson.value) bizOrgApi.submitForm(formData.value, !formData.value.id).then(() => { - submitLoading.value = false visible = false emit('successful') }) + .finally(() => { + submitLoading.value = false + }) }) .catch(() => {}) } diff --git a/snowy-admin-web/src/views/biz/org/index.vue b/snowy-admin-web/src/views/biz/org/index.vue index 91118e22..77b33ea8 100644 --- a/snowy-admin-web/src/views/biz/org/index.vue +++ b/snowy-admin-web/src/views/biz/org/index.vue @@ -156,6 +156,9 @@ }) } }) + .finally(() => { + cardLoading.value = false + }) } // 点击树查询 const treeSelect = (selectedKeys) => { diff --git a/snowy-admin-web/src/views/biz/position/form.vue b/snowy-admin-web/src/views/biz/position/form.vue index 447cac38..fc7bc488 100644 --- a/snowy-admin-web/src/views/biz/position/form.vue +++ b/snowy-admin-web/src/views/biz/position/form.vue @@ -115,9 +115,11 @@ submitLoading.value = true bizPositionApi.submitForm(formData.value, !formData.value.id).then(() => { visible = false - submitLoading.value = false emit('successful') }) + .finally(() => { + submitLoading.value = false + }) }) .catch(() => {}) } diff --git a/snowy-admin-web/src/views/biz/position/index.vue b/snowy-admin-web/src/views/biz/position/index.vue index d24fb5b9..90e4cba6 100644 --- a/snowy-admin-web/src/views/biz/position/index.vue +++ b/snowy-admin-web/src/views/biz/position/index.vue @@ -155,6 +155,9 @@ }) } }) + .finally(() => { + cardLoading.value = false + }) // 点击树查询 const treeSelect = (selectedKeys) => { if (selectedKeys.length > 0) { diff --git a/snowy-admin-web/src/views/biz/user/index.vue b/snowy-admin-web/src/views/biz/user/index.vue index 200751d0..ce367be2 100644 --- a/snowy-admin-web/src/views/biz/user/index.vue +++ b/snowy-admin-web/src/views/biz/user/index.vue @@ -208,6 +208,9 @@ }) } }) + .finally(() => { + cardLoading.value = false + }) // 列表选择配置 const options = { alert: { @@ -236,14 +239,18 @@ loading.value = true if (record.userStatus === 'ENABLE') { bizUserApi.userDisableUser(record).then(() => { - loading.value = false table.value.refresh() }) + .finally(() => { + loading.value = false + }) } else { bizUserApi.userEnableUser(record).then(() => { - loading.value = false table.value.refresh() }) + .finally(() => { + loading.value = false + }) } } // 删除人员