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/system/client.vue |   24 +++++++++++++++++-------
 1 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/client.vue b/Source/UBCS-WEB/src/views/system/client.vue
index a630f6f..b1bd0b8 100644
--- a/Source/UBCS-WEB/src/views/system/client.vue
+++ b/Source/UBCS-WEB/src/views/system/client.vue
@@ -13,17 +13,18 @@
                :before-open="beforeOpen"
                @search-change="searchChange"
                @search-reset="searchReset"
+               @row-click="clickRowChange"
                @selection-change="selectionChange"
                @current-change="currentChange"
                @size-change="sizeChange"
                @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>
@@ -49,7 +50,8 @@
         selectionList: [],
         option: {
           height: 'auto',
-          calcHeight: 30,
+          columnBtn:false,
+          calcHeight: 20,
           tip: false,
           searchShow: true,
           searchMenuSpan: 6,
@@ -58,6 +60,7 @@
           viewBtn: true,
           selection: true,
           dialogClickModal: false,
+          highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
           column: [
             {
               label: "搴旂敤id",
@@ -201,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() {
@@ -275,8 +278,15 @@
         this.onLoad(this.page, params);
         done();
       },
+      clickRowChange(row){
+        this.$refs.crud.toggleSelection();
+        this.selectionList = row;
+        this.$refs.crud.setCurrentRow(row);
+        this.$refs.crud.toggleRowSelection(row); //閫変腑褰撳墠琛�
+      },
       selectionChange(list) {
         this.selectionList = list;
+        this.$refs.crud.setCurrentRow(this.selectionList[list.length-1]);
       },
       selectionClear() {
         this.selectionList = [];

--
Gitblit v1.9.3