From ad58a16c9d452c2e4d534e081ea3f84001a4595a Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 15 八月 2023 09:26:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 98810f9..10fa0a1 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -372,6 +372,7 @@
trigger: "click"
}],
span: 24,
+ // value:'986926'
},
{
label: "鐧诲綍璐﹀彿",
@@ -746,6 +747,9 @@
}
},
methods: {
+ beOpen(done,type){
+ console.log(done,type)
+ },
//esc鍙栨秷閿搷浣�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -765,8 +769,6 @@
}else {
this.passVisible=true;
}
- //console.log("selectionList",this.selectionList)
- //console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -807,6 +809,7 @@
});
},
nodeClick(data) {
+ console.log(data)
this.treeDeptId = data.id;
this.page.currentPage = 1;
this.onLoad(this.page);
@@ -839,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);
@@ -1025,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;
@@ -1039,6 +1046,8 @@
}
});
}
+ const prop = this.findObject(this.option.group, 'tenantId');
+ console.log('1',prop)
this.initFlag = true;
done();
},
--
Gitblit v1.9.3