From f09e05514d9a9e2623cfa73c4de1ffa98bb30bf8 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期二, 23 一月 2024 10:09:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS-WEB/src/views/system/client.vue |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/client.vue b/Source/UBCS-WEB/src/views/system/client.vue
index e80b4ce..b1bd0b8 100644
--- a/Source/UBCS-WEB/src/views/system/client.vue
+++ b/Source/UBCS-WEB/src/views/system/client.vue
@@ -20,11 +20,11 @@
                @refresh-change="refreshChange"
                @on-load="onLoad">
       <template slot="menuLeft">
-        <el-button type="danger"
+        <el-button v-if="permissionList.delBtn"
+                   type="danger"
                    size="small"
                    icon="el-icon-delete"
                    plain
-                   v-if="permission.client_delete"
                    @click="handleDelete">鍒� 闄�
         </el-button>
       </template>
@@ -50,7 +50,8 @@
         selectionList: [],
         option: {
           height: 'auto',
-          calcHeight: 30,
+          columnBtn:false,
+          calcHeight: 20,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -203,10 +204,10 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.client_add),
-          viewBtn: this.vaildData(this.permission.client_view),
-          delBtn: this.vaildData(this.permission.client_delete),
-          editBtn: this.vaildData(this.permission.client_edit)
+          addBtn: this.vaildData(this.permission.client.client_add),
+          viewBtn: this.vaildData(this.permission.client.client_view),
+          delBtn: this.vaildData(this.permission.client.client_delete),
+          editBtn: this.vaildData(this.permission.client.client_edit)
         };
       },
       ids() {

--
Gitblit v1.9.3