From 13d746094822b401e9d977f81edb9214cab0fba7 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期一, 14 八月 2023 15:11:31 +0800
Subject: [PATCH] 主题库保存验证bug
---
Source/UBCS-WEB/src/views/system/user.vue | 110 ++++++++++++++++++++++++++++++------------------------
1 files changed, 61 insertions(+), 49 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index b07450c..10fa0a1 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -5,9 +5,8 @@
<el-scrollbar style="height: auto;border-bottom-right-radius:8px ">
<basic-container>
<div class="abox">
- <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"/>
+ <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick"/>
</div>
-
</basic-container>
</el-scrollbar>
</div>
@@ -16,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"
@@ -104,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">
@@ -143,8 +142,7 @@
class="passdialog"
append-to-body
title="璁剧疆瀵嗙爜绛栫暐"
- width="30%"
- >
+ width="30%">
<el-select v-model="sevalue" placeholder="璇烽�夋嫨" class="selects" @change="selChange" >
<el-option
v-for="item in seoptions"
@@ -153,13 +151,12 @@
:value="item.id"
class="seloption"
>
-
</el-option>
</el-select>
<span slot="footer" class="dialog-footer">
- <el-button @click="passVisible = false">鍙� 娑�</el-button>
- <el-button type="primary" @click="passhandle">纭� 瀹�</el-button>
- </span>
+ <el-button @click="passVisible = false">鍙� 娑�</el-button>
+ <el-button type="primary" @click="passhandle">纭� 瀹�</el-button>
+ </span>
</el-dialog>
</basic-container>
</el-col>
@@ -286,6 +283,7 @@
viewBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
+ highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
column: [
{
label: "鐧诲綍璐﹀彿",
@@ -374,6 +372,7 @@
trigger: "click"
}],
span: 24,
+ // value:'986926'
},
{
label: "鐧诲綍璐﹀彿",
@@ -748,6 +747,9 @@
}
},
methods: {
+ beOpen(done,type){
+ console.log(done,type)
+ },
//esc鍙栨秷閿搷浣�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -767,8 +769,6 @@
}else {
this.passVisible=true;
}
- console.log("selectionList",this.selectionList)
- console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -779,10 +779,9 @@
//瑕佷紶閫掔殑id锛屼竴涓槸鏁扮粍鍙︿竴涓槸瀛楃涓�
this.UserPwdstrategyVO.userIds=this.selid;
this.UserPwdstrategyVO.pwdstrategyId=this.id
- console.log("1",this.UserPwdstrategyVO)
- console.log("2",this.UserPwdstrategyVO.userIds)
+
//璇锋眰
- insert(this.UserPwdstrategyVO.userIds).then(()=>{
+ insert(this.UserPwdstrategyVO).then(()=>{
this.passVisible=false
this.$message({
type: "success",
@@ -803,13 +802,14 @@
selChange(row){
this.id=row
},
- selecload(page, params = {}) {
- getPage(this.page.currentPage, this.page.pageSize, Object.assign(params, this.query)).then(res => {
- console.log(res)
- this.seoptions=res.data.data.content
+ selecload() {
+ getPage(1, -1).then(res => {
+ // console.log(res)
+ this.seoptions=res.data.data.records
});
},
nodeClick(data) {
+ console.log(data)
this.treeDeptId = data.id;
this.page.currentPage = 1;
this.onLoad(this.page);
@@ -842,9 +842,12 @@
});
},
rowSave(row, done, loading) {
+ const prop = this.findObject(this.option.group, 'tenantId');
+ console.log('2',prop)
row.deptId = row.deptId.join(",");
row.roleId = row.roleId.join(",");
row.postId = row.postId.join(",");
+ console.log('3',row)
add(row).then(() => {
this.initFlag = false;
this.onLoad(this.page);
@@ -903,8 +906,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 = [];
@@ -962,7 +972,7 @@
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;
@@ -1021,6 +1031,7 @@
})
},
beforeOpen(done, type) {
+ console.log(type)
if (["edit", "view"].includes(type)) {
getUser(this.form.id).then(res => {
this.form = res.data.data;
@@ -1035,6 +1046,8 @@
}
});
}
+ const prop = this.findObject(this.option.group, 'tenantId');
+ console.log('1',prop)
this.initFlag = true;
done();
},
@@ -1131,8 +1144,7 @@
overflow: scroll;
}
.selects{
- width: 400px;
- margin-left: 92px;
+ width: 100%;
}
.seloption{
margin-left: 10px;
--
Gitblit v1.9.3