|
@@ -134,9 +134,10 @@
|
|
|
:close-on-click-modal="false"
|
|
:close-on-click-modal="false"
|
|
|
custom-class="ele-dialog-form"
|
|
custom-class="ele-dialog-form"
|
|
|
>
|
|
>
|
|
|
|
|
+ <UserSearch @search="reload1" ></UserSearch>
|
|
|
<!-- 数据表格 -->
|
|
<!-- 数据表格 -->
|
|
|
<ele-pro-table
|
|
<ele-pro-table
|
|
|
- ref="table"
|
|
|
|
|
|
|
+ ref="table1"
|
|
|
:columns="columns1"
|
|
:columns="columns1"
|
|
|
:datasource="datasource1"
|
|
:datasource="datasource1"
|
|
|
:current.sync="userRow"
|
|
:current.sync="userRow"
|
|
@@ -157,7 +158,7 @@ import OrgUserSearch from './org-user-search.vue';
|
|
|
import OrgUserEdit from './org-user-edit.vue';
|
|
import OrgUserEdit from './org-user-edit.vue';
|
|
|
import importDialog from '@/components/upload/import-dialog.vue';
|
|
import importDialog from '@/components/upload/import-dialog.vue';
|
|
|
import addUsers from '@/views/system/user/components/user-edit.vue';
|
|
import addUsers from '@/views/system/user/components/user-edit.vue';
|
|
|
-
|
|
|
|
|
|
|
+import UserSearch from '@/views/system/user/components/user-search.vue';
|
|
|
import {
|
|
import {
|
|
|
getUserPage,
|
|
getUserPage,
|
|
|
removePersonnel,
|
|
removePersonnel,
|
|
@@ -165,7 +166,7 @@ import {
|
|
|
} from '@/api/system/organization';
|
|
} from '@/api/system/organization';
|
|
|
import { pageUsers } from '@/api/system/user';
|
|
import { pageUsers } from '@/api/system/user';
|
|
|
export default {
|
|
export default {
|
|
|
- components: { importDialog, OrgUserSearch, OrgUserEdit, addUsers },
|
|
|
|
|
|
|
+ components: { importDialog, OrgUserSearch, OrgUserEdit, addUsers,UserSearch },
|
|
|
props: {
|
|
props: {
|
|
|
// 机构id
|
|
// 机构id
|
|
|
organizationId: [Number, String],
|
|
organizationId: [Number, String],
|
|
@@ -375,6 +376,9 @@ export default {
|
|
|
reload(where) {
|
|
reload(where) {
|
|
|
this.$refs.table.reload({ pageNum: 1, where: where });
|
|
this.$refs.table.reload({ pageNum: 1, where: where });
|
|
|
},
|
|
},
|
|
|
|
|
+ reload1(where){
|
|
|
|
|
+ this.$refs.table1.reload({ pageNum: 1, where: where });
|
|
|
|
|
+ },
|
|
|
/* 显示编辑 */
|
|
/* 显示编辑 */
|
|
|
openEdit(row) {
|
|
openEdit(row) {
|
|
|
this.current = row;
|
|
this.current = row;
|