From bbe94610a28e72414df1fb2b36a6d11385873e54 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 20 一月 2025 11:30:16 +0800
Subject: [PATCH] update 优化 parseTime 提示报错问题
---
src/views/system/role/index.vue | 907 ++++++++++++++++++++++++++------------------------------
1 files changed, 425 insertions(+), 482 deletions(-)
diff --git a/src/views/system/role/index.vue b/src/views/system/role/index.vue
index 9050599..fc42cd5 100644
--- a/src/views/system/role/index.vue
+++ b/src/views/system/role/index.vue
@@ -1,560 +1,503 @@
<template>
- <div class="app-container">
- <el-form :model="queryParams" ref="queryRef" v-show="showSearch" :inline="true" label-width="68px">
- <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
- <el-input
- v-model="queryParams.roleName"
- placeholder="璇疯緭鍏ヨ鑹插悕绉�"
- clearable
- style="width: 240px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鏉冮檺瀛楃" prop="roleKey">
- <el-input
- v-model="queryParams.roleKey"
- placeholder="璇疯緭鍏ユ潈闄愬瓧绗�"
- clearable
- style="width: 240px"
- @keyup.enter="handleQuery"
- />
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select
- v-model="queryParams.status"
- placeholder="瑙掕壊鐘舵��"
- clearable
- style="width: 240px"
- >
- <el-option
- v-for="dict in sys_normal_disable"
- :key="dict.value"
- :label="dict.label"
- :value="dict.value"
- />
- </el-select>
- </el-form-item>
- <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
- <el-date-picker
- v-model="dateRange"
- value-format="YYYY-MM-DD HH:mm:ss"
- type="daterange"
- range-separator="-"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
- ></el-date-picker>
- </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-row :gutter="10" class="mb8">
- <el-col :span="1.5">
- <el-button
- type="primary"
- plain
- icon="Plus"
- @click="handleAdd"
- v-hasPermi="['system:role:add']"
- >鏂板</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="success"
- plain
- icon="Edit"
- :disabled="single"
- @click="handleUpdate"
- v-hasPermi="['system:role:edit']"
- >淇敼</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="danger"
- plain
- icon="Delete"
- :disabled="multiple"
- @click="handleDelete"
- v-hasPermi="['system:role:remove']"
- >鍒犻櫎</el-button>
- </el-col>
- <el-col :span="1.5">
- <el-button
- type="warning"
- plain
- icon="Download"
- @click="handleExport"
- v-hasPermi="['system:role:export']"
- >瀵煎嚭</el-button>
- </el-col>
- <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
- </el-row>
+ <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="roleName">
+ <el-input v-model="queryParams.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鏉冮檺瀛楃" prop="roleKey">
+ <el-input v-model="queryParams.roleKey" placeholder="璇疯緭鍏ユ潈闄愬瓧绗�" clearable @keyup.enter="handleQuery" />
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="queryParams.status" placeholder="瑙掕壊鐘舵��" clearable>
+ <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍒涘缓鏃堕棿" style="width: 308px">
+ <el-date-picker
+ v-model="dateRange"
+ value-format="YYYY-MM-DD HH:mm:ss"
+ type="daterange"
+ range-separator="-"
+ start-placeholder="寮�濮嬫棩鏈�"
+ end-placeholder="缁撴潫鏃ユ湡"
+ :default-time="[new Date(2000, 1, 1, 0, 0, 0), new Date(2000, 1, 1, 23, 59, 59)]"
+ ></el-date-picker>
+ </el-form-item>
- <!-- 琛ㄦ牸鏁版嵁 -->
- <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
- <el-table-column type="selection" width="55" align="center" />
- <el-table-column label="瑙掕壊缂栧彿" prop="roleId" width="120" v-if="false" />
- <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" />
- <el-table-column label="鏉冮檺瀛楃" prop="roleKey" :show-overflow-tooltip="true" width="150" />
- <el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="100" />
- <el-table-column label="鐘舵��" align="center" width="100">
- <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" prop="createTime">
- <template #default="scope">
- <span>{{ parseTime(scope.row.createTime) }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鎿嶄綔" align="center" class-name="small-padding fixed-width">
- <template #default="scope">
- <el-tooltip content="淇敼" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
- </el-tooltip>
- <el-tooltip content="鍒犻櫎" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
- </el-tooltip>
- <el-tooltip content="鏁版嵁鏉冮檺" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
- </el-tooltip>
- <el-tooltip content="鍒嗛厤鐢ㄦ埛" placement="top" v-if="scope.row.roleId !== 1">
- <el-button link type="primary" icon="User" @click="handleAuthUser(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
- </el-tooltip>
- </template>
- </el-table-column>
+ <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-card shadow="hover">
+ <template #header>
+ <el-row :gutter="10">
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:role:add']" type="primary" plain icon="Plus" @click="handleAdd()">鏂板</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:role:edit']" type="success" plain :disabled="single" icon="Edit" @click="handleUpdate()">淇敼</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:role:delete']" type="danger" plain :disabled="ids.length === 0" @click="handleDelete()">鍒犻櫎</el-button>
+ </el-col>
+ <el-col :span="1.5">
+ <el-button v-hasPermi="['system:role: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 ref="roleTableRef" v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55" align="center" />
+ <el-table-column v-if="false" label="瑙掕壊缂栧彿" prop="roleId" width="120" />
+ <el-table-column label="瑙掕壊鍚嶇О" prop="roleName" :show-overflow-tooltip="true" width="150" />
+ <el-table-column label="鏉冮檺瀛楃" prop="roleKey" :show-overflow-tooltip="true" width="200" />
+ <el-table-column label="鏄剧ず椤哄簭" prop="roleSort" width="100" />
+ <el-table-column label="鐘舵��" align="center" width="100">
+ <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" prop="createTime">
+ <template #default="scope">
+ <span>{{ proxy.parseTime(scope.row.createTime) }}</span>
+ </template>
+ </el-table-column>
+
+ <el-table-column fixed="right" label="鎿嶄綔" width="180">
+ <template #default="scope">
+ <el-tooltip v-if="scope.row.roleId !== 1" content="淇敼" placement="top">
+ <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="Edit" @click="handleUpdate(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="鍒犻櫎" placement="top">
+ <el-button v-hasPermi="['system:role:remove']" link type="primary" icon="Delete" @click="handleDelete(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="鏁版嵁鏉冮檺" placement="top">
+ <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="CircleCheck" @click="handleDataScope(scope.row)"></el-button>
+ </el-tooltip>
+ <el-tooltip v-if="scope.row.roleId !== 1" content="鍒嗛厤鐢ㄦ埛" placement="top">
+ <el-button v-hasPermi="['system:role:edit']" link type="primary" icon="User" @click="handleAuthUser(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"
+ v-if="total > 0"
+ v-model:total="total"
+ v-model:page="queryParams.pageNum"
+ v-model:limit="queryParams.pageSize"
+ @pagination="getList"
/>
+ </el-card>
- <!-- 娣诲姞鎴栦慨鏀硅鑹查厤缃璇濇 -->
- <el-dialog :title="title" v-model="open" width="500px" append-to-body>
- <el-form ref="roleRef" :model="form" :rules="rules" label-width="100px">
- <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
- <el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" />
- </el-form-item>
- <el-form-item prop="roleKey">
- <template #label>
- <span>
- <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@PreAuthorize(`@ss.hasRole('admin')`)" placement="top">
- <el-icon><question-filled /></el-icon>
- </el-tooltip>
- 鏉冮檺瀛楃
- </span>
- </template>
- <el-input v-model="form.roleKey" placeholder="璇疯緭鍏ユ潈闄愬瓧绗�" />
- </el-form-item>
- <el-form-item label="瑙掕壊椤哄簭" prop="roleSort">
- <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
- </el-form-item>
- <el-form-item label="鐘舵��">
- <el-radio-group v-model="form.status">
- <el-radio
- v-for="dict in sys_normal_disable"
- :key="dict.value"
- :label="dict.value"
- >{{ dict.label }}</el-radio>
- </el-radio-group>
- </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-tree
- class="tree-border"
- :data="menuOptions"
- show-checkbox
- ref="menuRef"
- node-key="id"
- :check-strictly="!form.menuCheckStrictly"
- empty-text="鍔犺浇涓紝璇风◢鍊�"
- :props="{ label: 'label', children: 'children' }"
- ></el-tree>
- </el-form-item>
- <el-form-item label="澶囨敞">
- <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
- </el-form-item>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
- <el-button @click="cancel">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
+ <el-dialog v-model="dialog.visible" :title="dialog.title" width="500px" append-to-body>
+ <el-form ref="roleFormRef" :model="form" :rules="rules" label-width="100px">
+ <el-form-item label="瑙掕壊鍚嶇О" prop="roleName">
+ <el-input v-model="form.roleName" placeholder="璇疯緭鍏ヨ鑹插悕绉�" />
+ </el-form-item>
+ <el-form-item prop="roleKey">
+ <template #label>
+ <span>
+ <el-tooltip content="鎺у埗鍣ㄤ腑瀹氫箟鐨勬潈闄愬瓧绗︼紝濡傦細@SaCheckRole('admin')" placement="top">
+ <el-icon><question-filled /></el-icon>
+ </el-tooltip>
+ 鏉冮檺瀛楃
+ </span>
+ </template>
+ <el-input v-model="form.roleKey" placeholder="璇疯緭鍏ユ潈闄愬瓧绗�" />
+ </el-form-item>
+ <el-form-item label="瑙掕壊椤哄簭" prop="roleSort">
+ <el-input-number v-model="form.roleSort" controls-position="right" :min="0" />
+ </el-form-item>
+ <el-form-item label="鐘舵��">
+ <el-radio-group v-model="form.status">
+ <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :value="dict.value">{{ dict.label }}</el-radio>
+ </el-radio-group>
+ </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-tree
+ ref="menuRef"
+ class="tree-border"
+ :data="menuOptions"
+ show-checkbox
+ node-key="id"
+ :check-strictly="!form.menuCheckStrictly"
+ empty-text="鍔犺浇涓紝璇风◢鍊�"
+ :props="{ label: 'label', children: 'children' }"
+ ></el-tree>
+ </el-form-item>
+ <el-form-item label="澶囨敞">
+ <el-input v-model="form.remark" type="textarea" placeholder="璇疯緭鍏ュ唴瀹�"></el-input>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitForm">纭� 瀹�</el-button>
+ <el-button @click="cancel">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
- <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
- <el-dialog :title="title" v-model="openDataScope" width="500px" append-to-body>
- <el-form :model="form" label-width="80px">
- <el-form-item label="瑙掕壊鍚嶇О">
- <el-input v-model="form.roleName" :disabled="true" />
- </el-form-item>
- <el-form-item label="鏉冮檺瀛楃">
- <el-input v-model="form.roleKey" :disabled="true" />
- </el-form-item>
- <el-form-item label="鏉冮檺鑼冨洿">
- <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
- <el-option
- v-for="item in dataScopeOptions"
- :key="item.value"
- :label="item.label"
- :value="item.value"
- ></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鏁版嵁鏉冮檺" v-show="form.dataScope == 2">
- <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">灞曞紑/鎶樺彔</el-checkbox>
- <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
- <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
- <el-tree
- class="tree-border"
- :data="deptOptions"
- show-checkbox
- default-expand-all
- ref="deptRef"
- node-key="id"
- :check-strictly="!form.deptCheckStrictly"
- empty-text="鍔犺浇涓紝璇风◢鍊�"
- :props="{ label: 'label', children: 'children' }"
- ></el-tree>
- </el-form-item>
- </el-form>
- <template #footer>
- <div class="dialog-footer">
- <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
- <el-button @click="cancelDataScope">鍙� 娑�</el-button>
- </div>
- </template>
- </el-dialog>
- </div>
+ <!-- 鍒嗛厤瑙掕壊鏁版嵁鏉冮檺瀵硅瘽妗� -->
+ <el-dialog v-model="openDataScope" :title="dialog.title" width="500px" append-to-body>
+ <el-form ref="dataScopeRef" :model="form" label-width="80px">
+ <el-form-item label="瑙掕壊鍚嶇О">
+ <el-input v-model="form.roleName" :disabled="true" />
+ </el-form-item>
+ <el-form-item label="鏉冮檺瀛楃">
+ <el-input v-model="form.roleKey" :disabled="true" />
+ </el-form-item>
+ <el-form-item label="鏉冮檺鑼冨洿">
+ <el-select v-model="form.dataScope" @change="dataScopeSelectChange">
+ <el-option v-for="item in dataScopeOptions" :key="item.value" :label="item.label" :value="item.value"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item v-show="form.dataScope === '2'" label="鏁版嵁鏉冮檺">
+ <el-checkbox v-model="deptExpand" @change="handleCheckedTreeExpand($event, 'dept')">灞曞紑/鎶樺彔</el-checkbox>
+ <el-checkbox v-model="deptNodeAll" @change="handleCheckedTreeNodeAll($event, 'dept')">鍏ㄩ��/鍏ㄤ笉閫�</el-checkbox>
+ <el-checkbox v-model="form.deptCheckStrictly" @change="handleCheckedTreeConnect($event, 'dept')">鐖跺瓙鑱斿姩</el-checkbox>
+ <el-tree
+ ref="deptRef"
+ class="tree-border"
+ :data="deptOptions"
+ show-checkbox
+ default-expand-all
+ node-key="id"
+ :check-strictly="!form.deptCheckStrictly"
+ empty-text="鍔犺浇涓紝璇风◢鍊�"
+ :props="{ label: 'label', children: 'children' }"
+ ></el-tree>
+ </el-form-item>
+ </el-form>
+ <template #footer>
+ <div class="dialog-footer">
+ <el-button type="primary" @click="submitDataScope">纭� 瀹�</el-button>
+ <el-button @click="cancelDataScope">鍙� 娑�</el-button>
+ </div>
+ </template>
+ </el-dialog>
+ </div>
</template>
-<script setup name="Role">
-import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from "@/api/system/role";
-import { roleMenuTreeselect, treeselect as menuTreeselect } from "@/api/system/menu";
+<script setup name="Role" lang="ts">
+import { addRole, changeRoleStatus, dataScope, delRole, getRole, listRole, updateRole, deptTreeSelect } from '@/api/system/role';
+import { roleMenuTreeselect, treeselect as menuTreeselect } from '@/api/system/menu/index';
+import { RoleVO, RoleForm, RoleQuery, DeptTreeOption } from '@/api/system/role/types';
+import { MenuTreeOption, RoleMenuTree } from '@/api/system/menu/types';
const router = useRouter();
-const { proxy } = getCurrentInstance();
-const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const { proxy } = getCurrentInstance() as ComponentInternalInstance;
+const { sys_normal_disable } = toRefs<any>(proxy?.useDict('sys_normal_disable'));
-const roleList = ref([]);
-const open = ref(false);
+const roleList = ref<RoleVO[]>();
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 dateRange = ref([]);
-const menuOptions = ref([]);
+const dateRange = ref<[DateModelType, DateModelType]>(['', '']);
+const menuOptions = ref<MenuTreeOption[]>([]);
const menuExpand = ref(false);
const menuNodeAll = ref(false);
const deptExpand = ref(true);
const deptNodeAll = ref(false);
-const deptOptions = ref([]);
+const deptOptions = ref<DeptTreeOption[]>([]);
const openDataScope = ref(false);
-const menuRef = ref(null);
-const deptRef = ref(null);
/** 鏁版嵁鑼冨洿閫夐」*/
const dataScopeOptions = ref([
- { value: "1", label: "鍏ㄩ儴鏁版嵁鏉冮檺" },
- { value: "2", label: "鑷畾鏁版嵁鏉冮檺" },
- { value: "3", label: "鏈儴闂ㄦ暟鎹潈闄�" },
- { value: "4", label: "鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺" },
- { value: "5", label: "浠呮湰浜烘暟鎹潈闄�" }
+ { value: '1', label: '鍏ㄩ儴鏁版嵁鏉冮檺' },
+ { value: '2', label: '鑷畾鏁版嵁鏉冮檺' },
+ { value: '3', label: '鏈儴闂ㄦ暟鎹潈闄�' },
+ { value: '4', label: '鏈儴闂ㄥ強浠ヤ笅鏁版嵁鏉冮檺' },
+ { value: '5', label: '浠呮湰浜烘暟鎹潈闄�' },
+ { value: '6', label: '閮ㄩ棬鍙婁互涓嬫垨鏈汉鏁版嵁鏉冮檺' }
]);
-const data = reactive({
- form: {},
+const queryFormRef = ref<ElFormInstance>();
+const roleFormRef = ref<ElFormInstance>();
+const dataScopeRef = ref<ElFormInstance>();
+const menuRef = ref<ElTreeInstance>();
+const deptRef = ref<ElTreeInstance>();
+
+const initForm: RoleForm = {
+ roleId: undefined,
+ roleSort: 1,
+ status: '0',
+ roleName: '',
+ roleKey: '',
+ menuCheckStrictly: true,
+ deptCheckStrictly: true,
+ remark: '',
+ dataScope: '1',
+ menuIds: [],
+ deptIds: []
+};
+
+const data = reactive<PageData<RoleForm, RoleQuery>>({
+ form: { ...initForm },
queryParams: {
pageNum: 1,
pageSize: 10,
- roleName: undefined,
- roleKey: undefined,
- status: undefined
+ roleName: '',
+ roleKey: '',
+ status: ''
},
rules: {
- roleName: [{ required: true, message: "瑙掕壊鍚嶇О涓嶈兘涓虹┖", trigger: "blur" }],
- roleKey: [{ required: true, message: "鏉冮檺瀛楃涓嶈兘涓虹┖", trigger: "blur" }],
- roleSort: [{ required: true, message: "瑙掕壊椤哄簭涓嶈兘涓虹┖", trigger: "blur" }]
- },
+ roleName: [{ required: true, message: '瑙掕壊鍚嶇О涓嶈兘涓虹┖', trigger: 'blur' }],
+ roleKey: [{ required: true, message: '鏉冮檺瀛楃涓嶈兘涓虹┖', trigger: 'blur' }],
+ roleSort: [{ required: true, message: '瑙掕壊椤哄簭涓嶈兘涓虹┖', trigger: 'blur' }]
+ }
+});
+const { form, queryParams, rules } = toRefs(data);
+
+const dialog = reactive<DialogOption>({
+ visible: false,
+ title: ''
});
-const { queryParams, form, rules } = toRefs(data);
-
-/** 鏌ヨ瑙掕壊鍒楄〃 */
-function getList() {
+/**
+ * 鏌ヨ瑙掕壊鍒楄〃
+ */
+const getList = () => {
loading.value = true;
- listRole(proxy.addDateRange(queryParams.value, dateRange.value)).then(response => {
- roleList.value = response.rows;
- total.value = response.total;
+ listRole(proxy?.addDateRange(queryParams.value, dateRange.value)).then((res) => {
+ roleList.value = res.rows;
+ total.value = res.total;
loading.value = false;
});
-}
-/** 鎼滅储鎸夐挳鎿嶄綔 */
-function handleQuery() {
+};
+
+/**
+ * 鎼滅储鎸夐挳鎿嶄綔
+ */
+const handleQuery = () => {
queryParams.value.pageNum = 1;
getList();
-}
-/** 閲嶇疆鎸夐挳鎿嶄綔 */
-function resetQuery() {
- dateRange.value = [];
- proxy.resetForm("queryRef");
+};
+
+/** 閲嶇疆 */
+const resetQuery = () => {
+ dateRange.value = ['', ''];
+ queryFormRef.value?.resetFields();
handleQuery();
-}
-/** 鍒犻櫎鎸夐挳鎿嶄綔 */
-function handleDelete(row) {
- const roleIds = row.roleId || ids.value;
- proxy.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�"' + roleIds + '"鐨勬暟鎹」?').then(function () {
- return delRole(roleIds);
- }).then(() => {
- getList();
- proxy.$modal.msgSuccess("鍒犻櫎鎴愬姛");
- }).catch(() => {});
-}
+};
+/**鍒犻櫎鎸夐挳鎿嶄綔 */
+const handleDelete = async (row?: RoleVO) => {
+ const roleids = row?.roleId || ids.value;
+ await proxy?.$modal.confirm('鏄惁纭鍒犻櫎瑙掕壊缂栧彿涓�' + roleids + '鏁版嵁椤圭洰');
+ await delRole(roleids);
+ getList();
+ proxy?.$modal.msgSuccess('鍒犻櫎鎴愬姛');
+};
+
/** 瀵煎嚭鎸夐挳鎿嶄綔 */
-function handleExport() {
- proxy.download("system/role/export", {
- ...queryParams.value,
- }, `role_${new Date().getTime()}.xlsx`);
-}
+const handleExport = () => {
+ proxy?.download(
+ 'system/role/export',
+ {
+ ...queryParams.value
+ },
+ `role_${new Date().getTime()}.xlsx`
+ );
+};
/** 澶氶�夋閫変腑鏁版嵁 */
-function handleSelectionChange(selection) {
- ids.value = selection.map(item => item.roleId);
+const handleSelectionChange = (selection: RoleVO[]) => {
+ ids.value = selection.map((item: RoleVO) => item.roleId);
single.value = selection.length != 1;
multiple.value = !selection.length;
-}
+};
+
/** 瑙掕壊鐘舵�佷慨鏀� */
-function handleStatusChange(row) {
- let text = row.status === "0" ? "鍚敤" : "鍋滅敤";
- proxy.$modal.confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚�?').then(function () {
- return changeRoleStatus(row.roleId, row.status);
- }).then(() => {
- proxy.$modal.msgSuccess(text + "鎴愬姛");
- }).catch(function () {
- row.status = row.status === "0" ? "1" : "0";
- });
-}
-/** 鏇村鎿嶄綔 */
-function handleCommand(command, row) {
- switch (command) {
- case "handleDataScope":
- handleDataScope(row);
- break;
- case "handleAuthUser":
- handleAuthUser(row);
- break;
- default:
- break;
+const handleStatusChange = async (row: RoleVO) => {
+ let text = row.status === '0' ? '鍚敤' : '鍋滅敤';
+ try {
+ await proxy?.$modal.confirm('纭瑕�"' + text + '""' + row.roleName + '"瑙掕壊鍚�?');
+ await changeRoleStatus(row.roleId, row.status);
+ proxy?.$modal.msgSuccess(text + '鎴愬姛');
+ } catch {
+ row.status = row.status === '0' ? '1' : '0';
}
-}
+};
+
/** 鍒嗛厤鐢ㄦ埛 */
-function handleAuthUser(row) {
- router.push("/system/role-auth/user/" + row.roleId);
-}
+const handleAuthUser = (row: RoleVO) => {
+ router.push('/system/role-auth/user/' + row.roleId);
+};
+
/** 鏌ヨ鑿滃崟鏍戠粨鏋� */
-function getMenuTreeselect() {
- menuTreeselect().then(response => {
- menuOptions.value = response.data;
- });
-}
+const getMenuTreeselect = async () => {
+ const res = await menuTreeselect();
+ menuOptions.value = res.data;
+};
/** 鎵�鏈夐儴闂ㄨ妭鐐规暟鎹� */
-function getDeptAllCheckedKeys() {
+const getDeptAllCheckedKeys = (): any => {
// 鐩墠琚�変腑鐨勯儴闂ㄨ妭鐐�
- let checkedKeys = deptRef.value.getCheckedKeys();
+ let checkedKeys = deptRef.value?.getCheckedKeys();
// 鍗婇�変腑鐨勯儴闂ㄨ妭鐐�
- let halfCheckedKeys = deptRef.value.getHalfCheckedKeys();
- checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
- return checkedKeys;
-}
-/** 閲嶇疆鏂板鐨勮〃鍗曚互鍙婂叾浠栨暟鎹� */
-function reset() {
- if (menuRef.value != undefined) {
- menuRef.value.setCheckedKeys([]);
+ let halfCheckedKeys = deptRef.value?.getHalfCheckedKeys();
+ if (halfCheckedKeys) {
+ checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
}
+ return checkedKeys;
+};
+/** 閲嶇疆鏂板鐨勮〃鍗曚互鍙婂叾浠栨暟鎹� */
+const reset = () => {
+ menuRef.value?.setCheckedKeys([]);
menuExpand.value = false;
menuNodeAll.value = false;
deptExpand.value = true;
deptNodeAll.value = false;
- form.value = {
- roleId: undefined,
- roleName: undefined,
- roleKey: undefined,
- roleSort: 0,
- status: "0",
- menuIds: [],
- deptIds: [],
- menuCheckStrictly: true,
- deptCheckStrictly: true,
- remark: undefined
- };
- proxy.resetForm("roleRef");
-}
+ form.value = { ...initForm };
+ roleFormRef.value?.resetFields();
+};
+
/** 娣诲姞瑙掕壊 */
-function handleAdd() {
+const handleAdd = () => {
reset();
getMenuTreeselect();
- open.value = true;
- title.value = "娣诲姞瑙掕壊";
-}
+ dialog.visible = true;
+ dialog.title = '娣诲姞瑙掕壊';
+};
/** 淇敼瑙掕壊 */
-function handleUpdate(row) {
+const handleUpdate = async (row?: RoleVO) => {
reset();
- const roleId = row.roleId || ids.value;
- const roleMenu = getRoleMenuTreeselect(roleId);
- getRole(roleId).then(response => {
- form.value = response.data;
- form.value.roleSort = Number(form.value.roleSort);
- open.value = true;
+ const roleId = row?.roleId || ids.value[0];
+ const { data } = await getRole(roleId);
+ Object.assign(form.value, data);
+ form.value.roleSort = Number(form.value.roleSort);
+ const res = await getRoleMenuTreeselect(roleId);
+ dialog.title = '淇敼瑙掕壊';
+ dialog.visible = true;
+ res.checkedKeys.forEach((v) => {
nextTick(() => {
- roleMenu.then((res) => {
- let checkedKeys = res.data.checkedKeys;
- checkedKeys.forEach((v) => {
- nextTick(() => {
- menuRef.value.setChecked(v, true, false);
- });
- });
- });
+ menuRef.value?.setChecked(v, true, false);
});
- title.value = "淇敼瑙掕壊";
});
-}
+};
/** 鏍规嵁瑙掕壊ID鏌ヨ鑿滃崟鏍戠粨鏋� */
-function getRoleMenuTreeselect(roleId) {
- return roleMenuTreeselect(roleId).then(response => {
- menuOptions.value = response.data.menus;
- return response;
+const getRoleMenuTreeselect = (roleId: string | number) => {
+ return roleMenuTreeselect(roleId).then((res): RoleMenuTree => {
+ menuOptions.value = res.data.menus;
+ return res.data;
});
-}
+};
/** 鏍规嵁瑙掕壊ID鏌ヨ閮ㄩ棬鏍戠粨鏋� */
-function getDeptTree(roleId) {
- return deptTreeSelect(roleId).then(response => {
- deptOptions.value = response.data.depts;
- return response;
- });
-}
+const getRoleDeptTreeSelect = async (roleId: string | number) => {
+ const res = await deptTreeSelect(roleId);
+ deptOptions.value = res.data.depts;
+ return res.data;
+};
/** 鏍戞潈闄愶紙灞曞紑/鎶樺彔锛�*/
-function handleCheckedTreeExpand(value, type) {
- if (type == "menu") {
+const handleCheckedTreeExpand = (value: boolean, type: string) => {
+ if (type == 'menu') {
let treeList = menuOptions.value;
for (let i = 0; i < treeList.length; i++) {
- menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
- }
- } else if (type == "dept") {
- let treeList = deptOptions.value;
- for (let i = 0; i < treeList.length; i++) {
- deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
- }
- }
-}
-/** 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級 */
-function handleCheckedTreeNodeAll(value, type) {
- if (type == "menu") {
- menuRef.value.setCheckedNodes(value ? menuOptions.value : []);
- } else if (type == "dept") {
- deptRef.value.setCheckedNodes(value ? deptOptions.value : []);
- }
-}
-/** 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛� */
-function handleCheckedTreeConnect(value, type) {
- if (type == "menu") {
- form.value.menuCheckStrictly = value ? true : false;
- } else if (type == "dept") {
- form.value.deptCheckStrictly = value ? true : false;
- }
-}
-/** 鎵�鏈夎彍鍗曡妭鐐规暟鎹� */
-function getMenuAllCheckedKeys() {
- // 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
- let checkedKeys = menuRef.value.getCheckedKeys();
- // 鍗婇�変腑鐨勮彍鍗曡妭鐐�
- let halfCheckedKeys = menuRef.value.getHalfCheckedKeys();
- checkedKeys.unshift.apply(checkedKeys, halfCheckedKeys);
- return checkedKeys;
-}
-/** 鎻愪氦鎸夐挳 */
-function submitForm() {
- proxy.$refs["roleRef"].validate(valid => {
- if (valid) {
- if (form.value.roleId != undefined) {
- form.value.menuIds = getMenuAllCheckedKeys();
- updateRole(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- open.value = false;
- getList();
- });
- } else {
- form.value.menuIds = getMenuAllCheckedKeys();
- addRole(form.value).then(response => {
- proxy.$modal.msgSuccess("鏂板鎴愬姛");
- open.value = false;
- getList();
- });
+ if (menuRef.value) {
+ menuRef.value.store.nodesMap[treeList[i].id].expanded = value;
}
}
- });
-}
-/** 鍙栨秷鎸夐挳 */
-function cancel() {
- open.value = false;
- reset();
-}
-/** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
-function dataScopeSelectChange(value) {
- if (value !== "2") {
- deptRef.value.setCheckedKeys([]);
+ } else if (type == 'dept') {
+ let treeList = deptOptions.value;
+ for (let i = 0; i < treeList.length; i++) {
+ if (deptRef.value) {
+ deptRef.value.store.nodesMap[treeList[i].id].expanded = value;
+ }
+ }
}
-}
-/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
-function handleDataScope(row) {
- reset();
- const deptTreeSelect = getDeptTree(row.roleId);
- getRole(row.roleId).then(response => {
- form.value = response.data;
- openDataScope.value = true;
- nextTick(() => {
- deptTreeSelect.then(res => {
- nextTick(() => {
- if (deptRef.value) {
- deptRef.value.setCheckedKeys(res.data.checkedKeys);
- }
- });
- });
- });
- title.value = "鍒嗛厤鏁版嵁鏉冮檺";
- });
-}
-/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
-function submitDataScope() {
- if (form.value.roleId != undefined) {
- form.value.deptIds = getDeptAllCheckedKeys();
- dataScope(form.value).then(response => {
- proxy.$modal.msgSuccess("淇敼鎴愬姛");
- openDataScope.value = false;
+};
+/** 鏍戞潈闄愶紙鍏ㄩ��/鍏ㄤ笉閫夛級 */
+const handleCheckedTreeNodeAll = (value: any, type: string) => {
+ if (type == 'menu') {
+ menuRef.value?.setCheckedNodes(value ? (menuOptions.value as any) : []);
+ } else if (type == 'dept') {
+ deptRef.value?.setCheckedNodes(value ? (deptOptions.value as any) : []);
+ }
+};
+/** 鏍戞潈闄愶紙鐖跺瓙鑱斿姩锛� */
+const handleCheckedTreeConnect = (value: any, type: string) => {
+ if (type == 'menu') {
+ form.value.menuCheckStrictly = value;
+ } else if (type == 'dept') {
+ form.value.deptCheckStrictly = value;
+ }
+};
+/** 鎵�鏈夎彍鍗曡妭鐐规暟鎹� */
+const getMenuAllCheckedKeys = (): any => {
+ // 鐩墠琚�変腑鐨勮彍鍗曡妭鐐�
+ let checkedKeys = menuRef.value?.getCheckedKeys();
+ // 鍗婇�変腑鐨勮彍鍗曡妭鐐�
+ let halfCheckedKeys = menuRef.value?.getHalfCheckedKeys();
+ if (halfCheckedKeys) {
+ checkedKeys?.unshift.apply(checkedKeys, halfCheckedKeys);
+ }
+ return checkedKeys;
+};
+/** 鎻愪氦鎸夐挳 */
+const submitForm = () => {
+ roleFormRef.value?.validate(async (valid: boolean) => {
+ if (valid) {
+ form.value.menuIds = getMenuAllCheckedKeys();
+ form.value.roleId ? await updateRole(form.value) : await addRole(form.value);
+ proxy?.$modal.msgSuccess('鎿嶄綔鎴愬姛');
+ dialog.visible = false;
getList();
- });
- }
-}
-/** 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級*/
-function cancelDataScope() {
- openDataScope.value = false;
+ }
+ });
+};
+/** 鍙栨秷鎸夐挳 */
+const cancel = () => {
reset();
-}
+ dialog.visible = false;
+};
+/** 閫夋嫨瑙掕壊鏉冮檺鑼冨洿瑙﹀彂 */
+const dataScopeSelectChange = (value: string) => {
+ if (value !== '2') {
+ deptRef.value?.setCheckedKeys([]);
+ }
+};
+/** 鍒嗛厤鏁版嵁鏉冮檺鎿嶄綔 */
+const handleDataScope = async (row: RoleVO) => {
+ const response = await getRole(row.roleId);
+ Object.assign(form.value, response.data);
+ const res = await getRoleDeptTreeSelect(row.roleId);
+ openDataScope.value = true;
+ dialog.title = '鍒嗛厤鏁版嵁鏉冮檺';
+ await nextTick(() => {
+ deptRef.value?.setCheckedKeys(res.checkedKeys);
+ });
+};
+/** 鎻愪氦鎸夐挳锛堟暟鎹潈闄愶級 */
+const submitDataScope = async () => {
+ if (form.value.roleId) {
+ form.value.deptIds = getDeptAllCheckedKeys();
+ await dataScope(form.value);
+ proxy?.$modal.msgSuccess('淇敼鎴愬姛');
+ openDataScope.value = false;
+ getList();
+ }
+};
+/** 鍙栨秷鎸夐挳锛堟暟鎹潈闄愶級*/
+const cancelDataScope = () => {
+ dataScopeRef.value?.resetFields();
+ form.value = { ...initForm };
+ openDataScope.value = false;
+};
-getList();
+onMounted(() => {
+ getList();
+});
</script>
--
Gitblit v1.9.3