2213980799@qq.com 1 год назад
Родитель
Сommit
bcd8ac8956

+ 7 - 3
src/views/system/organization/components/org-user-list.vue

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

+ 4 - 5
src/views/system/user/components/user-edit.vue

@@ -186,6 +186,7 @@ export default {
             });
           });
         }
+        this.$forceUpdate();
       }
     },
     /* 保存编辑 */
@@ -202,10 +203,8 @@ export default {
         });
         if (!isRole) {
           this.$message.warning('请选择角色!');
-
           return;
         }
-
         this.loading = true;
         if (!this.isUpdate) {
           delete this.form.id;
@@ -235,8 +234,8 @@ export default {
     updateVisible(value) {
       this.$emit('update:visible', value);
     },
-    getByData(userRow,currentRow) {
-      let id=this.data?.id||userRow?.id
+    getByData(userRow, currentRow) {
+      let id = this.data?.id || userRow?.id;
       getById(id).then((res) => {
         this.form = res.data;
         this.form.groupRolePOList = [];
@@ -248,7 +247,7 @@ export default {
           });
         });
         if (currentRow) {
-          this.isUpdate=true
+          this.isUpdate = true;
           this.userBk(currentRow);
         }
       });