From 815c6be8d063ca1ec89079722d265585f7d3602c Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期五, 13 十月 2023 11:05:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 50 ++++++++++++++++++++++++++------------------------
1 files changed, 26 insertions(+), 24 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index ba45302..39bac5b 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -278,6 +278,7 @@
tip: false,
searchShow: true,
searchMenuSpan: 6,
+ columnBtn:false,
border: true,
index: true,
selection: true,
@@ -345,7 +346,7 @@
required: true,
message: "璇烽�夋嫨鐢ㄦ埛骞冲彴",
trigger: "blur"
- }]
+ }],
},
],
group: [
@@ -373,7 +374,7 @@
trigger: "click"
}],
span: 24,
- value:"211833"
+ value:""
},
{
label: "鐧诲綍璐﹀彿",
@@ -392,6 +393,7 @@
label: "dictValue",
value: "dictKey"
},
+ value:'1',
dataType: "number",
slot: true,
prop: "userType",
@@ -1034,33 +1036,33 @@
})
},
beforeOpen(done, type) {
- // console.log(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;
- 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('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
+ // 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('璇烽�夋嫨涓�鏉℃墍灞炵鎴�')
+ // }
},
currentChange(currentPage) {
this.page.currentPage = currentPage;
--
Gitblit v1.9.3