From 2dfc8dc4bcd3d3cd4aed1b6054e073e140eba9c8 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 19 May 2025 16:05:50 +0800
Subject: [PATCH] Merge branch 'master' into jiangwu

---
 src/views/system/sysConfig.vue |   49 ++++++++++++++++++++++++++-----------------------
 1 files changed, 26 insertions(+), 23 deletions(-)

diff --git a/src/views/system/sysConfig.vue b/src/views/system/sysConfig.vue
index af3e8f5..65dfc20 100644
--- a/src/views/system/sysConfig.vue
+++ b/src/views/system/sysConfig.vue
@@ -24,29 +24,29 @@
         <el-button 
           type="primary" 
           icon="el-icon-plus"
-          v-if="permission.sysConfig_add" 
+          v-if="permissionList.addBtn" 
           @click="$refs.crud.rowAdd()"
-        >新 增</el-button>
+        >新增</el-button>
         <el-button
           type="danger"
-          icon="el-icon-delete"
           plain
-          v-if="permission.sysConfig_delete"
+          icon="el-icon-delete"
+          v-if="permissionList.delBtn"
           @click="handleDelete"
-        >删 除</el-button>
+        >删除</el-button>
       </template>
-      <template #menu="scope">
+      <template #menu="{ row, index }">
         <el-button
           type="text"
           icon="el-icon-view"
-          v-if="permission.sysConfig_view"
-          @click.stop="$refs.crud.rowView(scope.row,scope.index)"
+          v-if="permissionList.viewBtn"
+          @click.stop="$refs.crud.rowView(row, index)"
         >查看</el-button>
         <el-button
           type="text"
           icon="el-icon-edit"
-          v-if="permission.sysConfig_edit"
-          @click.stop="$refs.crud.rowEdit(scope.row,scope.index)"
+          v-if="permissionList.editBtn"
+          @click.stop="$refs.crud.rowEdit(row, index)"
         >编辑</el-button>
       </template>
     </avue-crud>
@@ -78,7 +78,11 @@
         searchMenuSpan: 6,
         border: true,
         index: true,
-        viewBtn: true,
+        // 禁用默认按钮
+        addBtn: false,
+        editBtn: false,
+        viewBtn: false,
+        delBtn: false,
         selection: true,
         excelBtn: true,
         dialogClickModal: false,
@@ -101,9 +105,9 @@
           {
             label: '所属单位',
             prop: 'deptName',
-            addDisplay:false,
-            editDisplay:false,
-            viewDisplay:false,
+            addDisplay: false,
+            editDisplay: false,
+            viewDisplay: false,
             rules: [
               {
                 required: true,
@@ -117,13 +121,12 @@
             prop: 'deptId',
             hide: true,
             type: 'tree',
-            defaultExpandAll:true,
+            defaultExpandAll: true,
             dicUrl: '/blade-system/dept/getTree',
             props: {
               label: 'name',
               value: 'id',
             },
-            // dataType: 'number',
             rules: [
               {
                 required: true,
@@ -142,8 +145,8 @@
                 trigger: 'blur',
               },
             ],
-            span:24,
-            type:'textarea'
+            span: 24,
+            type: 'textarea'
           },
         ],
       },
@@ -154,10 +157,10 @@
     ...mapGetters(['permission']),
     permissionList() {
       return {
-        addBtn: this.validData(this.permission.sysConfig_add, false),
-        viewBtn: this.validData(this.permission.sysConfig_view, false),
-        delBtn: this.validData(this.permission.sysConfig_delete, false),
-        editBtn: this.validData(this.permission.sysConfig_edit, false),
+        addBtn: this.permission.sysConfig_add,
+        viewBtn: this.permission.sysConfig_view,
+        delBtn: this.permission.sysConfig_delete,
+        editBtn: this.permission.sysConfig_edit,
       };
     },
     ids() {
@@ -301,4 +304,4 @@
 };
 </script>
 
-<style></style>
+<style></style>
\ No newline at end of file

--
Gitblit v1.9.3