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/tenant/index.vue |   26 ++++++++++----------------
 1 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/src/views/system/tenant/index.vue b/src/views/system/tenant/index.vue
index 711ee7f..2d610a9 100644
--- a/src/views/system/tenant/index.vue
+++ b/src/views/system/tenant/index.vue
@@ -66,7 +66,7 @@
             <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @change="handleStatusChange(scope.row)"></el-switch>
           </template>
         </el-table-column>
-        <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+        <el-table-column width="150" label="鎿嶄綔" align="center" fixed="right" class-name="small-padding fixed-width">
           <template #default="scope">
             <el-tooltip content="淇敼" placement="top">
               <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenant:edit']"></el-button>
@@ -275,27 +275,21 @@
 
 /** 鏂板鎸夐挳鎿嶄綔 */
 const handleAdd = () => {
+  reset();
+  getTenantPackage();
   dialog.visible = true;
   dialog.title = "娣诲姞绉熸埛";
-  nextTick(() => {
-    reset();
-    getTenantPackage();
-  })
 }
 
 /** 淇敼鎸夐挳鎿嶄綔 */
-const handleUpdate = (row?: TenantVO) => {
-  loading.value = true;
+const handleUpdate = async (row?: TenantVO) => {
+  reset();
+  await getTenantPackage();
+  const _id = row?.id || ids.value[0];
+  const res = await getTenant(_id);
+  Object.assign(form.value, res.data)
   dialog.visible = true;
   dialog.title = "淇敼绉熸埛";
-  nextTick(async () => {
-    reset();
-    await getTenantPackage();
-    const _id = row?.id || ids.value[0];
-    const res = await getTenant(_id);
-    loading.value = false;
-    Object.assign(form.value, res.data)
-  })
 }
 
 /** 鎻愪氦鎸夐挳 */
@@ -310,7 +304,7 @@
       }
       proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
       dialog.visible = false;
-      getList();
+      await getList();
     }
   });
 }

--
Gitblit v1.9.3