From ac3ad638949e4d560ddf69320a5f9bb28ca5aaca Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 19 七月 2023 22:48:30 +0800
Subject: [PATCH] !29 修改列表打开对话框和接口请求顺序 Merge pull request !29 from ahaos/tspr

---
 src/views/system/tenantPackage/index.vue |   32 +++++++++++---------------------
 1 files changed, 11 insertions(+), 21 deletions(-)

diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index add2eb5..055c413 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -267,34 +267,24 @@
 
 /** 鏂板鎸夐挳鎿嶄綔 */
 const handleAdd = () => {
+  reset();
+  getMenuTreeselect();
   dialog.visible = true;
   dialog.title = "娣诲姞绉熸埛濂楅";
-  nextTick(() => {
-    reset();
-    getMenuTreeselect();
-  });
 };
 
 /** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: TenantPkgVO) => {
-  loading.value = true;
+const handleUpdate = async (row?: TenantPkgVO) => {
+  reset();
+  const _packageId = row?.packageId || ids.value[0];
+  const response = await getTenantPackage(_packageId);
+  form.value = response.data;
+  const res = await getPackageMenuTreeselect(_packageId);
   dialog.visible = true;
   dialog.title = "淇敼绉熸埛濂楅";
-  nextTick(async () => {
-    reset();
-    const _packageId = row?.packageId || ids.value[0];
-    const packageMenu = getPackageMenuTreeselect(_packageId);
-    const response = await getTenantPackage(_packageId);
-    loading.value = false;
-    form.value = response.data;
-    await nextTick(async () => {
-      const res = await packageMenu;
-      let checkedKeys = res.data.checkedKeys;
-      checkedKeys.forEach((v) => {
-        nextTick(() => {
-          menuTreeRef.value?.setChecked(v, true, false);
-        });
-      });
+  res.data.checkedKeys.forEach((v) => {
+    nextTick(() => {
+      menuTreeRef.value?.setChecked(v, true, false);
     });
   });
 };

--
Gitblit v1.9.3