From cc9b67d4676dd51a6b2d88e92607aca2629ee54d Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期五, 22 十二月 2023 13:26:26 +0800
Subject: [PATCH] !72 发布 vue 版本 5.1.2 与 cloud 版本 2.1.2 Merge pull request !72 from 疯狂的狮子Li/temp
---
src/views/system/tenantPackage/index.vue | 34 ++++++++++++----------------------
1 files changed, 12 insertions(+), 22 deletions(-)
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index add2eb5..5311996 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -5,7 +5,7 @@
<el-card shadow="hover">
<el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
<el-form-item label="濂楅鍚嶇О" prop="packageName">
- <el-input v-model="queryParams.packageName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter="handleQuery" />
+ <el-input v-model="queryParams.packageName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
</el-form-item>
<el-form-item>
<el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
@@ -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