From 5569ff5c185797bb159ea2c58a52a92815e18db9 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 13 六月 2023 19:51:16 +0800
Subject: [PATCH] code服务添加租户相关内容,角色配置界面修改

---
 Source/UBCS-WEB/src/views/system/user.vue |   80 +++++++++++++++++++++------------------
 1 files changed, 43 insertions(+), 37 deletions(-)

diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 671d40a..dc8e091 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -15,24 +15,25 @@
       <basic-container>
         <div class="bbox">
         <avue-crud ref="crud"
-                   v-model="form"
-                   :before-open="beforeOpen"
-                   :data="data"
-                   :option="option"
-                   :page.sync="page"
-                   :permission="permissionList"
-                   :search.sync="search"
-                   :table-loading="loading"
-                   @row-del="rowDel"
-                   @row-update="rowUpdate"
-                   @row-save="rowSave"
-                   @search-change="searchChange"
-                   @search-reset="searchReset"
-                   @selection-change="selectionChange"
-                   @current-change="currentChange"
-                   @size-change="sizeChange"
-                   @refresh-change="refreshChange"
-                   @on-load="onLoad">
+          v-model="form"
+          :before-open="beforeOpen"
+          :data="data"
+          :option="option"
+          :page.sync="page"
+          :permission="permissionList"
+          :search.sync="search"
+          :table-loading="loading"
+          @row-del="rowDel"
+          @row-update="rowUpdate"
+          @row-save="rowSave"
+          @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 v-if="permission.user_delete"
                        icon="el-icon-delete"
@@ -103,18 +104,17 @@
         </avue-crud>
         </div>
         <el-dialog :visible.sync="roleBox"
-                   append-to-body
-                   title="鐢ㄦ埛瑙掕壊閰嶇疆"
-                   width="345px">
-
+            append-to-body
+            title="鐢ㄦ埛瑙掕壊閰嶇疆"
+            width="345px">
           <el-tree ref="treeRole"
-                   :data="roleGrantList"
-                   :default-checked-keys="roleTreeObj"
-                   :props="props"
-                   check-strictly
-                   default-expand-all
-                   node-key="id"
-                   show-checkbox>
+              :data="roleGrantList"
+              :default-checked-keys="roleTreeObj"
+              :props="props"
+              check-strictly
+              default-expand-all
+              node-key="id"
+              show-checkbox>
           </el-tree>
 
           <span slot="footer" class="dialog-footer">
@@ -285,6 +285,7 @@
         viewBtn: true,
         dialogType: 'drawer',
         dialogClickModal: false,
+        highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
         column: [
           {
             label: "鐧诲綍璐﹀彿",
@@ -766,8 +767,8 @@
       }else {
         this.passVisible=true;
       }
-      console.log("selectionList",this.selectionList)
-      console.log(this.UserPwdstrategyVO)
+      //console.log("selectionList",this.selectionList)
+      //console.log(this.UserPwdstrategyVO)
     },
     // 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
     passhandle(){
@@ -777,11 +778,10 @@
       })
        //瑕佷紶閫掔殑id锛屼竴涓槸鏁扮粍鍙︿竴涓槸瀛楃涓�
        this.UserPwdstrategyVO.userIds=this.selid;
-       this.UserPwdstrategyVO.pwdstrategyId=this.id
-      console.log("1",this.UserPwdstrategyVO)
-      console.log("2",this.UserPwdstrategyVO.userIds)
+       this.UserPwdstrategyVO.pwdstrategyId=this.id;
+
       //璇锋眰
-      insert(this.UserPwdstrategyVO.userIds).then(()=>{
+      insert(this.UserPwdstrategyVO).then(()=>{
         this.passVisible=false
         this.$message({
           type: "success",
@@ -902,8 +902,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 = [];
@@ -961,10 +968,9 @@
       if (this.selectionList.length === 1) {
         this.roleTreeObj = this.selectionList[0].roleId.split(",");
       }
-      getRoleTree().then(res => {
+      getRoleTree(this.selectionList[0].tenantId).then(res => {
         this.roleGrantList = res.data.data;
         this.roleBox = true;
-
       });
     },
     handlePlatform() {

--
Gitblit v1.9.3