From 682e9a96fb159de8f798942e2b756f28e4f854fe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=8F=E8=AF=BA?= <1253070437@qq.com>
Date: Mon, 5 Dec 2022 23:09:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=9B=B4=E6=96=B0=E3=80=91=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E4=B8=80=E4=BA=9B=E9=81=97=E6=BC=8F=E7=9A=84=E8=AF=B7?=
 =?UTF-8?q?=E6=B1=82=E5=8A=A0=E8=BD=BD=E5=8E=BB=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 snowy-admin-web/src/views/biz/org/form.vue       |  4 +++-
 snowy-admin-web/src/views/biz/org/index.vue      |  3 +++
 snowy-admin-web/src/views/biz/position/form.vue  |  4 +++-
 snowy-admin-web/src/views/biz/position/index.vue |  3 +++
 snowy-admin-web/src/views/biz/user/index.vue     | 11 +++++++++--
 5 files changed, 21 insertions(+), 4 deletions(-)

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
+			})
 		}
 	}
 	// 删除人员