From 52ffefd06e59cbd56c1a919972866592379cfed2 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期四, 21 九月 2023 11:27:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 255 +++++++++++++++++++++++++++-----------------------
1 files changed, 136 insertions(+), 119 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index b69c093..ba45302 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -1,35 +1,39 @@
<template>
<el-row>
- <el-col :span="5">
+ <el-col :span="5" v-if="userflag">
<div class="box">
- <el-scrollbar>
+ <el-scrollbar style="height: auto;border-bottom-right-radius:8px ">
<basic-container>
- <avue-tree :data="treeData" :option="treeOption" @node-click="nodeClick"/>
+ <div class="abox">
+ <avue-tree ref="tree" :data="treeData" :option="treeOption" @node-click="nodeClick"/>
+ </div>
</basic-container>
</el-scrollbar>
</div>
</el-col>
- <el-col :span="19">
+ <el-col :span="usernumber">
<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"
@@ -98,19 +102,19 @@
<el-tag>{{ row.userTypeName }}</el-tag>
</template>
</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">
@@ -138,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"
@@ -148,44 +151,13 @@
: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>
- <!-- <el-dialog title="鐢ㄦ埛骞冲彴閰嶇疆"-->
- <!-- append-to-body-->
- <!-- :visible.sync="platformBox">-->
- <!-- <avue-crud :option="platformOption"-->
- <!-- :table-loading="platformLoading"-->
- <!-- :data="platformData"-->
- <!-- ref="platformCrud"-->
- <!-- v-model="platformForm"-->
- <!-- :before-open="platformBeforeOpen"-->
- <!-- :page.sync="platformPage"-->
- <!-- :permission="platformPermissionList"-->
- <!-- @row-update="platformRowUpdate"-->
- <!-- @search-change="platformSearchChange"-->
- <!-- @search-reset="platformSearchReset"-->
- <!-- @selection-change="platformSelectionChange"-->
- <!-- @current-change="platformCurrentChange"-->
- <!-- @size-change="platformSizeChange"-->
- <!-- @refresh-change="platformRefreshChange"-->
- <!-- @on-load="platformOnLoad">-->
- <!-- <template slot-scope="{row}"-->
- <!-- slot="tenantName">-->
- <!-- <el-tag>{{row.tenantName}}</el-tag>-->
- <!-- </template>-->
- <!-- <template slot-scope="{row}"-->
- <!-- slot="userTypeName">-->
- <!-- <el-tag>{{row.userTypeName}}</el-tag>-->
- <!-- </template>-->
- <!-- -->
- <!-- </avue-crud>-->
- <!-- </el-dialog>-->
</basic-container>
</el-col>
</el-row>
@@ -237,6 +209,7 @@
}
};
return {
+ tenantId:'',
form: {},
seoptions: [],
sevalue:"",
@@ -274,7 +247,9 @@
treeDeptId: '',
treeData: [],
treeOption: {
+ height:"auto",
nodeKey: 'id',
+ border: true,
lazy: true,
treeLoad: function (node, resolve) {
const parentId = (node.level === 0) ? 0 : node.data.id;
@@ -298,7 +273,7 @@
}
},
option: {
- height: 'auto',
+ height:'auto',
calcHeight: 80,
tip: false,
searchShow: true,
@@ -309,6 +284,7 @@
viewBtn: true,
dialogType: 'drawer',
dialogClickModal: false,
+ highlightCurrentRow: true, //琛岄�変腑鏃堕珮浜�
column: [
{
label: "鐧诲綍璐﹀彿",
@@ -355,7 +331,7 @@
{
label: "鐢ㄦ埛骞冲彴",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
value: "dictKey"
@@ -382,7 +358,7 @@
label: "鎵�灞炵鎴�",
prop: "tenantId",
type: "tree",
- dicUrl: "/api/blade-system/tenant/select",
+ dicUrl: "/api/ubcs-system/tenant/select",
props: {
label: "tenantName",
value: "tenantId"
@@ -397,6 +373,7 @@
trigger: "click"
}],
span: 24,
+ value:"211833"
},
{
label: "鐧诲綍璐﹀彿",
@@ -410,7 +387,7 @@
{
label: "鐢ㄦ埛骞冲彴",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
value: "dictKey"
@@ -427,6 +404,7 @@
{
label: '瀵嗙爜',
prop: 'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -436,6 +414,7 @@
label: '纭瀵嗙爜',
prop: 'password2',
hide: true,
+ type: "password",
editDisplay: false,
viewDisplay: false,
rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -625,7 +604,7 @@
{
label: "鐢ㄦ埛骞冲彴",
type: "select",
- dicUrl: "/api/blade-system/dict/dictionary?code=user_type",
+ dicUrl: "/api/ubcs-system/dict/dictionary?code=user_type",
props: {
label: "dictValue",
value: "dictKey"
@@ -669,7 +648,7 @@
res: 'data'
},
tip: '璇蜂笂浼� .xls,.xlsx 鏍囧噯鏍煎紡鏂囦欢',
- action: "/api/blade-user/import-user"
+ action: "/api/ubcs-user/import-user"
},
{
label: "鏁版嵁瑕嗙洊",
@@ -709,19 +688,22 @@
UserPwdstrategyVO:{
userIds:[],
pwdstrategyId:''
- }
+ },
+ userflag:true,
+ usernumber:0
};
},
watch: {
'form.tenantId'() {
if (this.form.tenantId !== '' && this.initFlag) {
this.initData(this.form.tenantId);
+ console.log('this.form.tenantId',this.form.tenantId)
}
},
'excelForm.isCovered'() {
if (this.excelForm.isCovered !== '') {
const column = this.findObject(this.excelOption.column, "excelFile");
- column.action = `/api/blade-user/import-user?isCovered=${this.excelForm.isCovered}`;
+ column.action = `/api/ubcs-user/import-user?isCovered=${this.excelForm.isCovered}`;
}
}
},
@@ -759,8 +741,19 @@
},
created() {
this.selecload()
+ const arr=JSON.parse(localStorage.getItem("updataid"))
+ if(arr.user_id != '0' && arr.tenant_id !== '000000'){
+ this.userflag=false
+ this.usernumber=24
+ }else {
+ this.userflag=true
+ this.usernumber=19
+ }
},
methods: {
+ beOpen(done,type){
+ console.log(done,type)
+ },
//esc鍙栨秷閿搷浣�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -780,7 +773,6 @@
}else {
this.passVisible=true;
}
- console.log("selectionList",this.selectionList)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -791,7 +783,7 @@
//瑕佷紶閫掔殑id锛屼竴涓槸鏁扮粍鍙︿竴涓槸瀛楃涓�
this.UserPwdstrategyVO.userIds=this.selid;
this.UserPwdstrategyVO.pwdstrategyId=this.id
- console.log(this.UserPwdstrategyVO)
+
//璇锋眰
insert(this.UserPwdstrategyVO).then(()=>{
this.passVisible=false
@@ -799,10 +791,10 @@
type: "success",
message: "閰嶇疆鎴愬姛!"
});
- this.selectionList=[]
this.onLoad(this.page)
- console.log("selectionList",this.selectionList)
+ this.selid=[]
}).catch(res=>{
+ this.selid=[]
this.$message({
type: "warning",
message: res
@@ -814,13 +806,15 @@
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)
+ console.log(this.form.tenantId)
this.treeDeptId = data.id;
this.page.currentPage = 1;
this.onLoad(this.page);
@@ -853,21 +847,22 @@
});
},
rowSave(row, done, loading) {
- row.deptId = row.deptId.join(",");
- row.roleId = row.roleId.join(",");
- row.postId = row.postId.join(",");
- add(row).then(() => {
- this.initFlag = false;
- this.onLoad(this.page);
- this.$message({
- type: "success",
- message: "鎿嶄綔鎴愬姛!"
+ 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);
+ this.$message({
+ type: "success",
+ message: "鎿嶄綔鎴愬姛!"
+ });
+ done();
+ }, error => {
+ window.console.log(error);
+ loading();
});
- done();
- }, error => {
- window.console.log(error);
- loading();
- });
},
rowUpdate(row, index, done, loading) {
row.deptId = row.deptId.join(",");
@@ -914,8 +909,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 = [];
@@ -973,7 +975,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;
@@ -1020,34 +1022,45 @@
type: "warning"
}).then(() => {
NProgress.start();
- exportBlob(`/api/blade-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
+ exportBlob(`/api/ubcs-user/export-user?${this.website.tokenHeader}=${getToken()}&account=${account}&realName=${realName}`).then(res => {
downloadXls(res.data, `鐢ㄦ埛鏁版嵁琛�${dateNow()}.xlsx`);
NProgress.done();
})
});
},
handleTemplate() {
- exportBlob(`/api/blade-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
+ exportBlob(`/api/ubcs-user/export-template?${this.website.tokenHeader}=${getToken()}`).then(res => {
downloadXls(res.data, "鐢ㄦ埛鏁版嵁妯℃澘.xlsx");
})
},
beforeOpen(done, type) {
- if (["edit", "view"].includes(type)) {
- getUser(this.form.id).then(res => {
- this.form = res.data.data;
- if (this.form.hasOwnProperty("deptId")) {
- this.form.deptId = this.form.deptId.split(",");
- }
- if (this.form.hasOwnProperty("roleId")) {
- this.form.roleId = this.form.roleId.split(",");
- }
- if (this.form.hasOwnProperty("postId")) {
- this.form.postId = this.form.postId.split(",");
- }
- });
+ // console.log(type)
+ // console.log('this.tenantId',this.tenantId)
+ // const column = this.findObject(this.option.group,'tenantId');
+ // column.value=this.tenantId;
+ // console.log('column',column)
+ if(this.treeDeptId){
+ if (["edit", "view"].includes(type)) {
+ getUser(this.form.id).then(res => {
+ this.form = res.data.data;
+ if (this.form.hasOwnProperty("deptId")) {
+ this.form.deptId = this.form.deptId.split(",");
+ }
+ if (this.form.hasOwnProperty("roleId")) {
+ this.form.roleId = this.form.roleId.split(",");
+ }
+ if (this.form.hasOwnProperty("postId")) {
+ this.form.postId = this.form.postId.split(",");
+ }
+ });
+ }
+ const prop = this.findObject(this.option.group, 'tenantId');
+ console.log('1',prop)
+ this.initFlag = true;
+ done();
+ }else {
+ this.$message.warning('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
}
- this.initFlag = true;
- done();
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
@@ -1065,6 +1078,7 @@
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.tenantId=data.records[0].tenantId
this.selectionClear();
});
},
@@ -1142,10 +1156,13 @@
overflow: scroll;
}
.selects{
- width: 400px;
- margin-left: 92px;
+ width: 100%;
}
.seloption{
margin-left: 10px;
}
+.abox{
+ height: 771px;
+}
+
</style>
--
Gitblit v1.9.3