机构管理员用户管理

src/api/list.js

@@ -32,4 +32,11 @@ export function queryUserList(data) {
   return http.post(`${process.env.VUE_APP_EepServer}?MethodName=page_query-PageQueryUserList`, data, {
     baseURL: process.env.VUE_APP_EEP,
   });
+}
+
+// 分页查询机构管理员用户列表
+export function queryOrgUserList(data) {
+  return http.post(`${process.env.VUE_APP_EepServer}?MethodName=page_query-PageQueryMyOrgUserList_OrgManager`, data, {
+    baseURL: process.env.VUE_APP_EEP,
+  });
 }

src/router/modules/index.js

@@ -1,4 +1,4 @@
-import { homePage, loginPage, NotFoundPage, ImageChangePage, RegisterPage, OrgManagePage, UserManagePage, SystemConfigPage } from './basic';
+import { homePage, loginPage, NotFoundPage, ImageChangePage, RegisterPage, OrgManagePage, UserManagePage, SystemConfigPage, UserManageOrgPage } from './basic';
 import ProjectRouters from './project';
 import { createBookRouters } from './book';
 import CoursewareRouters from './courseware';
@@ -15,4 +15,5 @@ export const routes = [
   OrgManagePage,
   UserManagePage,
   SystemConfigPage,
+  UserManageOrgPage,
 ];

src/views/user_manage/index.vue

@@ -1,7 +1,7 @@
 <template>
   <div class="user-manage">
     <div class="user-manage-list">
-      <el-form ref="registerForm" :model="form" :rules="rules" inline>
+      <el-form ref="registerForm" inline>
         <el-form-item prop="org_id" label="机构">
           <el-select v-model="org_id_list" filterable multiple collapse-tags>
             <el-option v-for="item in institutionList" :key="item.id" :value="item.id" :label="item.name"></el-option>

src/views/user_manage_org/index.vue

@@ -1,9 +1,13 @@
 <template>
-  <div class="project">
-    <div class="project-list">
-      <el-button class="add-btn" type="primary" size="small" icon="el-icon-plus" @click="updateOrg('')"
-        >创建机构</el-button
-      >
+  <div class="user-manage">
+    <div class="user-manage-list">
+      <div class="btn-box">
+        <el-button class="add-btn" type="primary" size="small" icon="el-icon-plus" @click="updateOrg('')"
+          >添加用户</el-button
+        >
+        <el-button class="add-btn" type="primary" size="small" @click="updateOrg('')">批量导入用户</el-button>
+      </div>
+
       <el-table :data="list">
         <el-table-column
           type="index"
@@ -12,17 +16,28 @@
           align="center"
           :index="(cur_page - 1) * page_capacity + 1"
         />
-        <el-table-column prop="name" label="名称" align="center" />
-        <el-table-column prop="user_count" label="注册用户数" align="center" />
-        <el-table-column prop="user_count_audited" label="已审核用户数" align="center" />
-        <el-table-column prop="member_name_desc" label="机构管理员" align="center" />
-        <el-table-column prop="create_time" label="创建时间" align="center" />
+        <el-table-column prop="user_name" label="真实姓名" align="center" />
+        <el-table-column prop="real_name" label="用户名" align="center" />
+        <el-table-column prop="email" label="邮箱" align="center" width="170" />
+        <el-table-column prop="is_org_manager" label="机构管理员" align="center">
+          <template slot-scope="{ row }">
+            <i class="el-icon-check" v-if="row.is_org_manager === 'true'"></i>
+          </template>
+        </el-table-column>
+        <el-table-column prop="register_time" label="注册时间" align="center" width="170" />
+        <el-table-column prop="is_audited" label="已审核" align="center"
+          ><template slot-scope="{ row }">
+            <i class="el-icon-check" v-if="row.is_audited === 'true'"></i>
+          </template>
+        </el-table-column>
+        <el-table-column prop="audit_time" label="审核时间" align="center" width="170" />
 
         <el-table-column prop="operation" label="操作" fixed="right" width="200" align="center">
           <template slot-scope="{ row }">
-            <span class="link" @click="updateOrg(row)">修改</span>
-            <span class="link" @click="setOrgManager(row.id)">设置机构管理员</span>
-            <span class="link danger" @click="deleteOrg(row.id)">删除</span>
+            <span class="link" @click="setOrgManager(row)">{{
+              row.is_audited === 'true' ? '审核拒绝' : '审核通过'
+            }}</span>
+            <span class="link" @click="setPower(row)">设置权限</span>
           </template>
         </el-table-column>
       </el-table>
@@ -57,7 +72,7 @@
 <script>
 import PaginationPage from '@/components/PaginationPage.vue';
 
-import { queryOrgList } from '@/api/list.js';
+import { queryOrgUserList } from '@/api/list.js';
 import { createOrg } from '@/api/org.js';
 
 export default {
@@ -83,9 +98,9 @@ export default {
   },
   methods: {
     queryOrgList(data) {
-      queryOrgList(data).then(({ total_count, org_list }) => {
+      queryOrgUserList(data).then(({ total_count, user_list }) => {
         this.total = total_count;
-        this.list = org_list;
+        this.list = user_list;
         this.page_capacity = data.page_capacity;
         this.cur_page = data.cur_page;
       });
@@ -106,53 +121,8 @@ export default {
       }
       this.orgAddFlag = true;
     },
-    // 设置机构管理员
-    setOrgManager(id) {},
-    // 删除机构
-    deleteOrg(id) {
-      let _this = this;
-      _this
-        .$confirm('确定要删除此机构吗?', '提示', {
-          confirmButtonText: '确定',
-          cancelButtonText: '取消',
-          type: 'warning',
-        })
-        .then(function () {
-          // transferFilesDelete({ id: id }).then((res) => {
-          //   if (res.status === 1) {
-          _this.queryOrgList({ cur_page: _this.cur_page, page_capacity: _this.page_capacity });
-          _this.$message({
-            type: 'success',
-            message: '删除成功!',
-          });
-          // }
-          // });
-        })
-        .catch(() => {});
-    },
-    // 新增、编辑机构
-    submitOrg() {
-      const _this = this;
-      _this.$refs.formDialog.validate((valid) => {
-        if (valid) {
-          this.loading = true;
-          createOrg(_this.org_Info)
-            .then((res) => {
-              if (res.status === 1) {
-                this.loading = false;
-                _this.queryOrgList({ cur_page: _this.cur_page, page_capacity: _this.page_capacity });
-                _this.$message({
-                  type: 'success',
-                  message: '创建成功!',
-                });
-              }
-            })
-            .catch(() => {
-              this.loading = false;
-            });
-        }
-      });
-    },
+    setPower(row) {},
+    setOrgManager(row) {},
   },
 };
 </script>
@@ -160,9 +130,14 @@ export default {
 <style lang="scss" scoped>
 @use '@/styles/mixin.scss' as *;
 
-.project {
+.user-manage {
   @include page-base;
 
+  .btn-box {
+    display: flex;
+    gap: 10px;
+  }
+
   .add-btn {
     width: 120px;
     margin-bottom: 20px;