From 8d7721c95cc004e3af1493b6289ace05658bb967 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 16 一月 2024 21:59:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/report/reportlist.vue |   14 +++++++++-----
 1 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/report/reportlist.vue b/Source/UBCS-WEB/src/views/report/reportlist.vue
index fe55a5a..461c6f1 100644
--- a/Source/UBCS-WEB/src/views/report/reportlist.vue
+++ b/Source/UBCS-WEB/src/views/report/reportlist.vue
@@ -20,6 +20,7 @@
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
+                   v-if="permissionList.delBtn"
                    plain
                    @click="handleDelete">鍒� 闄�
         </el-button>
@@ -30,7 +31,7 @@
           icon="el-icon-edit-outline"
           size="small"
           @click.stop="handleDesign(scope.row.name)"
-          v-if="userInfo.role_name.includes('admin')"
+          v-if="permissionList.design"
         >璁捐
         </el-button>
         <el-button
@@ -38,7 +39,7 @@
           icon="el-icon-view"
           size="small"
           @click.stop="handlePreview(scope.row.name)"
-          v-if="userInfo.role_name.includes('admin')"
+          v-if="permissionList.preview"
         >棰勮
         </el-button>
       </template>
@@ -67,7 +68,8 @@
       },
       option: {
         height: 'auto',
-        calcHeight: 30,
+        calcHeight: 20,
+        columnBtn:false,
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
@@ -103,8 +105,10 @@
       return {
         addBtn: false,
         viewBtn: false,
-        delBtn: true,
-        editBtn: false
+        delBtn: this.vaildData(this.permission.report_list.report_list_delete,false),
+        editBtn: false,
+        design:this.vaildData(this.permission.report_list.report_list_design,false),
+        preview:this.vaildData(this.permission.report_list.report_list_preview,false),
       };
     },
     ids() {

--
Gitblit v1.9.3