From afbdf5c7f1ef1d33ae4f48b37c48d6c8ce944935 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=8E=E5=BC=BA?= <1206709430@qq.com>
Date: Thu, 4 Mar 2021 00:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E5=89=8D=E7=AB=AF-=E6=9D=83=E9=99=90=E3=80=81?=
 =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E5=B1=95=E7=A4=BA=E5=AE=8C=E5=96=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 dvadmin-ui/src/main.js                         |  6 ++++++
 dvadmin-ui/src/views/permission/dept/index.vue | 13 +++++++++----
 dvadmin-ui/src/views/permission/menu/index.vue |  7 ++++++-
 dvadmin-ui/src/views/permission/post/index.vue |  7 ++++++-
 dvadmin-ui/src/views/permission/role/index.vue | 13 +++++++++----
 dvadmin-ui/src/views/permission/user/index.vue |  1 +
 dvadmin-ui/src/views/system/config/index.vue   |  6 +++++-
 dvadmin-ui/src/views/system/dict/data.vue      |  7 ++++++-
 dvadmin-ui/src/views/system/dict/index.vue     |  9 +++++++--
 dvadmin-ui/src/views/system/savefile/index.vue |  8 +++++++-
 10 files changed, 62 insertions(+), 15 deletions(-)

diff --git a/dvadmin-ui/src/main.js b/dvadmin-ui/src/main.js
index 5668d91..9e7542a 100755
--- a/dvadmin-ui/src/main.js
+++ b/dvadmin-ui/src/main.js
@@ -31,6 +31,12 @@ Vue.prototype.selectDictLabel = selectDictLabel
 Vue.prototype.selectDictLabels = selectDictLabels
 Vue.prototype.download = download
 Vue.prototype.handleTree = handleTree
+Vue.prototype.hasPermi = function (values) {
+  const permissions = store.getters && store.getters.permissions
+  return  permissions.some(permission => {
+    return "*:*:*" === permission || values.includes(permission)
+  })
+};
 
 Vue.prototype.msgSuccess = function (msg) {
   this.$message({ showClose: true, message: msg, type: "success" });
diff --git a/dvadmin-ui/src/views/permission/dept/index.vue b/dvadmin-ui/src/views/permission/dept/index.vue
index d28ab0d..5c44e90 100755
--- a/dvadmin-ui/src/views/permission/dept/index.vue
+++ b/dvadmin-ui/src/views/permission/dept/index.vue
@@ -47,20 +47,25 @@
       default-expand-all
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
-      <el-table-column prop="deptName" label="部门名称" width="260"></el-table-column>
+      <el-table-column prop="deptName" label="部门名称"></el-table-column>
       <el-table-column prop="orderNum" label="排序" width="200"></el-table-column>
       <el-table-column prop="status" label="状态" :formatter="statusFormat" width="200"></el-table-column>
-      <el-table-column label="更新时间" align="center" prop="update_datetime" width="200">
+      <el-table-column label="更新时间" align="center" prop="update_datetime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.update_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="create_datetime" width="200">
+      <el-table-column label="创建时间" align="center" prop="create_datetime">
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['permission:dept:{id}:put','permission:dept:post','permission:dept:{id}:delete'])"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/dvadmin-ui/src/views/permission/menu/index.vue b/dvadmin-ui/src/views/permission/menu/index.vue
index 819d794..4f80fab 100755
--- a/dvadmin-ui/src/views/permission/menu/index.vue
+++ b/dvadmin-ui/src/views/permission/menu/index.vue
@@ -80,7 +80,12 @@
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['permission:menus:{id}:put', 'permission:menus:post', 'permission:menus:{id}:delete'])"
+      >
         <template slot-scope="scope">
           <el-button size="mini"
                      type="text"
diff --git a/dvadmin-ui/src/views/permission/post/index.vue b/dvadmin-ui/src/views/permission/post/index.vue
index 3e6fdcd..a5cc44c 100755
--- a/dvadmin-ui/src/views/permission/post/index.vue
+++ b/dvadmin-ui/src/views/permission/post/index.vue
@@ -93,7 +93,12 @@
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['permission:post:{id}:put', 'permission:post:{id}:delete'])"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/dvadmin-ui/src/views/permission/role/index.vue b/dvadmin-ui/src/views/permission/role/index.vue
index 51c5d50..1c86893 100755
--- a/dvadmin-ui/src/views/permission/role/index.vue
+++ b/dvadmin-ui/src/views/permission/role/index.vue
@@ -104,8 +104,8 @@
     <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="id" 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="150" />
+      <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" />
+      <el-table-column label="权限字符" prop="roleKey" :show-overflow-tooltip="true" />
       <el-table-column label="显示顺序" prop="roleSort" width="100" />
       <el-table-column label="状态" align="center" width="100">
         <template slot-scope="scope">
@@ -118,12 +118,17 @@
           ></el-switch>
         </template>
       </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="create_datetime" width="180">
+      <el-table-column label="创建时间" align="center" prop="create_datetime" >
         <template slot-scope="scope">
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['permission:role:{id}:put', 'permission:role:{id}:delete'])"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/dvadmin-ui/src/views/permission/user/index.vue b/dvadmin-ui/src/views/permission/user/index.vue
index 1baf865..3b3ed7a 100755
--- a/dvadmin-ui/src/views/permission/user/index.vue
+++ b/dvadmin-ui/src/views/permission/user/index.vue
@@ -164,6 +164,7 @@
             align="center"
             width="160"
             class-name="small-padding fixed-width"
+            v-if="hasPermi(['permission:user:{id}:put','permission:user:{id}:delete','permission:user:resetpwd:put'])"
           >
             <template slot-scope="scope">
               <el-button
diff --git a/dvadmin-ui/src/views/system/config/index.vue b/dvadmin-ui/src/views/system/config/index.vue
index b036ceb..0a5ed4f 100755
--- a/dvadmin-ui/src/views/system/config/index.vue
+++ b/dvadmin-ui/src/views/system/config/index.vue
@@ -107,7 +107,11 @@
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['system:config:{id}:put','system:config:{id}:delete'])">
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/dvadmin-ui/src/views/system/dict/data.vue b/dvadmin-ui/src/views/system/dict/data.vue
index 7a0f8b6..bd460de 100755
--- a/dvadmin-ui/src/views/system/dict/data.vue
+++ b/dvadmin-ui/src/views/system/dict/data.vue
@@ -103,7 +103,12 @@
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['system:dict:type:{id}:put','system:dict:type:{id}:delete'])"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/dvadmin-ui/src/views/system/dict/index.vue b/dvadmin-ui/src/views/system/dict/index.vue
index e242593..0f9cc2e 100755
--- a/dvadmin-ui/src/views/system/dict/index.vue
+++ b/dvadmin-ui/src/views/system/dict/index.vue
@@ -113,7 +113,7 @@
 
     <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="字典编号" align="center" prop="id" />
+      <el-table-column label="字典编号" align="center" prop="id" width="100"/>
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
       <el-table-column label="字典类型" align="center" :show-overflow-tooltip="true">
         <template slot-scope="scope">
@@ -129,7 +129,12 @@
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        v-if="hasPermi(['system:dict:type:{id}:put','system:dict:type:{id}:delete'])"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"
diff --git a/dvadmin-ui/src/views/system/savefile/index.vue b/dvadmin-ui/src/views/system/savefile/index.vue
index b072dc4..c26423e 100755
--- a/dvadmin-ui/src/views/system/savefile/index.vue
+++ b/dvadmin-ui/src/views/system/savefile/index.vue
@@ -79,7 +79,13 @@
           <span>{{ parseTime(scope.row.create_datetime) }}</span>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="130">
+      <el-table-column
+        label="操作"
+        align="center"
+        class-name="small-padding fixed-width"
+        width="130"
+        v-if="hasPermi(['system:clearsavefile:download:post'])"
+      >
         <template slot-scope="scope">
           <el-button
             size="mini"