From b9f3e4a899013ce21de3fc1ac127d137c7494595 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期一, 02 九月 2024 15:21:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
Source/plt-web/plt-web-ui/src/components/refer/orgUserRefer.vue | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/Source/plt-web/plt-web-ui/src/components/refer/orgUserRefer.vue b/Source/plt-web/plt-web-ui/src/components/refer/orgUserRefer.vue
index 611d217..8bc2df6 100644
--- a/Source/plt-web/plt-web-ui/src/components/refer/orgUserRefer.vue
+++ b/Source/plt-web/plt-web-ui/src/components/refer/orgUserRefer.vue
@@ -48,7 +48,7 @@
default:'70%'
}, height: {
type: String,
- default:'60%'
+ default:(document.body.clientHeight-400)+'px'
},
reloadFormKey: {
type: String,
@@ -73,36 +73,32 @@
rConfig.options.tableConfig={
cols:[{
prop: 'code',
- label: '鐢ㄦ埛鍚�',
+ label: (this.$project.user.code || "璐﹀彿"),
sortable: true,
- width: 150,
search: true
},{
prop: 'name',
label: '濮撳悕',
sortable: true,
- width: 150,
search: true
}, {
prop: 'deptIdName',
label: '鎵�灞為儴闂�',
- width: 260,
}, {
prop: 'sexText',
label: '鎬у埆',
- width: 80
}]
};
rConfig.options.classifys=[{
title:'閮ㄩ棬',
treeUrl:'/org/deptController/referGrid', //鍒嗙被鐨勮矾寰�
- queryByClassifyUrl:'/permission/userQueryController/listUserByDeptId', //'鍒楄〃'
+ queryByClassifyUrl:'/permission/userQueryController/gridUserByDeptIdGet', //'鍒楄〃'
queryField:'deptId', //鍒楄〃鏁版嵁涓垎绫荤殑瀛楁
classifyValueField:'id', //浠庢爲涓婅幏鍙栫殑瀛楁
},{
title:'瑙掕壊',
treeUrl:'/permission/roleController/referGrid', //鍒嗙被鐨勮矾寰�
- queryByClassifyUrl:'/permission/userQueryController/listUserByRoleId', //'鍒楄〃'
+ queryByClassifyUrl:'/permission/userQueryController/gridUserInRoleIdGet', //'鍒楄〃'
queryField:'roleId', //鍒楄〃鏁版嵁涓垎绫荤殑瀛楁
classifyValueField:'id', //浠庢爲涓婅幏鍙栫殑瀛楁
}];
--
Gitblit v1.9.3