From 758798155c3cfe40b178ec042c94584a7dad7168 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 17 十月 2023 19:28:36 +0800
Subject: [PATCH] 前端代码打包
---
Source/UBCS-WEB/src/views/system/user.vue | 91 ++++++++++++++++++++++++++++-----------------
1 files changed, 57 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 2114440..c2adc42 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -5,7 +5,7 @@
<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>
@@ -142,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"
@@ -152,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>
@@ -179,7 +177,7 @@
resetPassword, unlock
} from "@/api/system/user";
import {exportBlob} from "@/api/common";
-import {getDeptTree, getDeptLazyTree} from "@/api/system/dept";
+import {getDeptTree, getDeptLazyTree, updateUserStatus} from "@/api/system/dept";
import {getRoleTree} from "@/api/system/role";
import {getPostList} from "@/api/system/post";
import {mapGetters} from "vuex";
@@ -211,6 +209,7 @@
}
};
return {
+ tenantId:'',
form: {},
seoptions: [],
sevalue:"",
@@ -279,6 +278,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
+ columnBtn:false,
border: true,
index: true,
selection: true,
@@ -346,7 +346,7 @@
required: true,
message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
trigger: "blur"
- }]
+ }],
},
],
group: [
@@ -374,6 +374,7 @@
trigger: "click"
}],
span: 24,
+ value:""
},
{
label: "鐧诲綍璐﹀彿",
@@ -392,6 +393,7 @@
label: "dictValue",
value: "dictKey"
},
+ value:'1',
dataType: "number",
slot: true,
prop: "userType",
@@ -404,6 +406,7 @@
{
label: '瀵嗙爜',
prop: 'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -413,6 +416,7 @@
label: '纭瀵嗙爜',
prop: 'password2',
hide: true,
+ type: "password",
editDisplay: false,
viewDisplay: false,
rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -548,7 +552,7 @@
value: "id"
},
rules: [{
- required: true,
+ required: false,
message: "璇烽�夋嫨鎵�灞炲矖浣�",
trigger: "click"
}],
@@ -695,6 +699,7 @@
'form.tenantId'() {
if (this.form.tenantId !== '' && this.initFlag) {
this.initData(this.form.tenantId);
+ console.log('this.form.tenantId',this.form.tenantId)
}
},
'excelForm.isCovered'() {
@@ -737,6 +742,9 @@
}
},
created() {
+ updateUserStatus({userid:'1702600796324032513',status:'true'}).then(res=>{
+ console.log(res)
+ })
this.selecload()
const arr=JSON.parse(localStorage.getItem("updataid"))
if(arr.user_id != '0' && arr.tenant_id !== '000000'){
@@ -748,6 +756,9 @@
}
},
methods: {
+ beOpen(done,type){
+ console.log(done,type)
+ },
//esc鍙栨秷閿搷浣�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -767,8 +778,6 @@
}else {
this.passVisible=true;
}
- //console.log("selectionList",this.selectionList)
- //console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -781,7 +790,7 @@
this.UserPwdstrategyVO.pwdstrategyId=this.id
//璇锋眰
- insert(this.UserPwdstrategyVO.userIds).then(()=>{
+ insert(this.UserPwdstrategyVO).then(()=>{
this.passVisible=false
this.$message({
type: "success",
@@ -802,13 +811,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);
@@ -841,21 +852,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(",");
@@ -968,7 +980,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;
@@ -1027,6 +1039,12 @@
})
},
beforeOpen(done, type) {
+ //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;
@@ -1041,8 +1059,13 @@
}
});
}
+ const prop = this.findObject(this.option.group, 'tenantId');
+ //console.log('1',prop)
this.initFlag = true;
done();
+ // }else {
+ // this.$message.warning('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
+ // }
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
@@ -1060,6 +1083,7 @@
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.tenantId=data.records[0].tenantId
this.selectionClear();
});
},
@@ -1137,8 +1161,7 @@
overflow: scroll;
}
.selects{
- width: 400px;
- margin-left: 92px;
+ width: 100%;
}
.seloption{
margin-left: 10px;
--
Gitblit v1.9.3