From 5e440a7dc434c43eb828fa62cf9c12b0078b8565 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:36:18 +0800
Subject: [PATCH] !173 发布 5.3.0-BETA 公测版本 Merge pull request !173 from 疯狂的狮子Li/dev
---
src/views/system/tenantPackage/index.vue | 503 ++++++++++++++++++++++++++-----------------------------
1 files changed, 238 insertions(+), 265 deletions(-)
diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index ae33d13..f97bb35 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -1,108 +1,84 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch" label-width="68px">
- <el-form-item label="濂楅鍚嶇О" prop="packageName">
- <el-input
- v-model="queryParams.packageName"
- placeholder="璇疯緭鍏ュ椁愬悕绉�"
- clearable
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item>
- <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
- <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
- </el-form-item>
- </el-form>
+ <div class="p-2">
+ <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
+ <div v-show="showSearch" class="mb-[10px]">
+ <el-card shadow="hover">
+ <el-form ref="queryFormRef" :model="queryParams" :inline="true">
+ <el-form-item label="濂楅鍚嶇О" prop="packageName">
+ <el-input v-model="queryParams.packageName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item>
+ <el-button type="primary" icon="Search" @click="handleQuery">鎼滅储</el-button>
+ <el-button icon="Refresh" @click="resetQuery">閲嶇疆</el-button>
+ </el-form-item>
+ </el-form>
+ </el-card>
+ </div>
+ </transition>
- <el-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['system:tenantPackage:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:tenantPackage:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:tenantPackage:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['system:tenantPackage:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ <el-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10" class="mb8">
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd"> 鏂板 </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:tenantPackage:edit']" type="success" plain icon="Edit" :disabled="single" @click="handleUpdate()">
+ 淇敼
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:tenantPackage:remove']" type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()">
+ 鍒犻櫎
+ </el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭 </el-button>
+ </el-col>
+ <right-toolbar v-model:show-search="showSearch" @query-table="getList"></right-toolbar>
+ </el-row>
+ </template>
- <el-table v-loading="loading" :data="tenantPackageList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="绉熸埛濂楅id" align="center" prop="packageId" v-if="false"/>
- <el-table-column label="濂楅鍚嶇О" align="center" prop="packageName" />
- <el-table-column label="澶囨敞" align="center" prop="remark" />
- <el-table-column label="鐘舵��" align="center" prop="status" >
- <template #default="scope">
- <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">
- <template #default="scope">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:tenantPackage:edit']">淇敼</el-button>
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenantPackage:remove']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
+ <el-table v-loading="loading" :data="tenantPackageList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column v-if="false" label="绉熸埛濂楅id" align="center" prop="packageId" />
+ <el-table-column label="濂楅鍚嶇О" align="center" prop="packageName" />
+ <el-table-column label="澶囨敞" align="center" prop="remark" />
+ <el-table-column label="鐘舵��" align="center" prop="status">
+ <template #default="scope">
+ <el-switch v-model="scope.row.status" active-value="0" inactive-value="1" @click="handleStatusChange(scope.row)"></el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
+ <template #default="scope">
+ <el-tooltip content="淇敼" placement="top">
+ <el-button v-hasPermi="['system:tenantPackage:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['system:tenantPackage:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+ </el-tooltip>
+ </template>
+ </el-table-column>
+ </el-table>
- <pagination
- v-show="total>0"
- :total="total"
- :page.sync="queryParams.pageNum"
- :limit.sync="queryParams.pageSize"
- @pagination="getList"
- />
+ <pagination v-show="total > 0" v-model:page="queryParams.pageNum" v-model:limit="queryParams.pageSize" :total="total" @pagination="getList" />
+ </el-card>
<!-- 娣诲姞鎴栦慨鏀圭鎴峰椁愬璇濇 -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="tenantPackageRef" :model="form" :rules="rules" label-width="80px">
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+ <el-form ref="tenantPackageFormRef" :model="form" :rules="rules" label-width="80px">
<el-form-item label="濂楅鍚嶇О" prop="packageName">
<el-input v-model="form.packageName" placeholder="璇疯緭鍏ュ椁愬悕绉�" />
</el-form-item>
<el-form-item label="鍏宠仈鑿滃崟">
<el-checkbox v-model="menuExpand" @change="handleCheckedTreeExpand($event, 'menu')">灞曞紑/鎶樺彔</el-checkbox>
- <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
- <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩</el-checkbox>
+ <el-checkbox v-model="menuNodeAll" @change="handleCheckedTreeNodeAll($event, 'menu')">鍏ㄩ��/鍏ㄤ笉閫� </el-checkbox>
+ <el-checkbox v-model="form.menuCheckStrictly" @change="handleCheckedTreeConnect($event, 'menu')">鐖跺瓙鑱斿姩 </el-checkbox>
<el-tree
+ ref="menuTreeRef"
class="tree-border"
:data="menuOptions"
show-checkbox
- ref="menuRef"
node-key="id"
:check-strictly="!form.menuCheckStrictly"
empty-text="鍔犺浇涓紝璇风◢鍊�"
@@ -113,250 +89,247 @@
<el-input v-model="form.remark" placeholder="璇疯緭鍏ュ娉�" />
</el-form-item>
</el-form>
- <div slot="footer" class="dialog-footer">
- <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button :loading="buttonLoading" type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
</el-dialog>
</div>
</template>
-<script setup name="TenantPackage">
-import { listTenantPackage, getTenantPackage, delTenantPackage, addTenantPackage, updateTenantPackage, changePackageStatus } from "@/api/system/tenantPackage";
-import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from "@/api/system/menu";
+<script setup name="TenantPackage" lang="ts">
+import {
+ listTenantPackage,
+ getTenantPackage,
+ delTenantPackage,
+ addTenantPackage,
+ updateTenantPackage,
+ changePackageStatus
+} from '@/api/system/tenantPackage';
+import { treeselect as menuTreeselect, tenantPackageMenuTreeselect } from '@/api/system/menu';
+import { TenantPkgForm, TenantPkgQuery, TenantPkgVO } from '@/api/system/tenantPackage/types';
+import { MenuTreeOption } from '@/api/system/menu/types';
+import to from 'await-to-js';
-const { proxy } = getCurrentInstance();
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
-const tenantPackageList = ref([]);
-const open = ref(false);
+const tenantPackageList = ref<TenantPkgVO[]>([]);
const buttonLoading = ref(false);
const loading = ref(true);
const showSearch = ref(true);
-const ids = ref([]);
+const ids = ref<Array<string | number>>([]);
const single = ref(true);
const multiple = ref(true);
const total = ref(0);
-const title = ref("");
const menuExpand = ref(false);
const menuNodeAll = ref(false);
-const menuOptions = ref([]);
+const menuOptions = ref<MenuTreeOption[]>([]);
-const data = reactive({
- form: {},
+const menuTreeRef = ref<ElTreeInstance>();
+const queryFormRef = ref<ElFormInstance>();
+const tenantPackageFormRef = ref<ElFormInstance>();
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
+});
+
+const initFormData: TenantPkgForm = {
+ packageId: undefined,
+ packageName: '',
+ menuIds: '',
+ remark: '',
+ menuCheckStrictly: true
+};
+const data = reactive<PageData<TenantPkgForm, TenantPkgQuery>>({
+ form: { ...initFormData },
queryParams: {
pageNum: 1,
pageSize: 10,
- packageName: undefined,
- status: undefined,
+ packageName: ''
},
rules: {
- packageId: [
- { required: true, message: "绉熸埛濂楅id涓嶈兘涓虹┖", trigger: "blur" }
- ],
- packageName: [
- { required: true, message: "濂楅鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }
- ]
+ packageId: [{ required: true, message: '绉熸埛濂楅id涓嶈兘涓虹┖', trigger: 'blur' }],
+ packageName: [{ required: true, message: '濂楅鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }]
}
});
const { queryParams, form, rules } = toRefs(data);
/** 鏌ヨ鑿滃崟鏍戠粨鏋� */
-function getMenuTreeselect() {
- menuTreeselect().then(response => {
- menuOptions.value = response.data;
- });
-}
+const getMenuTreeselect = async () => {
+ const { data } = await menuTreeselect();
+ menuOptions.value = data;
+};
// 鎵�鏈夎彍鍗曡妭鐐规暟鎹�
-function getMenuAllCheckedKeys() {
+const getMenuAllCheckedKeys = (): any => {
// 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
- let checkedKeys = proxy.$refs.menuRef.getCheckedKeys();
+ let checkedKeys = menuTreeRef.value?.getCheckedKeys();
// 鍗婇�変腑鐨勮彍鍗曡妭鐐�
- let halfCheckedKeys = proxy.$refs.menuRef.getHalfCheckedKeys();
- checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
+ let halfCheckedKeys = menuTreeRef.value?.getHalfCheckedKeys();
+ if (halfCheckedKeys) {
+ checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
+ }
return checkedKeys;
-}
+};
/** 鏍规嵁绉熸埛濂楅ID鏌ヨ鑿滃崟鏍戠粨鏋� */
-function getPackageMenuTreeselect(packageId) {
- return tenantPackageMenuTreeselect(packageId).then(response => {
- menuOptions.value = response.data.menus;
- return response;
- });
-}
+const getPackageMenuTreeselect = async (packageId: string | number) => {
+ const res = await tenantPackageMenuTreeselect(packageId);
+ menuOptions.value = res.data.menus;
+ return Promise.resolve(res);
+};
/** 鏌ヨ绉熸埛濂楅鍒楄〃 */
-function getList() {
+const getList = async () => {
loading.value = true;
- listTenantPackage(queryParams.value).then(response => {
- tenantPackageList.value = response.rows;
- total.value = response.total;
- loading.value = false;
- });
-}
+ const res = await listTenantPackage(queryParams.value);
+ tenantPackageList.value = res.rows;
+ total.value = res.total;
+ loading.value = false;
+};
// 绉熸埛濂楅鐘舵�佷慨鏀�
-function handleStatusChange(row) {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- proxy.$modal.confirm('纭瑕�"' + text + '""' + row.packageName + '"濂楅鍚楋紵').then(function() {
- return changePackageStatus(row.packageId, row.status);
- }).then(() => {
- proxy.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function() {
- row.status = row.status === "0" ? "1" : "0";
- });
-}
+const handleStatusChange = async (row: TenantPkgVO) => {
+ let text = row.status === '0' ? '鍚敤' : '鍋滅敤';
+ const [err] = await to(proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.packageName + '"濂楅鍚楋紵') as Promise<any>);
+ if (err) {
+ row.status = row.status === '0' ? '1' : '0';
+ } else {
+ await changePackageStatus(row.packageId, row.status);
+ proxy?.$modal.msgSuccess(text + '鎴愬姛');
+ }
+};
// 鍙栨秷鎸夐挳
-function cancel() {
- open.value = false;
+const cancel = () => {
reset();
-}
+ dialog.visible = false;
+};
// 琛ㄥ崟閲嶇疆
-function reset() {
- if (proxy.$refs.menuRef != undefined) {
- proxy.$refs.menuRef.setCheckedKeys([]);
- }
+const reset = () => {
+ menuTreeRef.value?.setCheckedKeys([]);
menuExpand.value = false;
menuNodeAll.value = false;
- form.value = {
- packageId: undefined,
- packageName: undefined,
- menuIds: undefined,
- remark: undefined,
- menuCheckStrictly: true,
- status: undefined
- };
- proxy.resetForm("tenantPackageRef");
-}
+ form.value = { ...initFormData };
+ tenantPackageFormRef.value?.resetFields();
+};
/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
+};
/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- proxy.resetForm("queryRef");
+const resetQuery = () => {
+ queryFormRef.value?.resetFields();
handleQuery();
-}
+};
// 澶氶�夋閫変腑鏁版嵁
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.packageId);
+const handleSelectionChange = (selection: TenantPkgVO[]) => {
+ ids.value = selection.map((item) => item.packageId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
// 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�
-function handleCheckedTreeExpand(value, type) {
+const handleCheckedTreeExpand = (value: CheckboxValueType, type: string) => {
if (type == 'menu') {
let treeList = menuOptions.value;
for (let i = 0; i < treeList.length; i++) {
- proxy.$refs.menuRef.store.nodesMap[treeList[i].id].expanded = value;
- }
- }
-}
-
-// 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級
-function handleCheckedTreeNodeAll(value, type) {
- if (type == 'menu') {
- proxy.$refs.menuRef.setCheckedNodes(value ? this.menuOptions: []);
- }
-}
-
-// 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛�
-function handleCheckedTreeConnect(value, type) {
- if (type == 'menu') {
- form.value.menuCheckStrictly = value ? true: false;
- }
-}
-
-/** 鏂板鎸夐挳鎿嶄綔 */
-function handleAdd() {
- reset();
- getMenuTreeselect();
- open.value = true;
- title.value = "娣诲姞绉熸埛濂楅";
-}
-
-/** 淇敼鎸夐挳鎿嶄綔 */
-function handleUpdate(row) {
- loading.value = true
- reset();
- const _packageId = row.packageId || ids.value
- const packageMenu = getPackageMenuTreeselect(_packageId);
- getTenantPackage(_packageId).then(response => {
- loading.value = false;
- form.value = response.data;
- open.value = true;
- nextTick(() => {
- packageMenu.then(res => {
- let checkedKeys = res.data.checkedKeys
- checkedKeys.forEach((v) => {
- nextTick(() => {
- proxy.$refs.menuRef.setChecked(v, true ,false);
- })
- })
- });
- });
- title.value = "淇敼绉熸埛濂楅";
- });
-}
-
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["tenantPackageRef"].validate(valid => {
- if (valid) {
- buttonLoading.value = true;
- if (form.value.packageId != null) {
- form.value.menuIds = getMenuAllCheckedKeys();
- updateTenantPackage(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
- } else {
- form.value.menuIds = getMenuAllCheckedKeys();
- addTenantPackage(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- }).finally(() => {
- buttonLoading.value = false;
- });
+ if (menuTreeRef.value) {
+ menuTreeRef.value.store.nodesMap[treeList[i].id].expanded = value as boolean;
}
}
+ }
+};
+
+// 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級
+const handleCheckedTreeNodeAll = (value: CheckboxValueType, type: string) => {
+ if (type == 'menu') {
+ menuTreeRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
+ }
+};
+
+// 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛�
+const handleCheckedTreeConnect = (value: CheckboxValueType, type: string) => {
+ if (type == 'menu') {
+ form.value.menuCheckStrictly = value as boolean;
+ }
+};
+
+/** 鏂板鎸夐挳鎿嶄綔 */
+const handleAdd = () => {
+ reset();
+ getMenuTreeselect();
+ dialog.visible = true;
+ dialog.title = '娣诲姞绉熸埛濂楅';
+};
+
+/** 淇敼鎸夐挳鎿嶄綔 */
+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 = '淇敼绉熸埛濂楅';
+ res.data.checkedKeys.forEach((v) => {
+ nextTick(() => {
+ menuTreeRef.value?.setChecked(v, true, false);
+ });
});
-}
+};
+
+/** 鎻愪氦鎸夐挳 */
+const submitForm = () => {
+ tenantPackageFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ buttonLoading.value = true;
+ form.value.menuIds = getMenuAllCheckedKeys();
+ if (form.value.packageId != null) {
+ await updateTenantPackage(form.value).finally(() => (buttonLoading.value = false));
+ } else {
+ await addTenantPackage(form.value).finally(() => (buttonLoading.value = false));
+ }
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
+ await getList();
+ }
+ });
+};
/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const _packageIds = row.packageId || ids.value;
- proxy.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛濂楅缂栧彿涓�"' + _packageIds + '"鐨勬暟鎹」锛�').then(function() {
- loading.value = true;
- return delTenantPackage(_packageIds);
- }).then(() => {
- loading.value = true;
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {
- }).finally(() => {
+const handleDelete = async (row?: TenantPkgVO) => {
+ const _packageIds = row?.packageId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛濂楅缂栧彿涓�"' + _packageIds + '"鐨勬暟鎹」锛�').finally(() => {
loading.value = false;
});
-}
+ await delTenantPackage(_packageIds);
+ loading.value = true;
+ await getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download('system/tenantPackage/export', {
- ...queryParams.value
- }, `tenantPackage_${new Date().getTime()}.xlsx`)
-}
+const handleExport = () => {
+ proxy?.download(
+ 'system/tenant/package/export',
+ {
+ ...queryParams.value
+ },
+ `tenantPackage_${new Date().getTime()}.xlsx`
+ );
+};
-getList();
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3