From d7754789bf22227e59eeaae728da1c8a54f4c823 Mon Sep 17 00:00:00 2001
From: easy <1358086367@qq.com>
Date: Thu, 16 Feb 2023 14:47:40 +0800
Subject: [PATCH] =?UTF-8?q?update:=20=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=8C=89=E9=92=AE=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/User/components/EditUserDialog.vue | 32 ++++---
 src/views/system/User/index.vue               | 93 +++++++++++++++++--
 2 files changed, 102 insertions(+), 23 deletions(-)

diff --git a/src/views/system/User/components/EditUserDialog.vue b/src/views/system/User/components/EditUserDialog.vue
index aabc2898..52487cd8 100644
--- a/src/views/system/User/components/EditUserDialog.vue
+++ b/src/views/system/User/components/EditUserDialog.vue
@@ -110,11 +110,13 @@
                             placeholder="请选择角色"
                             :options="form.roleOptions"
                         ></a-select>
-                        <span
-                            class="add-item"
+                        <PermissionButton
+                            :uhasPermission="`${rolePermission}:update`"
                             @click="form.clickAddItem('roleIdList', 'Role')"
-                            ><AIcon type="PlusOutlined"
-                        /></span>
+                            class="add-item"
+                        >
+                            <AIcon type="PlusOutlined" />
+                        </PermissionButton>
                     </a-form-item>
                 </a-col>
                 <a-col :span="12">
@@ -132,13 +134,13 @@
                                 {{ name }}
                             </template>
                         </a-tree-select>
-                        <span
+                        <PermissionButton
+                            :uhasPermission="`${deptPermission}:update`"
+                            @click="form.clickAddItem('roleIdList', 'Role')"
                             class="add-item"
-                            @click="
-                                form.clickAddItem('orgIdList', 'Department')
-                            "
-                            ><AIcon type="PlusOutlined"
-                        /></span>
+                        >
+                            <AIcon type="PlusOutlined" />
+                        </PermissionButton>
                     </a-form-item>
                 </a-col>
             </a-row>
@@ -186,7 +188,8 @@
 </template>
 
 <script setup lang="ts">
-import { FormInstance, message, TreeProps } from 'ant-design-vue';
+import PermissionButton from '@/components/PermissionButton/index.vue';
+import { FormInstance, message } from 'ant-design-vue';
 // import Progress from './Progress.vue';
 import {
     validateField_api,
@@ -201,6 +204,9 @@ import { Rule } from 'ant-design-vue/es/form';
 import { DefaultOptionType } from 'ant-design-vue/es/vc-tree-select/TreeSelect';
 import { AxiosResponse } from 'axios';
 
+const deptPermission = 'system/Department';
+const rolePermission = 'system/Role';
+
 const emits = defineEmits(['confirm']);
 // 弹窗相关
 const dialog = reactive({
@@ -339,7 +345,7 @@ const form = reactive({
                 return;
         }
         console.log(params);
-        
+
         api(params).then(() => {
             message.success('操作成功');
             cb && cb();
@@ -407,7 +413,7 @@ type optionType = {
                 .ant-select {
                     flex: 1;
                 }
-                .add-item {
+                .ant-btn {
                     width: 32px;
                     height: 32px;
                     border: 1px solid #1d39c4;
diff --git a/src/views/system/User/index.vue b/src/views/system/User/index.vue
index 63078f1c..047af707 100644
--- a/src/views/system/User/index.vue
+++ b/src/views/system/User/index.vue
@@ -11,12 +11,19 @@
             :defaultParams="{ sorts: [{ name: 'createTime', order: 'desc' }] }"
         >
             <template #headerTitle>
-                <a-button
+                <!-- <a-button
                     type="primary"
                     @click="table.openDialog('add')"
                     style="margin-right: 10px"
                     ><AIcon type="PlusOutlined" />新增</a-button
+                > -->
+                <PermissionButton
+                    :uhasPermission="`${permission}:add`"
+                    type="primary"
+                    @click="table.openDialog('add')"
                 >
+                    <AIcon type="PlusOutlined" />新增
+                </PermissionButton>
             </template>
             <template #type="slotProps">
                 {{ slotProps.type.name }}
@@ -33,7 +40,7 @@
             </template>
             <template #action="slotProps">
                 <a-space :size="16">
-                    <a-tooltip>
+                    <!-- <a-tooltip>
                         <template #title>编辑</template>
                         <a-button
                             style="padding: 0"
@@ -42,9 +49,8 @@
                         >
                             <AIcon type="EditOutlined" />
                         </a-button>
-                    </a-tooltip>
-
-                    <a-popconfirm
+                    </a-tooltip> -->
+                    <!-- <a-popconfirm
                         :title="`确定${slotProps.status ? '禁用' : '启用'}吗？`"
                         ok-text="确定"
                         cancel-text="取消"
@@ -59,8 +65,8 @@
                                 <play-circle-outlined v-else />
                             </a-button>
                         </a-tooltip>
-                    </a-popconfirm>
-                    <a-tooltip>
+                    </a-popconfirm> -->
+                    <!-- <a-tooltip>
                         <template #title>重置密码</template>
                         <a-button
                             style="padding: 0"
@@ -69,8 +75,8 @@
                         >
                             <AIcon type="icon-zhongzhimima" />
                         </a-button>
-                    </a-tooltip>
-                    <a-popconfirm
+                    </a-tooltip> -->
+                    <!-- <a-popconfirm
                         title="确认删除"
                         ok-text="确定"
                         cancel-text="取消"
@@ -89,7 +95,60 @@
                                 <AIcon type="DeleteOutlined" />
                             </a-button>
                         </a-tooltip>
-                    </a-popconfirm>
+                    </a-popconfirm> -->
+
+                    <PermissionButton
+                        :uhasPermission="`${permission}:update`"
+                        type="link"
+                        :tooltip="{
+                            title: '编辑',
+                        }"
+                        @click="table.openDialog('edit')"
+                    >
+                        <AIcon type="EditOutlined" />
+                    </PermissionButton>
+                    <PermissionButton
+                        :uhasPermission="`${permission}:action`"
+                        type="link"
+                        :tooltip="{
+                            title: `${slotProps.status ? '禁用' : '启用'}`,
+                        }"
+                        :popConfirm="{
+                            title: `确定${
+                                slotProps.status ? '禁用' : '启用'
+                            }吗？`,
+                            onConfirm: () => table.changeStatus(slotProps),
+                        }"
+                    >
+                        <stop-outlined v-if="slotProps.status" />
+                        <play-circle-outlined v-else />
+                    </PermissionButton>
+                    <PermissionButton
+                        :uhasPermission="`${permission}:update`"
+                        type="link"
+                        :tooltip="{
+                            title: '重置密码',
+                        }"
+                        @click="table.openDialog('reset', slotProps)"
+                    >
+                        <AIcon type="icon-zhongzhimima" />
+                    </PermissionButton>
+                    <PermissionButton
+                        type="link"
+                        :uhasPermission="`${permission}:delete`"
+                        :tooltip="{
+                            title: slotProps.status
+                                ? '请先禁用，再删除'
+                                : '删除',
+                        }"
+                        :popConfirm="{
+                            title: `确认删除`,
+                            onConfirm: () => table.clickDel(slotProps),
+                        }"
+                        :disabled="slotProps.status"
+                    > 
+                        <AIcon type="DeleteOutlined" />
+                    </PermissionButton>
                 </a-space>
             </template>
         </JTable>
@@ -101,6 +160,7 @@
 </template>
 
 <script setup lang="ts" name="UserMange">
+import PermissionButton from '@/components/PermissionButton/index.vue';
 import EditUserDialog from './components/EditUserDialog.vue';
 import {
     getUserType_api,
@@ -110,6 +170,9 @@ import {
 } from '@/api/system/user';
 import { StopOutlined, PlayCircleOutlined } from '@ant-design/icons-vue';
 import { message } from 'ant-design-vue';
+
+const permission = 'system/User';
+
 const query = {
     columns: [
         {
@@ -292,5 +355,15 @@ type modalType = '' | 'add' | 'edit' | 'reset';
 <style lang="less" scoped>
 .user-container {
     padding: 24px;
+
+    :deep(.ant-table-tbody) {
+        .ant-table-cell {
+            .ant-space-item {
+                .ant-btn-link {
+                    padding: 0;
+                }
+            }
+        }
+    }
 }
 </style>