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 | 89 +++++++++++++++++++++++++++-----------------
1 files changed, 55 insertions(+), 34 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index d1ccf6a..ba45302 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -154,9 +154,9 @@
</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>
@@ -209,6 +209,7 @@
}
};
return {
+ tenantId:'',
form: {},
seoptions: [],
sevalue:"",
@@ -372,6 +373,7 @@
trigger: "click"
}],
span: 24,
+ value:"211833"
},
{
label: "鐧诲綍璐﹀彿",
@@ -402,6 +404,7 @@
{
label: '瀵嗙爜',
prop: 'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -411,6 +414,7 @@
label: '纭瀵嗙爜',
prop: 'password2',
hide: true,
+ type: "password",
editDisplay: false,
viewDisplay: false,
rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -693,6 +697,7 @@
'form.tenantId'() {
if (this.form.tenantId !== '' && this.initFlag) {
this.initData(this.form.tenantId);
+ console.log('this.form.tenantId',this.form.tenantId)
}
},
'excelForm.isCovered'() {
@@ -746,6 +751,9 @@
}
},
methods: {
+ beOpen(done,type){
+ console.log(done,type)
+ },
//esc鍙栨秷閿搷浣�
handleClose(done) {
this.$confirm('纭鍏抽棴锛�')
@@ -765,8 +773,6 @@
}else {
this.passVisible=true;
}
- //console.log("selectionList",this.selectionList)
- //console.log(this.UserPwdstrategyVO)
},
// 璁剧疆瀵嗙爜绛栫暐锛屼紶閫掍笅鎷夋鐨刬d鍜屽閫夋鐨刬d
passhandle(){
@@ -807,6 +813,8 @@
});
},
nodeClick(data) {
+ console.log(data)
+ console.log(this.form.tenantId)
this.treeDeptId = data.id;
this.page.currentPage = 1;
this.onLoad(this.page);
@@ -839,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(",");
@@ -1025,22 +1034,33 @@
})
},
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;
@@ -1058,6 +1078,7 @@
this.page.total = data.total;
this.data = data.records;
this.loading = false;
+ this.tenantId=data.records[0].tenantId
this.selectionClear();
});
},
--
Gitblit v1.9.3