From b06f6a316b6a8293bb8aba6bfff33336b66c032a Mon Sep 17 00:00:00 2001
From: ahaos <8406649+lhailgl@user.noreply.gitee.com>
Date: 星期三, 13 十二月 2023 09:01:52 +0800
Subject: [PATCH] !64 版本升级 * Merge branch 'dev' of gitee.com:JavaLionLi/plus-ui into ts * 升级依赖 * !61 fix: 删除重复环境变量ElUploadInstance * fix: 删除重复环境变量ElUploadInstance

---
 src/views/system/tenantPackage/index.vue |   93 ++++++++++++++++++++++++----------------------
 1 files changed, 48 insertions(+), 45 deletions(-)

diff --git a/src/views/system/tenantPackage/index.vue b/src/views/system/tenantPackage/index.vue
index 5311996..6f5aeaf 100644
--- a/src/views/system/tenantPackage/index.vue
+++ b/src/views/system/tenantPackage/index.vue
@@ -1,9 +1,9 @@
 <template>
   <div class="p-2">
     <transition :enter-active-class="proxy?.animate.searchAnimate.enter" :leave-active-class="proxy?.animate.searchAnimate.leave">
-      <div class="mb-[10px]" v-show="showSearch">
+      <div v-show="showSearch" class="mb-[10px]">
         <el-card shadow="hover">
-          <el-form :model="queryParams" ref="queryFormRef" :inline="true" label-width="68px">
+          <el-form ref="queryFormRef" :model="queryParams" :inline="true" label-width="68px">
             <el-form-item label="濂楅鍚嶇О" prop="packageName">
               <el-input v-model="queryParams.packageName" placeholder="璇疯緭鍏ュ椁愬悕绉�" clearable style="width: 240px" @keyup.enter="handleQuery" />
             </el-form-item>
@@ -20,28 +20,28 @@
       <template #header>
         <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-button v-hasPermi="['system:tenantPackage:add']" type="primary" plain icon="Plus" @click="handleAdd"> 鏂板 </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 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 type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete()" v-hasPermi="['system:tenantPackage:remove']">
+            <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 type="warning" plain icon="Download" @click="handleExport" v-hasPermi="['system:tenantPackage:export']">瀵煎嚭 </el-button>
+            <el-button v-hasPermi="['system:tenantPackage:export']" type="warning" plain icon="Download" @click="handleExport">瀵煎嚭 </el-button>
           </el-col>
-          <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+          <right-toolbar v-model:showSearch="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 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">
@@ -52,20 +52,20 @@
         <el-table-column label="鎿嶄綔" align="center" 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:tenantPackage:edit']"></el-button>
+              <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 link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:tenantPackage:remove']"></el-button>
+              <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" v-model:page="queryParams.pageNum" v-model:limit="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="dialog.title" v-model="dialog.visible" width="500px" append-to-body>
+    <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="璇疯緭鍏ュ椁愬悕绉�" />
@@ -75,10 +75,10 @@
           <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="menuTreeRef"
             node-key="id"
             :check-strictly="!form.menuCheckStrictly"
             empty-text="鍔犺浇涓紝璇风◢鍊�"
@@ -107,11 +107,11 @@
   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";
+} 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() as ComponentInternalInstance;
 
@@ -133,15 +133,14 @@
 
 const dialog = reactive<DialogOption>({
   visible: false,
-  title: ""
+  title: ''
 });
-
 
 const initFormData: TenantPkgForm = {
   packageId: undefined,
-  packageName: "",
-  menuIds: "",
-  remark: "",
+  packageName: '',
+  menuIds: '',
+  remark: '',
   menuCheckStrictly: true
 };
 const data = reactive<PageData<TenantPkgForm, TenantPkgQuery>>({
@@ -149,11 +148,11 @@
   queryParams: {
     pageNum: 1,
     pageSize: 10,
-    packageName: ""
+    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' }]
   }
 });
 
@@ -195,13 +194,13 @@
 
 // 绉熸埛濂楅鐘舵�佷慨鏀�
 const handleStatusChange = async (row: TenantPkgVO) => {
-  let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
-  const [err] = await to(proxy?.$modal.confirm("纭瑕乗"" + text + "\"\"" + row.packageName + "\"濂楅鍚楋紵") as Promise<any>);
+  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";
+    row.status = row.status === '0' ? '1' : '0';
   } else {
     await changePackageStatus(row.packageId, row.status);
-    proxy?.$modal.msgSuccess(text + "鎴愬姛");
+    proxy?.$modal.msgSuccess(text + '鎴愬姛');
   }
 };
 
@@ -234,14 +233,14 @@
 
 // 澶氶�夋閫変腑鏁版嵁
 const handleSelectionChange = (selection: TenantPkgVO[]) => {
-  ids.value = selection.map(item => item.packageId);
+  ids.value = selection.map((item) => item.packageId);
   single.value = selection.length != 1;
   multiple.value = !selection.length;
 };
 
 // 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�
 const handleCheckedTreeExpand = (value: CheckboxValueType, type: string) => {
-  if (type == "menu") {
+  if (type == 'menu') {
     let treeList = menuOptions.value;
     for (let i = 0; i < treeList.length; i++) {
       if (menuTreeRef.value) {
@@ -253,14 +252,14 @@
 
 // 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級
 const handleCheckedTreeNodeAll = (value: CheckboxValueType, type: string) => {
-  if (type == "menu") {
-    menuTreeRef.value?.setCheckedNodes(value ? menuOptions.value as any : []);
+  if (type == 'menu') {
+    menuTreeRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
   }
 };
 
 // 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛�
 const handleCheckedTreeConnect = (value: CheckboxValueType, type: string) => {
-  if (type == "menu") {
+  if (type == 'menu') {
     form.value.menuCheckStrictly = value as boolean;
   }
 };
@@ -270,7 +269,7 @@
   reset();
   getMenuTreeselect();
   dialog.visible = true;
-  dialog.title = "娣诲姞绉熸埛濂楅";
+  dialog.title = '娣诲姞绉熸埛濂楅';
 };
 
 /** 淇敼鎸夐挳鎿嶄綔 */
@@ -281,7 +280,7 @@
   form.value = response.data;
   const res = await getPackageMenuTreeselect(_packageId);
   dialog.visible = true;
-  dialog.title = "淇敼绉熸埛濂楅";
+  dialog.title = '淇敼绉熸埛濂楅';
   res.data.checkedKeys.forEach((v) => {
     nextTick(() => {
       menuTreeRef.value?.setChecked(v, true, false);
@@ -296,11 +295,11 @@
       buttonLoading.value = true;
       form.value.menuIds = getMenuAllCheckedKeys();
       if (form.value.packageId != null) {
-        await updateTenantPackage(form.value).finally(() => buttonLoading.value = false);
+        await updateTenantPackage(form.value).finally(() => (buttonLoading.value = false));
       } else {
-        await addTenantPackage(form.value).finally(() => buttonLoading.value = false);
+        await addTenantPackage(form.value).finally(() => (buttonLoading.value = false));
       }
-      proxy?.$modal.msgSuccess("鎿嶄綔鎴愬姛");
+      proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
       dialog.visible = false;
       await getList();
     }
@@ -310,20 +309,24 @@
 /** 鍒犻櫎鎸夐挳鎿嶄綔 */
 const handleDelete = async (row?: TenantPkgVO) => {
   const _packageIds = row?.packageId || ids.value;
-  await proxy?.$modal.confirm("鏄惁纭鍒犻櫎绉熸埛濂楅缂栧彿涓篭"" + _packageIds + "\"鐨勬暟鎹」锛�").finally(() => {
+  await proxy?.$modal.confirm('鏄惁纭鍒犻櫎绉熸埛濂楅缂栧彿涓�"' + _packageIds + '"鐨勬暟鎹」锛�').finally(() => {
     loading.value = false;
   });
   await delTenantPackage(_packageIds);
   loading.value = true;
   await getList();
-  proxy?.$modal.msgSuccess("鍒犻櫎鎴愬姛");
+  proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
 };
 
 /** 瀵煎嚭鎸夐挳鎿嶄綔 */
 const handleExport = () => {
-  proxy?.download("system/tenantPackage/export", {
-    ...queryParams.value
-  }, `tenantPackage_${new Date().getTime()}.xlsx`);
+  proxy?.download(
+    'system/tenantPackage/export',
+    {
+      ...queryParams.value
+    },
+    `tenantPackage_${new Date().getTime()}.xlsx`
+  );
 };
 
 onMounted(() => {

--
Gitblit v1.9.3