|
@@ -53,7 +53,7 @@ import OrgUserSearch from '@/views/system/organization/components/org-user-searc
|
|
|
|
|
|
|
|
import { listOrganizations } from '@/api/system/organization';
|
|
import { listOrganizations } from '@/api/system/organization';
|
|
|
export default {
|
|
export default {
|
|
|
- components:{
|
|
|
|
|
|
|
+ components: {
|
|
|
OrgUserSearch
|
|
OrgUserSearch
|
|
|
},
|
|
},
|
|
|
data() {
|
|
data() {
|
|
@@ -61,6 +61,7 @@ export default {
|
|
|
data: [],
|
|
data: [],
|
|
|
show: false,
|
|
show: false,
|
|
|
organizationId: '',
|
|
organizationId: '',
|
|
|
|
|
+ isHasAccount: false,
|
|
|
// 表格列配置
|
|
// 表格列配置
|
|
|
columns: [
|
|
columns: [
|
|
|
{
|
|
{
|
|
@@ -119,7 +120,7 @@ export default {
|
|
|
this.data = this.$util.toTreeData({
|
|
this.data = this.$util.toTreeData({
|
|
|
data: _list,
|
|
data: _list,
|
|
|
idField: 'id',
|
|
idField: 'id',
|
|
|
- parentIdField: 'parentId',
|
|
|
|
|
|
|
+ parentIdField: 'parentId'
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
this.$nextTick(() => {
|
|
this.$nextTick(() => {
|
|
@@ -130,20 +131,25 @@ export default {
|
|
|
// this.$message.error(e.message);
|
|
// this.$message.error(e.message);
|
|
|
});
|
|
});
|
|
|
},
|
|
},
|
|
|
- async open() {
|
|
|
|
|
|
|
+ async open(isHasAccount) {
|
|
|
|
|
+ if (isHasAccount) {
|
|
|
|
|
+ this.isHasAccount = isHasAccount;
|
|
|
|
|
+ }
|
|
|
this.query();
|
|
this.query();
|
|
|
this.show = true;
|
|
this.show = true;
|
|
|
},
|
|
},
|
|
|
/* 表格数据源 */
|
|
/* 表格数据源 */
|
|
|
async datasource({ page, limit, where, order }) {
|
|
async datasource({ page, limit, where, order }) {
|
|
|
|
|
+ console.log(this.isHasAccount)
|
|
|
|
|
+ if (!this.isHasAccount) {
|
|
|
|
|
+ where['hasAccount'] = 0;
|
|
|
|
|
+ }
|
|
|
let data = await getUserPage({
|
|
let data = await getUserPage({
|
|
|
...where,
|
|
...where,
|
|
|
...order,
|
|
...order,
|
|
|
pageNum: page,
|
|
pageNum: page,
|
|
|
size: limit,
|
|
size: limit,
|
|
|
- groupId: this.organizationId,
|
|
|
|
|
- hasAccount:0
|
|
|
|
|
-
|
|
|
|
|
|
|
+ groupId: this.organizationId
|
|
|
});
|
|
});
|
|
|
|
|
|
|
|
return data;
|
|
return data;
|