From bb98d179dd020e0b003446cb35ce422651ab8acd Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 25 九月 2023 09:40:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/UBCS-WEB/src/views/system/user.vue | 15 +++++++++++++--
1 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/Source/UBCS-WEB/src/views/system/user.vue b/Source/UBCS-WEB/src/views/system/user.vue
index 212e197..ba45302 100644
--- a/Source/UBCS-WEB/src/views/system/user.vue
+++ b/Source/UBCS-WEB/src/views/system/user.vue
@@ -209,6 +209,7 @@
}
};
return {
+ tenantId:'',
form: {},
seoptions: [],
sevalue:"",
@@ -372,7 +373,7 @@
trigger: "click"
}],
span: 24,
- // value:'986926'
+ value:"211833"
},
{
label: "鐧诲綍璐﹀彿",
@@ -403,6 +404,7 @@
{
label: '瀵嗙爜',
prop: 'password',
+ type: "password",
hide: true,
editDisplay: false,
viewDisplay: false,
@@ -412,6 +414,7 @@
label: '纭瀵嗙爜',
prop: 'password2',
hide: true,
+ type: "password",
editDisplay: false,
viewDisplay: false,
rules: [{required: true, validator: validatePass2, trigger: 'blur'}]
@@ -694,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'() {
@@ -809,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);
@@ -1028,7 +1034,11 @@
})
},
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 => {
@@ -1068,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