From d9183aa80ae17d36b79dda48c6b1d7fa22a80ee3 Mon Sep 17 00:00:00 2001
From: xiejun <xiejun@vci-tech.com>
Date: 星期三, 22 一月 2025 11:20:41 +0800
Subject: [PATCH] 现场型号代号/人员/组织接口调试

---
 Source/UBCS-WEB/src/views/authority/datascope.vue |   46 +++++++++++++++++++++++++++++++++++-----------
 1 files changed, 35 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/authority/datascope.vue b/Source/UBCS-WEB/src/views/authority/datascope.vue
index d944116..8d585a9 100644
--- a/Source/UBCS-WEB/src/views/authority/datascope.vue
+++ b/Source/UBCS-WEB/src/views/authority/datascope.vue
@@ -3,6 +3,7 @@
     <avue-crud :option="option"
                :table-loading="loading"
                :data="data"
+               :page.sync="page"
                ref="crud"
                v-model="form"
                :permission="permissionList"
@@ -13,6 +14,7 @@
                @row-save="rowSave"
                @search-change="searchChange"
                @search-reset="searchReset"
+               @row-click="clickRowChange"
                @selection-change="selectionChange"
                @current-change="currentChange"
                @size-change="sizeChange"
@@ -20,10 +22,10 @@
                @on-load="onLoad"
                @tree-load="treeLoad">
       <template slot-scope="{row}" slot="menu">
-        <el-button type="text"
+        <el-button v-if="permissionList.settingBtn"
+                   type="text"
                    icon="el-icon-setting"
                    size="small"
-                   v-if="permission.data_scope_setting"
                    plain
                    style="border: 0;background-color: transparent !important;"
                    @click.stop="handleDataScope(row)">鏉冮檺閰嶇疆
@@ -51,12 +53,14 @@
                    :before-open="beforeOpenScope"
                    @search-change="searchChangeScope"
                    @search-reset="searchResetScope"
+                   @row-click="clickRowChangeScope"
                    @selection-change="selectionChangeScope"
                    @current-change="currentChangeScope"
                    @size-change="sizeChangeScope"
                    @on-load="onLoadScope">
           <template slot="menuLeft">
-            <el-button type="danger"
+            <el-button v-if="permissionList.delBtn"
+                       type="danger"
                        size="small"
                        icon="el-icon-delete"
                        plain
@@ -115,8 +119,9 @@
         watchMode: true,
         option: {
           lazy: true,
+          columnBtn:false,
           tip: false,
-          simplePage: true,
+          // simplePage: true,
           searchShow: true,
           searchMenuSpan: 6,
           dialogWidth: "60%",
@@ -130,6 +135,7 @@
           delBtn: false,
           menuWidth: 150,
           dialogClickModal: false,
+          highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
           column: [
             {
               label: "鑿滃崟鍚嶇О",
@@ -317,6 +323,7 @@
           menuWidth: 200,
           dialogWidth: 900,
           dialogClickModal: false,
+          highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
           column: [
             {
               label: "鏉冮檺鍚嶇О",
@@ -420,10 +427,11 @@
       ...mapGetters(["permission"]),
       permissionList() {
         return {
-          addBtn: this.vaildData(this.permission.menu_add, false),
-          viewBtn: this.vaildData(this.permission.menu_view, false),
-          delBtn: this.vaildData(this.permission.menu_delete, false),
-          editBtn: this.vaildData(this.permission.menu_edit, false)
+          addBtn: this.vaildData(this.permission.data_scope.data_scope_add, false),
+          viewBtn: this.vaildData(this.permission.data_scope.data_scope_view, false),
+          delBtn: this.vaildData(this.permission.data_scope.data_scope_delete, false),
+          editBtn: this.vaildData(this.permission.data_scope.data_scope_edit, false),
+          settingBtn: this.vaildData(this.permission.data_scope.data_scope_setting,false),
         };
       },
       ids() {
@@ -535,8 +543,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 = [];
@@ -587,8 +602,10 @@
       },
       onLoad(page, params = {}) {
         this.loading = true;
-        getLazyMenuList(this.parentId, Object.assign(params, this.query)).then(res => {
-          this.data = res.data.data;
+        getLazyMenuList(this.parentId, Object.assign(params, this.query), page.currentPage, page.pageSize).then(res => {
+          const data = res.data.data;
+          this.data = data.records;
+          this.page.total = data.total;
           this.loading = false;
           this.selectionClear();
         });
@@ -596,7 +613,7 @@
       treeLoad(tree, treeNode, resolve) {
         const parentId = tree.id;
         getLazyMenuList(parentId).then(res => {
-          resolve(res.data.data);
+          resolve(res.data.data.records);
         });
       },
       // 鏁版嵁鏉冮檺妯″潡
@@ -703,8 +720,15 @@
         this.onLoadScope(this.pageScope, params);
         done();
       },
+      clickRowChangeScope(row){
+        this.$refs.crudScope.toggleSelection();
+        this.selectionList = row;
+        this.$refs.crudScope.setCurrentRow(row);
+        this.$refs.crudScope.toggleRowSelection(row); //閫変腑褰撳墠琛�
+      },
       selectionChangeScope(list) {
         this.selectionListScope = list;
+        this.$refs.crudScope.setCurrentRow(this.selectionList[list.length-1]);
       },
       currentChangeScope(currentPage) {
         this.pageScope.currentPage = currentPage;

--
Gitblit v1.9.3