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 |   55 ++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 34 insertions(+), 21 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/report/reportlist.vue b/Source/UBCS-WEB/src/views/report/reportlist.vue
index b33c12b..461c6f1 100644
--- a/Source/UBCS-WEB/src/views/report/reportlist.vue
+++ b/Source/UBCS-WEB/src/views/report/reportlist.vue
@@ -1,24 +1,26 @@
 <template>
   <basic-container>
     <avue-crud :option="option"
-               :table-loading="loading"
-               :data="data"
-               ref="crud"
-               v-model="form"
-               :page.sync="page"
-               :permission="permissionList"
-               @row-del="rowDel"
-               @search-change="searchChange"
-               @search-reset="searchReset"
-               @selection-change="selectionChange"
-               @current-change="currentChange"
-               @size-change="sizeChange"
-               @refresh-change="refreshChange"
-               @on-load="onLoad">
+      :table-loading="loading"
+      :data="data"
+      ref="crud"
+      v-model="form"
+      :page.sync="page"
+      :permission="permissionList"
+      @row-del="rowDel"
+      @search-change="searchChange"
+      @search-reset="searchReset"
+      @selection-change="selectionChange"
+      @current-change="currentChange"
+      @size-change="sizeChange"
+      @refresh-change="refreshChange"
+      @row-click="clickRowChange"
+      @on-load="onLoad">
       <template slot="menuLeft">
         <el-button type="danger"
                    size="small"
                    icon="el-icon-delete"
+                   v-if="permissionList.delBtn"
                    plain
                    @click="handleDelete">鍒� 闄�
         </el-button>
@@ -29,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
@@ -37,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>
@@ -66,7 +68,8 @@
       },
       option: {
         height: 'auto',
-        calcHeight: 30,
+        calcHeight: 20,
+        columnBtn:false,
         tip: false,
         searchShow: true,
         searchMenuSpan: 6,
@@ -75,6 +78,7 @@
         selection: true,
         viewBtn: true,
         dialogClickModal: false,
+        highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
         column: [
           {
             label: "鏂囦欢鍚�",
@@ -101,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() {
@@ -115,10 +121,10 @@
   },
   methods: {
     handlePreview(name) {
-      this.$router.push({path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=blade-${name}`});
+      this.$router.push({path: `/myiframe/urlPath?name=preview-${name}&src=${this.website.reportUrl}/preview?_u=ubcs-${name}`});
     },
     handleDesign(name) {
-      this.$router.push({path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=blade-${name}`});
+      this.$router.push({path: `/myiframe/urlPath?name=designer-${name}&src=${this.website.reportUrl}/designer?_u=ubcs-${name}`});
     },
     rowDel(row) {
       this.$confirm("纭畾灏嗛�夋嫨鏁版嵁鍒犻櫎?", {
@@ -147,8 +153,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