diff --git a/src/api/index.js b/src/api/index.js
index b58cda7..5c05490 100644
--- a/src/api/index.js
+++ b/src/api/index.js
@@ -6,12 +6,21 @@ export default {
   logins: `iasf/sys/user/login`,
   verification: `${host}iasf/sys/getVerify`,
   upload: `${host}iasf/sysFiles/upload`,
-  listByPage: `${host}iasf/sysFiles/listByPage`,
-  delFile: `${host}iasf/sysFiles/delete`,
+  listByPage: `iasf/sysFiles/listByPage`,
+  delFile: `iasf/sysFiles/delete`,
   dept: `iasf/sys/dept`,
   deptTree: `iasf/sys/dept/tree`,
-  deptId: `iasf/sys/dept`,
   depts: `iasf/sys/depts`,
+  users: `iasf/sys/users`,
+  user: `iasf/sys/user`,
+  roles: `iasf/sys/roles`,
+  role: `iasf/sys/role`,
+  perTree: `iasf/sys/permission/tree/all`,
+  groupAdd: `iasf/sys/userGroup/add`,
+  groupDel: `iasf/sys/userGroup/delete`,
+  groupDel: `iasf/sys/userGroup/delete`,
+  groupList: `iasf/sys/userGroup/list`,
+  groupUpdate: `iasf/sys/userGroup/update`,
   listWithTree: `${host1}iasf/sysColumn/listWithTree`,
   saveColumn: `${host1}iasf/sysColumn/save`,
   updateColumn: `${host1}iasf/sysColumn/update`,
diff --git a/src/const/column.js b/src/const/column.js
index b1e5271..acd5a28 100644
--- a/src/const/column.js
+++ b/src/const/column.js
@@ -37,11 +37,33 @@ export default {
   sites: [
     {
       id: 1,
-      name: 'EFL中文'
+      name: '粒子研究院英文站点',
+      domain: 'www.iasf.ac.cn'
     },
     {
       id: 2,
-      name: 'SRL中文'
+      name: '粒子研究院中文站点',
+      domain: 'www.iasf.ac.cn'
+    },
+    {
+      id: 3,
+      name: 'SFEL中文站点',
+      domain: 'www.iasf.ac.cn'
+    },
+    {
+      id: 4,
+      name: 'SFEL英文站点',
+      domain: 'www.iasf.ac.cn'
+    },
+    {
+      id: 5,
+      name: 'SRL中文站点',
+      domain: 'www.iasf.ac.cn'
+    },
+    {
+      id: 6,
+      name: 'SRL英文站点',
+      domain: 'www.iasf.ac.cn'
     },
   ],
 }
\ No newline at end of file
diff --git a/src/layouts/navbar/index.vue b/src/layouts/navbar/index.vue
index 52dc542..107cf4d 100644
--- a/src/layouts/navbar/index.vue
+++ b/src/layouts/navbar/index.vue
@@ -124,7 +124,7 @@ export default {
             },
             {
               icon: 'annex',
-              index: '/annex',
+              index: '/annex/list',
               title: '附件管理'
             }
           ],
diff --git a/src/pages/annex/list/index.vue b/src/pages/annex/list/index.vue
index 33b4322..d741e5e 100644
--- a/src/pages/annex/list/index.vue
+++ b/src/pages/annex/list/index.vue
@@ -1,8 +1,35 @@
 <template>
   <div class="page">
+    <div class="tool">
+    <ul class="filter">
+      <li>
+        <label>站点选择</label>
+        <el-select v-model="form.site" @change="initData">
+          <el-option label="不限" value=""></el-option>
+          <el-option
+            v-for="item in sites"
+            :key="item.id"
+            :label="item.name"
+            :value="item.id">
+          </el-option>
+        </el-select>
+      </li>
+      <li>
+        <label>文件类型</label>
+        <el-select v-model="form.type" @change="initData">
+          <el-option
+            v-for="item in types"
+            :key="item.name"
+            :label="item.name"
+            :value="item.name">
+          </el-option>
+        </el-select>
+      </li>
+    </ul>
+    </div>
     <div class="tool">
       <div class="search-wrap">
-        <el-input placeholder="请输入站点名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
+        <el-input placeholder="请输入文章名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
         <el-button type="primary" @click="initData">查询</el-button>
       </div>
       <div class="actions">
@@ -32,7 +59,7 @@
       <el-table-column label="操作" width="170">
         <template slot-scope="scope">
           <el-button type="text" @click="del(scope.row)">删除</el-button>
-          <el-button type="text" @click="edit(scope.row, 'edit')">下级</el-button>
+          <el-button type="text" @click="download(scope.row, 'edit')">下载</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -43,11 +70,31 @@
 </template>
 
 <script>
-import util from "@/libs/util";
+import util from '@/libs/util'
+import ColumnConst from '@/const/column'
 export default {
     data() {
         return {
+          sites: ColumnConst.sites,
+          types: [
+            {
+              name: '不限'
+            },
+            {
+              name: '图片'
+            },
+            {
+              name: '视频'
+            },
+            {
+              name: '文档'
+            }
+          ],
           keyword: '',
+          form: {
+            site: '',
+            type: '不限'
+          },
           page: +this.$route.query.page || 1,
           pageSize: 10,
           total: 0,
@@ -60,9 +107,13 @@ export default {
     },
     methods: {
       getData() {
+        const { form } = this
         this.$post(this.api.listByPage, {
           page: this.page,
           limit: this.pageSize,
+          quote: this.keyword,
+          site: form.site,
+          type: form.type === '不限' ? '' : form.type
         }).then(({ data }) => {
           this.list = data.records
           this.total = +data.total
@@ -73,12 +124,11 @@ export default {
         this.page = 1
         this.getData()
       },
-      add() {
-        this.$router.push('add')
-      },
-      edit(row, type) {
-        this.$router.push(`add?id=${row.id}&level=${row.level + 1}&type=${type}`)
+      // 下载
+      download(row) {
+        util.downloadFile(row.fileName, row.filePath)
       },
+      // 删除
       del(row) {
         this.$confirm('确定要删除吗？', '提示', {
           type: 'warning'
@@ -89,6 +139,7 @@ export default {
           }).catch(res => {})
         }).catch(() => {})
       },
+      // 批量删除
       batchDel() {
         const list = this.multipleSelection
         if (list.length) {
diff --git a/src/pages/column/list/index.vue b/src/pages/column/list/index.vue
index 4e873fe..9e48826 100644
--- a/src/pages/column/list/index.vue
+++ b/src/pages/column/list/index.vue
@@ -147,31 +147,22 @@ export default {
           }).catch(res => {})
         }).catch(() => {})
       },
+      // 批量删除
       batchDel() {
-          if (this.multipleSelection.length) {
-              let ids = this.multipleSelection.map(item => {
-                  return item.id;
-              });
-              this.$confirm("确定要删除吗？", "提示", {
-                  type: "warning"
-              }).then(() => {
-                  
-                  this.$post(this.api.deleteAssessment, ids).then(res => {
-                      this.multipleSelection = [];
-                      this.$refs.table.clearSelection();
-                      util.successMsg("删除成功");
-                      this.sss = 0
-                      this.getData();
-                  }).catch(res => {
-                  });
-                  if(this.multipleSelection.length === this.list.length && this.page>1) {
-                      this.handleCurrentChange(this.page - 1)
-                  }
-              }).catch(() => {
-              });
-          } else {
-              util.errorMsg("请先选择数据 ！");
-          }
+        const list = this.multipleSelection
+        if (list.length) {
+          this.$confirm('确定要删除吗？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.$del(`${this.api.user}`, list.map(e => e.id)).then(res => {
+              this.$refs.table.clearSelection()
+              util.successMsg('删除成功')
+              this.getStaff()
+            }).catch(res => {})
+          }).catch(() => {})
+        } else {
+          util.errorMsg('请先选择数据 ！')
+        }
       },
       handleSelectionChange(val) {
         this.multipleSelection = val
diff --git a/src/pages/role/list/index.vue b/src/pages/role/list/index.vue
index 1f96721..67605c1 100644
--- a/src/pages/role/list/index.vue
+++ b/src/pages/role/list/index.vue
@@ -1,68 +1,62 @@
 <template>
-    <div class="page">
-        <h6 class="p-title">筛选</h6>
-        <div class="tool">
-            <ul class="filter">
-                <li>
-                    <el-input placeholder="请输入角色名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
-                </li>
-            </ul>
-            <div>
-                <el-button v-auth="'角色权限:新增角色'" type="info" round @click="addRole">新增角色</el-button>
-                <el-button v-auth="'角色权限:批量删除'" type="primary" round @click="delAllSelection">批量删除</el-button>
-            </div>
-        </div>
-
-        <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-            <el-table-column type="selection" width="55" align="center" :selectable="practiceSelectable" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="roleName" label="角色名称" align="center" min-width="250" show-overflow-tooltip></el-table-column>
-            <el-table-column label="角色描述" min-width="400" align="center">
-                <template slot-scope="scope">
-                    <el-input placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark" disabled></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="200">
-                <template slot-scope="scope">
-                    <el-button v-auth="'角色权限:查看'" type="text" @click="showRole(scope.row)">查看</el-button>
-                    <el-button v-auth="'角色权限:编辑'" v-if="scope.row.roleName !== '超级管理员'" type="text" @click="editRole(scope.row)">编辑</el-button>
-                    <el-button v-auth="'角色权限:删除'" v-if="scope.row.roleName !== '超级管理员' && scope.row.roleName !== '管理员'" type="text" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
-        </div>
+  <div class="page">
+    <div class="tool">
+      <div class="search-wrap">
+        <el-input placeholder="请输入角色名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
+        <el-button type="primary" @click="initData">查询</el-button>
+      </div>
+      <div class="actions">
+        <el-button type="primary" @click="addRole">新增</el-button>
+        <el-button @click="batchDel">删除</el-button>
+      </div>
+    </div>
 
-        <el-dialog :title="isDetail ? '查看角色' : (isAdd ? '新增角色' : '编辑角色')" :visible.sync="roleVisible" width="30%" @close="closeRole" class="dialog" :close-on-click-modal="false">
-            <el-form ref="form" label-width="80px" :disabled="isDetail">
-                <el-form-item label="角色名称">
-                    <el-input v-model="form.roleName" placeholder="请输入角色名称"></el-input>
-                </el-form-item>
-                <el-form-item label="角色描述">
-                    <el-input v-model="form.remark" placeholder="请输入角色描述" type="textarea" rows="5"></el-input>
-                </el-form-item>
-                <el-form-item prop="role" label="角色权限">
-                    <div style="max-height: 300px; overflow: auto">
-                        <el-tree
-                            ref="per"
-                            :data="permissions"
-                            show-checkbox
-                            default-expand-all
-                            node-key="id"
-                            :default-expanded-keys="checkedIds"
-                            :default-checked-keys="checkedIds"
-                            :props="defaultProps">
-                        </el-tree>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="roleVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveData">确 定</el-button>
-            </span>
-        </el-dialog>
+    <el-table :data="list" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" row-key="id">
+      <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
+      <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
+      <el-table-column prop="name" label="角色名称" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="description" label="角色描述" min-width="400" align="center"></el-table-column>
+      <el-table-column label="操作" align="center" width="200">
+        <template slot-scope="scope">
+          <el-button type="text" @click="showRole(scope.row)">查看</el-button>
+          <el-button v-if="scope.row.name !== '超级管理员'" type="text" @click="editRole(scope.row)">编辑</el-button>
+          <el-button v-if="scope.row.name !== '超级管理员' && scope.row.name !== '管理员'" type="text" @click="handleDelete(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+    <div class="pagination">
+      <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
     </div>
+
+    <el-dialog :title="isDetail ? '查看角色' : (isAdd ? '新增角色' : '编辑角色')" :visible.sync="roleVisible" width="30%" @close="closeRole" class="dialog" :close-on-click-modal="false">
+        <el-form ref="form" label-width="80px" :disabled="isDetail">
+            <el-form-item label="角色名称">
+                <el-input v-model="form.name" placeholder="请输入角色名称"></el-input>
+            </el-form-item>
+            <el-form-item label="角色描述">
+                <el-input v-model="form.description" placeholder="请输入角色描述" type="textarea" rows="5"></el-input>
+            </el-form-item>
+            <el-form-item prop="role" label="角色权限">
+                <div style="max-height: 300px; overflow: auto">
+                    <el-tree
+                        ref="per"
+                        :data="permissions"
+                        show-checkbox
+                        default-expand-all
+                        node-key="id"
+                        :default-expanded-keys="checkedIds"
+                        :default-checked-keys="checkedIds"
+                        :props="defaultProps">
+                    </el-tree>
+                </div>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer" v-if="!isDetail">
+            <el-button @click="roleVisible = false">取 消</el-button>
+            <el-button type="primary" @click="saveData">确 定</el-button>
+        </span>
+    </el-dialog>
+  </div>
 </template>
 
 <script>
@@ -72,17 +66,15 @@ export default {
     data() {
         return {
             keyword: "",
-            searchTimer: null,
             isDetail: false,
             form: {
                 id: "",
-                roleName: "",
-                remark: ""
+                name: "",
+                description: ""
             },
-            listData: [],
+            list: [],
             defaultProps: {
-                children: "children",
-                label: "name"
+                label: "title"
             },
             page: 1,
             pageSize: 10,
@@ -95,23 +87,24 @@ export default {
             roleNameReapeat: false // 角色名称是否重复
         };
     },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.getData();
-            }, 500);
-        }
-    },
     mounted() {
         this.getData();
     },
     methods: {
         getData() {
-            this.$get(`${this.api.roleList}?page=${this.page}&size=${this.pageSize}&name=${util.encodeStr(this.keyword)}&platformId=1&port=0`).then(res => {
-                this.listData = res.rolePage.records;
-                this.total = res.rolePage.total;
-            }).catch(res => {});
+            this.$post(this.api.roles, {
+              page: this.page,
+              limit: this.pageSize,
+              name: this.keyword,
+            }).then(({ data }) => {
+              this.list = data.records
+              this.total = +data.total
+            }).catch(res => {})
+        },
+        initData() {
+          this.$refs.table.clearSelection()
+          this.page = 1
+          this.getData()
         },
         currentChange(val) {
             this.page = val;
@@ -121,19 +114,16 @@ export default {
             this.$confirm("确定要删除吗？", "提示", {
                 type: "warning"
             }).then(() => {
-                this.$post(`${this.api.batchRemove}?roleIds=${row.id}`).then(res => {
+                this.$del(`${this.api.role}/${row.id}`).then(res => {
                     util.successMsg("删除成功");
                     this.getData();
                 }).catch(res => {});
             }).catch(() => {});
         },
-        getRowKeys(row) {
-            return row.id;
-        },
         handleSelectionChange(val) {
             this.multipleSelection = val;
         },
-        delAllSelection() {
+        batchDel() {
             if (this.multipleSelection.length) {
                 this.$confirm("确定要删除吗？", "提示", {
                     type: "warning"
@@ -146,7 +136,7 @@ export default {
                         util.successMsg("删除成功");
                         this.getData();
                     }).catch(res => {});
-                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
+                    if(this.multipleSelection.length === this.list.length && this.page>1) {
                         this.handleCurrentChange(this.page - 1)
                     }
                 }).catch(() => {});
@@ -154,21 +144,12 @@ export default {
                 util.errorMsg("请先选择数据！");
             }
         },
-        practiceSelectable(row, index){
-            let boolean = true;
-            if(row.roleName == '超级管理员'){
-                boolean = false
-            }else{
-                boolean = true
-            }
-            return boolean;
-        },
         closeRole() {
             this.isDetail = false;
             this.form = {
                 id: "",
-                roleName: "",
-                remark: ""
+                name: "",
+                description: ""
             };
             this.checkedIds = [];
             this.permissions = [];
@@ -176,22 +157,8 @@ export default {
         // 获取权限菜单
         getPer(row) {
             if (!this.permissions.length) {
-                this.$get(`${this.api.queryAllMenus}?platformId=${Setting.platformId}`).then(res => {
-                    let data = res.children;
-                    // 因为有些菜单是后来去掉的，但是数据库里要去掉的话就得全部重新加了，所以就在前端来手动把不需要了的菜单给去掉，下面同理
-                    let yw = data.findIndex(n => n.name == "业务后台");
-                    yw != -1 && data.splice(yw, 1);
-                    try {
-                        let system = data.findIndex(n => n.name == "系统设置");
-
-                        if (system != -1) {
-                            data[system].children[1].children.splice(4, 1);
-                            data[system].children[1].children.splice(1, 1);
-                            data[system].children[1].children.splice(0, 1);
-                        }
-                    } catch (error) {
-                    }
-                    this.permissions = data;
+                this.$get(this.api.perTree).then(({ data }) => {
+                    this.permissions = data[0].children
                     if (row) {
                         this.getDetail(row);
                     }
@@ -220,12 +187,14 @@ export default {
             }
             return result;
         },
-        async getDetail(row) { // 查询详情
-            let res = await this.$get(`${this.api.obtainDetails}?id=${row.id}`);
-            this.form = res.role;
-            this.form.id = row.id;
-            this.checkedIds = this.handleRolePer(res.permissionList, this.permissions);
-            this.$refs.per.setCheckedNodes(this.checkedIds);
+        // 查询详情
+        async getDetail(row) {
+          this.$get(`${this.api.role}/${row.id}`).then(({ data }) => {
+            this.form.name = data.name
+            this.form.description = data.description
+            // this.checkedIds = this.handleRolePer(res.permissionList, this.permissions);
+            // this.$refs.per.setCheckedNodes(this.checkedIds);
+          }).catch(err => {})
         },
         showRole(row) {
             this.isDetail = true;
@@ -239,29 +208,29 @@ export default {
             this.roleVisible = true;
         },
         async saveData() {
-            if (!this.form.roleName) return util.warningMsg("请填写角色名称");
-            if (!this.form.remark) return util.warningMsg("请填写角色描述");
-            if (!this.$refs.per.getCheckedKeys().length) return util.warningMsg("请选择角色权限");
-            // 获取已勾选的,和半勾选的(即子级没有全部勾选的节点),半勾选的一样要传给后端
-            let permissionId = [...this.$refs.per.getHalfCheckedKeys(), ...this.$refs.per.getCheckedKeys()];
-            let data = {
-                ...this.form,
-                permissionId,
-                platformId:1,
-            };
-            if (this.form.id) {
-                this.$post(this.api.saveOrUpdate, data).then(res => {
-                    util.successMsg("修改成功");
-                    this.getData();
-                    this.roleVisible = false;
-                }).catch(res => {});
-            } else {
-                this.$post(this.api.saveOrUpdate, data).then(res => {
-                    util.successMsg("新增成功");
-                    this.getData();
-                    this.roleVisible = false;
-                }).catch(res => {});
-            }
+          // return console.log(44, this.$refs.per.getCheckedNodes())
+          const { form } = this
+          if (!form.name) return util.warningMsg("请填写角色名称");
+          if (!form.description) return util.warningMsg("请填写角色描述");
+          const checked = this.$refs.per.getCheckedNodes()
+          if (!checked.length) return util.warningMsg("请选择角色权限");
+          let data = {
+            ...form,
+            permissionRespNodes: checked
+          };
+          if (form.id) {
+            this.$put(this.api.role, data).then(res => {
+              util.successMsg("修改成功");
+              this.getData();
+              this.roleVisible = false;
+            }).catch(res => {});
+          } else {
+            this.$post(this.api.role, data).then(res => {
+              util.successMsg("新增成功");
+              this.getData();
+              this.roleVisible = false;
+            }).catch(res => {});
+          }
         }
     }
 };
diff --git a/src/pages/site/list/index.vue b/src/pages/site/list/index.vue
index c5d2582..3831e13 100644
--- a/src/pages/site/list/index.vue
+++ b/src/pages/site/list/index.vue
@@ -31,25 +31,15 @@
 
 <script>
 import { mapMutations } from 'vuex'
+import ColumnConst from '@/const/column'
 export default {
     data() {
       return {
         keyword: '',
-        page: +this.$route.query.page || 1, // 当前页数
-        pageSize: 10, // 每页10条
-        total: 2, // 总数
-        list: [
-          {
-            id: 1,
-            name: '粒子研究院中文站点',
-            domain: 'www.iasf.ac.cn'
-          },
-          {
-            id: 2,
-            name: '粒子研究院英文文站点',
-            domain: 'www.iasf.ac.en'
-          }
-        ]
+        page: +this.$route.query.page || 1,
+        pageSize: 10,
+        total: 6,
+        list: ColumnConst.sites
       };
     },
     mounted() {
diff --git a/src/pages/system/list/index.vue b/src/pages/system/list/index.vue
deleted file mode 100644
index 58168aa..0000000
--- a/src/pages/system/list/index.vue
+++ /dev/null
@@ -1,62 +0,0 @@
-<template>
-    <div class="page" style="padding: 0">
-        <div class="tabs">
-            <a class="item" v-for="(item,index) in tabs" :key="index" :class="{active: index == active}" @click="tabChange(index)">{{ item }}</a>
-        </div>
-
-        <staff v-if="active == 'staff'"></staff>
-        <role v-if="active == 'role'"></role>
-        <logo v-if="active == 'logo'"></logo>
-    </div>
-</template>
-
-<script>
-import { mapState } from 'vuex'
-import Setting from '@/setting'
-import staff from "./staff";
-import role from "./role";
-import logo from "./logo";
-export default {
-    data() {
-        return {
-            active: "staff",
-            tabs: {
-                staff: "员工管理",
-                role: "角色权限",
-                logo: "系统logo设置",
-            }
-        };
-    },
-    computed: {
-      ...mapState('auth', [
-        'btns'
-      ])
-    },
-    components: {
-        staff,
-        role,
-        logo
-    },
-    created() {
-      Setting.dynamicRoute && this.initTabs()
-    },
-    methods: {
-      tabChange(index) {
-        this.active = index
-      },
-      initTabs() {
-        const { btns } = this
-        const tab1 = btns.includes('/system/list:员工管理')
-        const tab2 = btns.includes('/system/list:角色权限')
-        const tab3 = btns.includes('/system/list:系统logo设置')
-        tab1 || delete this.tabs.staff
-        tab2 || delete this.tabs.role
-        tab3 || delete this.tabs.logo
-      }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/pages/system/list/logo.vue b/src/pages/system/list/logo.vue
deleted file mode 100644
index 78cb6d4..0000000
--- a/src/pages/system/list/logo.vue
+++ /dev/null
@@ -1,190 +0,0 @@
-<template>
-    <div class="page">
-        <h6 class="p-title">系统logo设置</h6>
-        <el-form ref="form" label-width="100px">
-            <el-form-item label="标题">
-                <el-input v-model="form.title " ref="account" placeholder="请输入标题" style="width: 400px"></el-input>
-            </el-form-item>
-            <el-form-item label="图标">
-                <el-upload
-                    class="avatar-uploader"
-                    accept=".jpg,.png,.jpeg"
-                    :on-remove="handleRemove"
-                    :on-error="uploadError"
-                    :on-success="uploadSuccess"
-                    :before-remove="beforeRemove"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :action="this.api.fileupload"
-                    :headers="headers"
-                    name="file"
-                >
-                    <img v-if="coverUrl" :src="coverUrl" class="avatar">
-                    <div class="uploader-default" v-else>
-                        <i class="el-icon-plus"></i>
-                        <p>上传图标</p>
-                    </div>
-
-                    <div slot="tip" class="el-upload__tip">
-                        <p>只能上传jpg/png文件</p>
-                        <p>图标将按1:1显示，最佳分辨率100*100</p>
-                    </div>
-                </el-upload>
-            </el-form-item>
-            <el-form-item>
-                <el-button type="primary" @click="save">{{ form.id ? "更新" : "创建" }}</el-button>
-            </el-form-item>
-        </el-form>
-    </div>
-</template>
-
-<script>
-import util from "@/libs/util";
-import Setting from "@/setting";
-import { mapActions, mapState } from "vuex";
-export default {
-    name: "logo",
-    data() {
-        return {
-            headers: {
-                token: util.local.get(Setting.tokenKey)
-            },
-            coverUrl: "",
-            uploadList: [],
-            form: {
-                id: "",
-                title: "",
-                logoUrl: ""
-            }
-        }
-    },
-    mounted() {
-        this.getSystemDetail();
-    },
-    methods: {
-        ...mapActions("user", [
-            "setTitle", "setLogoUrl"
-        ]),
-        getSystemDetail () {
-            this.$get(this.api.logoDetail).then(res => {
-                if (res.data) {
-                    this.form = res.data;
-                    this.coverUrl = res.data.logoUrl;
-                    this.uploadList.push({
-                        name: "logo.jpg",
-                        url: this.coverUrl
-                    });
-                    this.setTitle(res.data.title);
-                    this.setLogoUrl(res.data.logoUrl);
-                }
-            }).catch(res => {});
-        },
-        handleExceed(files, fileList) { // 上传文件
-            util.warningMsg("当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！");
-        },
-        uploadSuccess(res, file, fileList) {
-            this.coverUrl = res.data.filesResult.fileUrl;
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            let fileName = this.coverUrl.replace("https://liuwanr.oss-cn-shenzhen.aliyuncs.com/", "");
-            this.$del(`${this.api.fileDeletion}?keys=${fileName}`).then(res => {
-                this.coverUrl = "";
-            }).catch(res => {
-            });
-        },
-        save() {
-            this.form.logoUrl = this.coverUrl;
-            if (this.form.id) {
-                this.$post(this.api.logoUpdate, this.form).then(res => {
-                    util.successMsg("更新成功");
-                    this.getSystemDetail();
-                }).catch(res => {});
-            } else {
-                this.$post(this.api.logoSave, this.form).then(res => {
-                    util.successMsg("新增成功");
-                    this.getSystemDetail();
-                }).catch(res => {});
-            }
-        }
-    }
-};
-</script>
-
-<style lang="scss" scoped>
-$avatar-width: 104px;
-/deep/ .avatar-uploader {
-.el-upload {
-    position: relative;
-    width: $avatar-width;
-    border: 1px dashed #d9d9d9;
-    border-radius: 2px;
-    cursor: pointer;
-    overflow: hidden;
-
-&:hover {
-     border-color: #409EFF;
- }
-
-.uploader-default {
-    display: flex;
-    flex-direction: column;
-    justify-content: center;
-    width: $avatar-width !important;
-    height: $avatar-width;
-    text-align: center;
-    background: rgba(0, 0, 0, 0.04);
-
-i {
-    font-size: 20px;
-    font-weight: bold;
-    color: #8c939d;
-}
-
-p {
-    margin-top: 10px;
-    font-size: 14px;
-    color: rgba(0, 0, 0, 0.65);
-    line-height: 1;
-}
-}
-
-.avatar {
-    width: $avatar-width;
-    height: $avatar-width;
-    display: block;
-}
-}
-
-.el-upload__tip {
-    margin-top: 0;
-
-p {
-    font-size: 14px;
-    color: rgba(0, 0, 0, 0.45);
-    line-height: 1;
-
-&:first-child {
-     margin-bottom: 5px;
- }
-}
-}
-}
-
-/deep/ .d-inline-block {
-    width: 216px;
-
-.el-select, .el-input {
-    width: 100%;
-}
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/system/list/role.vue b/src/pages/system/list/role.vue
deleted file mode 100644
index 1f96721..0000000
--- a/src/pages/system/list/role.vue
+++ /dev/null
@@ -1,271 +0,0 @@
-<template>
-    <div class="page">
-        <h6 class="p-title">筛选</h6>
-        <div class="tool">
-            <ul class="filter">
-                <li>
-                    <el-input placeholder="请输入角色名称" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
-                </li>
-            </ul>
-            <div>
-                <el-button v-auth="'角色权限:新增角色'" type="info" round @click="addRole">新增角色</el-button>
-                <el-button v-auth="'角色权限:批量删除'" type="primary" round @click="delAllSelection">批量删除</el-button>
-            </div>
-        </div>
-
-        <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-            <el-table-column type="selection" width="55" align="center" :selectable="practiceSelectable" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="roleName" label="角色名称" align="center" min-width="250" show-overflow-tooltip></el-table-column>
-            <el-table-column label="角色描述" min-width="400" align="center">
-                <template slot-scope="scope">
-                    <el-input placeholder="该角色用于管理全部功能权限" v-model="scope.row.remark" disabled></el-input>
-                </template>
-            </el-table-column>
-            <el-table-column label="操作" align="center" width="200">
-                <template slot-scope="scope">
-                    <el-button v-auth="'角色权限:查看'" type="text" @click="showRole(scope.row)">查看</el-button>
-                    <el-button v-auth="'角色权限:编辑'" v-if="scope.row.roleName !== '超级管理员'" type="text" @click="editRole(scope.row)">编辑</el-button>
-                    <el-button v-auth="'角色权限:删除'" v-if="scope.row.roleName !== '超级管理员' && scope.row.roleName !== '管理员'" type="text" @click="handleDelete(scope.row)">删除</el-button>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
-        </div>
-
-        <el-dialog :title="isDetail ? '查看角色' : (isAdd ? '新增角色' : '编辑角色')" :visible.sync="roleVisible" width="30%" @close="closeRole" class="dialog" :close-on-click-modal="false">
-            <el-form ref="form" label-width="80px" :disabled="isDetail">
-                <el-form-item label="角色名称">
-                    <el-input v-model="form.roleName" placeholder="请输入角色名称"></el-input>
-                </el-form-item>
-                <el-form-item label="角色描述">
-                    <el-input v-model="form.remark" placeholder="请输入角色描述" type="textarea" rows="5"></el-input>
-                </el-form-item>
-                <el-form-item prop="role" label="角色权限">
-                    <div style="max-height: 300px; overflow: auto">
-                        <el-tree
-                            ref="per"
-                            :data="permissions"
-                            show-checkbox
-                            default-expand-all
-                            node-key="id"
-                            :default-expanded-keys="checkedIds"
-                            :default-checked-keys="checkedIds"
-                            :props="defaultProps">
-                        </el-tree>
-                    </div>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="roleVisible = false">取 消</el-button>
-                <el-button type="primary" @click="saveData">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
-</template>
-
-<script>
-import util from "@/libs/util";
-import Setting from "@/setting";
-export default {
-    data() {
-        return {
-            keyword: "",
-            searchTimer: null,
-            isDetail: false,
-            form: {
-                id: "",
-                roleName: "",
-                remark: ""
-            },
-            listData: [],
-            defaultProps: {
-                children: "children",
-                label: "name"
-            },
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            multipleSelection: [],
-            isAdd: true,
-            roleVisible: false,
-            permissions: [],
-            checkedIds: [],
-            roleNameReapeat: false // 角色名称是否重复
-        };
-    },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.getData();
-            }, 500);
-        }
-    },
-    mounted() {
-        this.getData();
-    },
-    methods: {
-        getData() {
-            this.$get(`${this.api.roleList}?page=${this.page}&size=${this.pageSize}&name=${util.encodeStr(this.keyword)}&platformId=1&port=0`).then(res => {
-                this.listData = res.rolePage.records;
-                this.total = res.rolePage.total;
-            }).catch(res => {});
-        },
-        currentChange(val) {
-            this.page = val;
-            this.getData();
-        },
-        handleDelete(row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.batchRemove}?roleIds=${row.id}`).then(res => {
-                    util.successMsg("删除成功");
-                    this.getData();
-                }).catch(res => {});
-            }).catch(() => {});
-        },
-        getRowKeys(row) {
-            return row.id;
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        delAllSelection() {
-            if (this.multipleSelection.length) {
-                this.$confirm("确定要删除吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(item => {
-                        return item.id;
-                    });
-                    this.$post(`${this.api.batchRemove}?roleIds=${ids.toString()}`).then(res => {
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        this.getData();
-                    }).catch(res => {});
-                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
-                        this.handleCurrentChange(this.page - 1)
-                    }
-                }).catch(() => {});
-            } else {
-                util.errorMsg("请先选择数据！");
-            }
-        },
-        practiceSelectable(row, index){
-            let boolean = true;
-            if(row.roleName == '超级管理员'){
-                boolean = false
-            }else{
-                boolean = true
-            }
-            return boolean;
-        },
-        closeRole() {
-            this.isDetail = false;
-            this.form = {
-                id: "",
-                roleName: "",
-                remark: ""
-            };
-            this.checkedIds = [];
-            this.permissions = [];
-        },
-        // 获取权限菜单
-        getPer(row) {
-            if (!this.permissions.length) {
-                this.$get(`${this.api.queryAllMenus}?platformId=${Setting.platformId}`).then(res => {
-                    let data = res.children;
-                    // 因为有些菜单是后来去掉的，但是数据库里要去掉的话就得全部重新加了，所以就在前端来手动把不需要了的菜单给去掉，下面同理
-                    let yw = data.findIndex(n => n.name == "业务后台");
-                    yw != -1 && data.splice(yw, 1);
-                    try {
-                        let system = data.findIndex(n => n.name == "系统设置");
-
-                        if (system != -1) {
-                            data[system].children[1].children.splice(4, 1);
-                            data[system].children[1].children.splice(1, 1);
-                            data[system].children[1].children.splice(0, 1);
-                        }
-                    } catch (error) {
-                    }
-                    this.permissions = data;
-                    if (row) {
-                        this.getDetail(row);
-                    }
-                }).catch(res => {
-                });
-            }
-        },
-        addRole() {
-            this.isAdd = true;
-            this.getPer();
-            this.checkedIds = [];
-            this.permissions.length && this.$refs.per.setCheckedNodes([]);
-            this.roleVisible = true;
-        },
-        // 递归处理勾选的权限
-        handleRolePer(data, permissions) {
-            let result = data;
-            if (permissions.length) {
-                permissions.map(e => {
-                    if (result.includes(e.id) && e.children) {
-                        // 如果该权限下的子权限不是每个都勾选了,就把该权限的id从已勾选的id集合里去除,因为如果不去除的话,这个权限就会勾选,同时会把该权限下的所有子权限都一起勾选
-                        e.children.every(n => result.includes(n)) || result.splice(result.indexOf(e.id), 1);
-                    }
-                    e.children && e.children.length && this.handleRolePer(data, e.children);
-                });
-            }
-            return result;
-        },
-        async getDetail(row) { // 查询详情
-            let res = await this.$get(`${this.api.obtainDetails}?id=${row.id}`);
-            this.form = res.role;
-            this.form.id = row.id;
-            this.checkedIds = this.handleRolePer(res.permissionList, this.permissions);
-            this.$refs.per.setCheckedNodes(this.checkedIds);
-        },
-        showRole(row) {
-            this.isDetail = true;
-            this.isAdd = false;
-            this.getPer(row);
-            this.roleVisible = true;
-        },
-        editRole(row) {
-            this.isAdd = false;
-            this.getPer(row);
-            this.roleVisible = true;
-        },
-        async saveData() {
-            if (!this.form.roleName) return util.warningMsg("请填写角色名称");
-            if (!this.form.remark) return util.warningMsg("请填写角色描述");
-            if (!this.$refs.per.getCheckedKeys().length) return util.warningMsg("请选择角色权限");
-            // 获取已勾选的,和半勾选的(即子级没有全部勾选的节点),半勾选的一样要传给后端
-            let permissionId = [...this.$refs.per.getHalfCheckedKeys(), ...this.$refs.per.getCheckedKeys()];
-            let data = {
-                ...this.form,
-                permissionId,
-                platformId:1,
-            };
-            if (this.form.id) {
-                this.$post(this.api.saveOrUpdate, data).then(res => {
-                    util.successMsg("修改成功");
-                    this.getData();
-                    this.roleVisible = false;
-                }).catch(res => {});
-            } else {
-                this.$post(this.api.saveOrUpdate, data).then(res => {
-                    util.successMsg("新增成功");
-                    this.getData();
-                    this.roleVisible = false;
-                }).catch(res => {});
-            }
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-
-</style>
\ No newline at end of file
diff --git a/src/pages/system/list/staff.vue b/src/pages/system/list/staff.vue
deleted file mode 100644
index 3063830..0000000
--- a/src/pages/system/list/staff.vue
+++ /dev/null
@@ -1,585 +0,0 @@
-<template>
-    <div class="wrap">
-        <div class="side">
-            <org ref="org" @getSingle="getSingle" @getCheck="getCheck"></org>
-        </div>
-
-        <div class="right">
-            <h6 class="p-title">筛选</h6>
-            <div class="tool">
-                <ul class="filter">
-                    <li>
-                        <el-input placeholder="请输入员工姓名/工号" prefix-icon="el-icon-search" v-model.trim="keyword" clearable></el-input>
-                    </li>
-                </ul>
-                <div>
-                    <el-button v-auth="'员工管理:新增员工'" type="info" round @click="addTeacher">新增员工</el-button>
-                    <el-button v-auth="'员工管理:批量导入'" type="primary" round @click="batchImport">批量导入</el-button>
-                    <el-button v-auth="'员工管理:批量删除'" type="primary" round @click="delAllSelection">批量删除</el-button>
-                </div>
-            </div>
-
-            <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange">
-                <el-table-column type="selection" width="55" align="center"></el-table-column>
-                <el-table-column type="index" label="序号" width="55" align="center"></el-table-column>
-                <el-table-column prop="userName" label="职工姓名" align="center"></el-table-column>
-                <el-table-column prop="workNumber" label="职工工号" align="center"></el-table-column>
-                <el-table-column prop="dept" label="部门" align="center"></el-table-column>
-                <el-table-column prop="roleName" label="账号角色" align="center"></el-table-column>
-                <el-table-column prop="logInNumber" label="登录次数" align="center"></el-table-column>
-                <el-table-column prop="lastLoginTime" label="上次登录时间" align="center"></el-table-column>
-                <el-table-column label="操作" width="200" align="center">
-                    <template slot-scope="scope">
-                        <el-button v-auth="'员工管理:员工查看'" type="text" @click="showTeacher(scope.row)">查看</el-button>
-                        <el-button v-auth="'员工管理:员工编辑'" type="text" @click="editTeacher(scope.row)">编辑</el-button>
-                        <el-button v-auth="'员工管理:重置密码'" type="text" @click="resetPassword(scope.row)">重置密码</el-button>
-                        <el-button v-auth="'员工管理:员工删除'" type="text" @click="delTeacher(scope.row)">删除</el-button>
-                    </template>
-                </el-table-column>
-            </el-table>
-            <div class="pagination">
-                <el-pagination background layout="total, prev, pager, next" :current-page="page" @current-change="handleCurrentChange" :total="total"></el-pagination>
-            </div>
-        </div>
-
-        <el-dialog :title="isDetail ? '查看员工' : (isAdd ? '新增员工' : '编辑员工')" :visible.sync="teacherVisible"
-                   width="30%" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
-            <el-form ref="form" :model="form" :rules="rules" label-width="150px" :disabled="isDetail" style='margin-right: 80px;'>
-                <el-form-item prop="workNumber" label="工号">
-                    <el-input v-model.trim="form.workNumber" placeholder="请输入职工工号" @blur="workNumberChange"></el-input>
-                </el-form-item>
-                <el-form-item prop="userName" label="用户姓名">
-                    <el-input v-model.trim="form.userName" placeholder="请输入员工姓名"></el-input>
-                </el-form-item>
-                <el-form-item prop="roleValue" label="账号角色">
-                    <el-select v-model="form.roleValue" @change="roleChange" @remove-tag="roleRemove" multiple style="width: 100%;height: 32px">
-                        <el-option
-                            v-for="item in roleList"
-                            :key="item.id"
-                            :label="item.roleName"
-                            :value="item.id">
-                        </el-option>
-                    </el-select>
-                </el-form-item>
-                <el-form-item prop="uniqueIdentification" label="唯一标识">
-                    <el-input disabled v-model.trim="form.uniqueIdentification" placeholder="请输入职工工号获取唯一标识"></el-input>
-                </el-form-item>
-                <el-form-item v-for="item in form.roleAndDeptList" :label="`${item.roleName}所属部门`" :rules="{
-      required: true, message: '请选择', trigger: 'change'
-    }">
-                    <el-cascader
-                        v-model="item.cascaderValue"
-                        :options="orgList"
-                        :props="casProps"
-                        style="width: 100%"
-                    ></el-cascader>
-                </el-form-item>
-                <el-form-item prop="phone" label="手机号">
-                    <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11"></el-input>
-                </el-form-item>
-                <el-form-item prop="email" label="邮箱">
-                    <el-input v-model.trim="form.email" placeholder="请输入邮箱"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button @click="closeTeacher">取 消</el-button>
-                <el-button type="primary" @click="saveSure('form')">确 定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog title="批量导入" :visible.sync="importVisible" width="24%" :close-on-click-modal="false">
-            <div style="text-align: center">
-                <div style="margin-bottom: 10px;">
-                    <el-button type="primary" @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
-                </div>
-                <el-upload
-                    name="file"
-                    accept=".xls,.xlsx"
-                    :on-remove="handleRemove"
-                    :on-error="uploadError"
-                    :on-success="uploadSuccess"
-                    :before-remove="beforeRemove"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :action="this.api.importStaff"
-                    :file-list="uploadList"
-                    :headers="headers"
-                >
-                    <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
-                </el-upload>
-                <el-link v-if="uploadFaild" type="primary" @click="showFaild">部分数据导入失败，查看失败原因</el-link>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="importVisible = false">取 消</el-button>
-                <el-button type="primary" @click="uploadSure">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import Setting from "@/setting";
-import util from "@/libs/util";
-import org from "./staffSide"
-import { mapState } from "vuex";
-export default {
-    data() {
-        return {
-            exportCode: "",
-            headers: {
-                token: util.local.get(Setting.tokenKey)
-            },
-            isDetail: false,
-            isAdd: false,
-            teacherVisible: false,
-            roleList: [], // 角色列表
-            orgList: [], // 员工组织架构列表
-            casProps: {
-                value: 'id'
-            },
-            originForm: {},
-            form: {
-                accountId: "",
-                account: "",
-                userName: "",
-                roleValue: [],
-                roleAndDeptList: [],
-                uniqueIdentification: "",
-                workNumber: "",
-                phone: "",
-                email: ""
-            },
-            rules: {
-                userName: [
-                    { required: true, message: "请输入用户姓名", trigger: "blur" }
-                ],
-                roleValue: [
-                    { required: true, message: "请选择账号角色", trigger: "change" }
-                ],
-                workNumber: [
-                    { required: true, message: "请输入工号", trigger: 'blur' },
-                    {
-                        pattern: /^[A-Za-z0-9]*$/,
-                        message: "职工工号必须为数字或英文",
-                        trigger: "blur"
-                    }
-                ],
-                uniqueIdentification: [
-                    // { required: true, message: '请输入唯一标识', trigger: 'blur' },
-                ],
-                phone: [
-                    { pattern: /^1[3456789]\d{9}$/, message: "请输入正确的手机号", trigger: "blur"}
-                ],
-                email: [
-                    {
-                        pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
-                        message: "请输入正确的邮箱",
-                        trigger: "blur"
-                    }
-                ],
-            },
-            workNumberReapeat: false,
-            phoneRepeat: false,
-            emailRepeat: false,
-
-            listData: [], // 员工列表数据
-            keyword: "",
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            multipleSelection: [], // 多选
-
-            importVisible: false, // 批量导入对话框
-            uploadList: [], // 上传文件列表
-            uploadFaild: false, // 上传失败
-
-            gradeId: "", // 员工年级ID
-            staffArchitectureId: "", // 员工部门ID
-            submiting: false // 新增编辑员工防抖标识
-        };
-    },
-    components: {
-        org
-    },
-    computed: {
-        ...mapState("user", [
-            'schoolId'
-        ])
-    },
-    watch: {
-        keyword: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                this.initData();
-            }, 500);
-        }
-    },
-    mounted() {
-        this.originForm = JSON.parse(JSON.stringify(this.form))
-        this.getRoleData()
-        this.getData()
-    },
-    methods: {
-        getSingle(data) {
-            this.staffArchitectureId = data.gradeId ? '' : data.staffArchitectureId
-            this.gradeId = data.gradeId || ''
-            this.initData()
-        },
-        getCheck(data) {
-            const marjorIds = []
-            const depIds = []
-            data.forEach(e => {
-                e.gradeId ? depIds.push(e.gradeId) : marjorIds.push(e.staffArchitectureId)
-            });
-            this.staffArchitectureId = marjorIds.toString()
-            this.gradeId = depIds.toString()
-            this.initData()
-        },
-        initData() {
-            this.$refs.table.clearSelection()
-            this.page = 1
-            this.getData()
-        },
-        getData() { // 获取员工列表数据
-            let data = {
-                keyWord: this.keyword,
-                pageNum: this.page,
-                pageSize: this.pageSize,
-                staffArchitectureId: this.staffArchitectureId,
-                gradeId: this.gradeId
-            };
-            this.$post(this.api.staffList, data).then(res => {
-                this.listData = res.page.records;
-                this.total = res.page.total;
-            }).catch(res => {});
-        },
-        getRoleData() { // 获取角色数据
-            this.roleList =[];
-            this.$get(`${this.api.roleList}?page=1&size=100&name=&platformId=1&port=0`).then(res => {
-                for(var i=0;i<res.rolePage.records.length;i++){
-                    if (res.rolePage.records[i].roleName == '超级管理员'){
-
-                    }else{
-                        this.roleList.push(res.rolePage.records[i])
-                    }
-                }
-                // this.roleList = res.rolePage.records;
-            }).catch(res => {});
-        },
-        closeTeacher() { // 关闭新增/编辑员工对话框
-            this.form = {
-                accountId: "",
-                account: "",
-                userName: "",
-                roleValue: [],
-                roleAndDeptList: [],
-                uniqueIdentification: "",
-                workNumber: "",
-                phone: "",
-                email: ""
-            };
-            this.$refs.form.clearValidate();
-            this.teacherVisible = false;
-        },
-        addTeacher() { // 新增员工
-            this.isDetail = false;
-            this.isAdd = true;
-            this.teacherVisible = true;
-            this.orgList = this.$refs.org.orgList;
-        },
-        getStaffDetail(accountId) { // 获取员工详情
-            this.$get(`${this.api.staffDetail}?accountId=${accountId}`).then(res => {
-                let { data } = res;
-                this.form = data;
-                this.form.roleValue = data.roleAndDeptList.map(i => i.roleId);
-                this.form.roleAndDeptList = data.roleAndDeptList.map(i => {
-                    i.cascaderValue = [i.staffArchitectureId, i.gradeId]
-                    return i;
-                });
-                console.log(22, this.form)
-            }).catch(res => {});
-        },
-        resetPassword(row) { // 重置密码
-            this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
-                this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=111aaa`).then(res => {
-                    util.successMsg("重置成功");
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        editTeacher(row) { // 处理编辑
-            this.isDetail = false;
-            this.isAdd = false;
-            this.teacherVisible = true;
-            this.orgList = this.$refs.org.orgList;
-            this.getStaffDetail(row.accountId);
-        },
-        showTeacher(row) { // 处理查看
-            this.isDetail = true;
-            this.isAdd = false;
-            this.teacherVisible = true;
-            this.orgList = this.$refs.org.orgList;
-            this.getStaffDetail(row.accountId);
-        },
-        // 组合账号
-        renderAccount() {
-          const form = this.form
-          // 平台id-端id-schoolId-workNumber组成账号
-          form.account = `${Setting.platformId}-0-${this.schoolId}-${form.workNumber}`
-        },
-        workNumberChange() { // 切换工号
-          const form = this.form
-          const { workNumber, accountId } = form
-          if (workNumber) {
-            this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}${accountId ? `&accountId=${form.accountId}` : ''}&workNumber=${workNumber}&account=`).then(res => {
-              if (res.status === 200) {
-                this.workNumberReapeat = false
-                this.renderAccount()
-              }
-            }).catch( err => {
-              this.workNumberReapeat = true
-            })
-          } else {
-            this.renderAccount()
-          }
-        },
-        phoneChange() { // 切换手机号
-            let regex = /^1[3456789]\d{9}$/;
-            if (regex.test(this.form.phone)) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkEmailOrPhone}?phone=${this.form.phone}&email=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&phone=${this.form.phone}&email=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.phoneRepeat = false;
-                    }
-                }).catch( err => {
-                    this.phoneRepeat = true;
-                });
-            }
-        },
-        emailChange() { // 切换邮箱
-            let regex = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-            if (regex.test(this.form.email)) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkEmailOrPhone}?email=${this.form.email}&phone=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&email=${this.form.email}&phone=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.emailRepeat = false;
-                    }
-                }).catch( err => {
-                    this.emailRepeat = true;
-                });
-            }
-        },
-        roleChange(value) { // 处理切换角色
-            console.log(this.form.roleValue)
-            if (value.length) {
-                let ids = this.form.roleAndDeptList.map(e => e.roleId);
-                this.roleList.forEach(i => {
-                    let obj = {
-                        roleId: "",
-                        roleName: "",
-                        cascaderValue: []
-                    };
-                    if (value.includes(i.id) && !ids.includes(i.id)) {
-                        console.log(i)
-                        obj.roleId = i.id;
-                        obj.roleName = i.roleName;
-                        this.form.roleAndDeptList.push(obj);
-                    }
-                });
-            } else {
-                this.form.roleAndDeptList.splice(0);
-            }
-        },
-        roleRemove(value) { // 处理移除角色
-            let list = [];
-            for(var i=0;i<this.form.roleAndDeptList.length;i++){
-                if (this.form.roleAndDeptList[i].roleId == value){
-
-                }else{
-                    list.push(this.form.roleAndDeptList[i])
-                }
-            }
-            this.form.roleAndDeptList = list
-        },
-        async saveSure(form) {
-            this.$refs[form].validate((valid) => {
-                if (valid) {
-                    if (this.submiting) return false
-                    if (this.workNumberReapeat) return util.errorMsg('工号/学号已存在!');
-                    if (this.phoneRepeat) return util.errorMsg("该手机号已存在");
-                    if (this.emailRepeat) return util.errorMsg("该邮箱已存在");
-                    let data = {
-                        accountId: this.form.accountId,
-                        account: this.form.account,
-                        userName: this.form.userName,
-                        roleAndDeptList: [],
-                        uniqueIdentification: this.form.uniqueIdentification ? this.form.uniqueIdentification : new Date().getTime(),
-                        workNumber: this.form.workNumber,
-                        phone: this.form.phone,
-                        email: this.form.email
-                    };
-                    if (this.form.roleAndDeptList.length){
-                        for (let i = 0; i < this.form.roleAndDeptList.length; i++) {
-                            if (this.form.roleAndDeptList[i].cascaderValue.length < 2) {
-                                util.warningMsg(`请选择${this.form.roleAndDeptList[i].roleName}所属部门`)
-                                return;
-                            } else {
-                                let obj = {
-                                    roleId: this.form.roleAndDeptList[i].roleId,
-                                    staffArchitectureId: this.form.roleAndDeptList[i].cascaderValue[0],
-                                    gradeId: this.form.roleAndDeptList[i].cascaderValue[1]
-                                };
-                                data.roleAndDeptList.push(obj);
-                            }
-                        }
-                    }
-                    this.submiting = true
-                    if (this.form.accountId) {
-                        this.$post(this.api.modifyStaff, data).then(res => {
-                            util.successMsg("编辑成功");
-                            this.closeTeacher();
-                            this.getData();
-                            this.submiting = false
-                        }).catch(res => {
-                            this.submiting = false
-                        });
-                    } else {
-                        this.$post(this.api.saveStaff, data).then(res => {
-                            util.successMsg("添加成功");
-                            this.closeTeacher();
-                            this.getData();
-                            this.submiting = false
-                        }).catch(res => {
-                            this.submiting = false
-                        });
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        delTeacher(row) {
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.delStaff}?accountIds=${row.accountId}`).then(res => {
-                    util.successMsg("删除成功");
-                    this.getData();
-                }).catch(res => {});
-            }).catch(() => {});
-        },
-        handleSelectionChange(val) {
-            this.multipleSelection = val;
-        },
-        delAllSelection() {
-            if (this.multipleSelection.length) {
-                // 批量删除
-                this.$confirm("确定要删除吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(item => {
-                        return item.accountId;
-                    });
-                    this.$post(`${this.api.delStaff}?accountIds=${ids.toString()}`).then(res => {
-                        this.multipleSelection = [];
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                }).catch(() => {
-                });
-            } else {
-                util.errorMsg("请先选择员工 ！");
-            }
-        },
-        batchImport() {
-            this.importVisible = true;
-            this.uploadList = [];
-            this.uploadFaild = false;
-        },
-        searchTeacher() {
-            this.page = 1;
-            this.getData();
-        },
-        handleCurrentChange(val) {
-            this.page = val;
-            this.getData();
-        },
-        downLoad() {
-            location.href = this.api.staffTemplate;
-        },
-        showFaild() {
-            location.href = `${this.api.exportFailureStaff}?exportCode=${this.exportCode}`;
-        },
-        // 上传文件
-        handleExceed(files, fileList) {
-            util.warningMsg(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
-            );
-        },
-        uploadSuccess(res, file, fileList) {
-            console.log(res);
-            this.uploadFaild = false;
-            if (res.status === 200) {
-                if (res.data.exportCode) {
-                    this.exportCode = res.data.exportCode;
-                    this.uploadFaild = true;
-                }
-                util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
-            } else {
-                res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
-            }
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            this.uploadList = fileList;
-            this.uploadFaild = false;
-        },
-        uploadSure() {
-            this.importVisible = false;
-            this.page = 1;
-            this.keyword = "";
-            this.getData();
-        }
-    }
-};
-</script>
-<style lang="scss" scoped>
-.wrap {
-    display: flex;
-    padding: 0 24px;
-    .side {
-        width: 300px;
-        padding: 24px 10px 24px 0;
-        margin-right: 24px;
-        border-right: 1px solid rgba(0, 0, 0, 0.06);
-    }
-    .right {
-        width: calc(100% - 374px);
-        padding: 24px;
-    }
-}
-.el-input__inner{
-    height: 32px;
-}
-</style>
\ No newline at end of file
diff --git a/src/pages/system/list/staffSide.vue b/src/pages/system/list/staffSide.vue
deleted file mode 100644
index 3c816bd..0000000
--- a/src/pages/system/list/staffSide.vue
+++ /dev/null
@@ -1,391 +0,0 @@
-<template>
-    <div>
-        <div>
-            <div class="flex-between m-b-20">
-                <h6 class="p-title" style="margin-bottom: 0">员工组织架构</h6>
-                <el-button type="text" @click="addMajor" v-auth="'员工管理:新增专业'">添加</el-button>
-            </div>
-            <org-tree
-                :data="orgList"
-                show-checkbox
-                default-expand-all
-                ref="orgTree"
-                node-key="id"
-                highlight-current
-                :expand-on-click-node="false"
-                @node-click="getSingle"
-                @check="getCheck"
-                :props="{children: 'children', label: 'label', isLeaf: 'leaf'}"
-            >
-                <span class="custom-tree-node" slot-scope="{ node, data }">
-                    <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
-                    <span>
-                        <el-button
-                            v-auth="'员工管理:新增专业'"
-                            type="text"
-                            icon="el-icon-edit-outline"
-                            @click="() => handleEdit(node, data)">
-                        </el-button>
-                        <el-button
-                            v-auth="'员工管理:编辑专业'"
-                            v-if="node.level === 1"
-                            type="text"
-                            icon="el-icon-circle-plus-outline"
-                            @click="() => handleAdd(node, data)">
-                        </el-button>
-                        <el-button
-                            v-auth="'员工管理:删除专业'"
-                            type="text"
-                            icon="el-icon-delete"
-                            @click="() => handleDel(node, data)">
-                        </el-button>
-                    </span>
-                </span>
-            </org-tree>
-        </div>
-
-        <el-dialog :title="Form.staffArchitectureId ? '编辑部门' : '新增部门'" :visible.sync="majorVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
-            <el-form ref="Form" :model="Form" :rules="rules">
-                <el-form-item prop="staffArchitectureName">
-                    <el-input placeholder="请输入专业名称" v-model="Form.staffArchitectureName"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="majorVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sure('Form')">确 定</el-button>
-            </span>
-        </el-dialog>
-
-        <el-dialog :title="Form.gradeId ? '编辑部门' : '新增部门'" :visible.sync="depVisible" width="24%" center @close="closeAdd" :close-on-click-modal="false">
-            <el-form ref="Form" :model="Form" :rules="rules">
-                <el-form-item prop="gradeName">
-                    <el-input placeholder="请输入部门名称" v-model="Form.gradeName"></el-input>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button @click="depVisible = false">取 消</el-button>
-                <el-button type="primary" @click="sureDepartment('Form')">确 定</el-button>
-            </span>
-        </el-dialog>
-    </div>
-</template>
-<script>
-import util from "@/libs/util";
-import OrgTree from "@/components/org-tree/src/tree";
-export default {
-    props: ["Data"],
-    data() {
-        return {
-            orgList: [],
-            firactive: 0,
-            twoactive: 0,
-            majorVisible: false,
-            depVisible: false,
-            Form: {
-                staffArchitectureId: "", // 专业ID
-                staffArchitectureName: "", // // 专业名称
-                gradeId: "",
-                gradeName: ""
-            },
-            rules: {
-                staffArchitectureName: [
-                    { required: true, message: "请输入专业名称", trigger: "blur" }
-                ],
-                gradeName: [
-                    { required: true, message: "请输入部门名称", trigger: "blur" }
-                ]
-            },
-            staffstateProfessId: "",
-            staffstateId: "",
-        };
-    },
-    components: {
-        OrgTree
-    },
-    mounted() {
-        this.getStaff()
-    },
-    methods: {
-        getStaff() {
-            this.$get(this.api.professionalList).then(res => {
-                if (res.data && res.data.length) {
-                    res.data.map(e => {
-                        (e.ifVisible = false), (e.ischeck = false), (e.label = e.staffArchitectureName), (e.id = e.staffArchitectureId);
-                        let data = {
-                            staffArchitectureId: e.staffArchitectureId
-                        }
-                        this.$get(this.api.staffGradeList, data).then(res => {
-                            res.data.map(e => {
-                                (e.ischeck = false), (e.label = e.gradeName), (e.id = e.gradeId)
-                            })
-                            e.children = res.data
-                        }).catch(res => {})
-                    });
-                }
-                setTimeout(() => {
-                    this.orgList = res.data;
-                }, 500)
-            }).catch(res => {})
-        },
-        closeAdd() {
-            this.$refs.Form.resetFields()
-        },
-        getSingle(data) {
-            this.$emit('getSingle', data)
-        },
-        getCheck(data, checked) {
-            this.$emit('getCheck', checked.checkedNodes)
-        },
-        // 新增编辑专业
-        addMajor() {
-            this.Form.staffArchitectureId = ''
-            this.Form.staffArchitectureName = ''
-            this.majorVisible = true
-        },
-        sure(Form) { // 提交新增/修改专业
-            this.$refs[Form].validate((valid) => {
-                if (valid) {
-                    let data = {
-                        staffArchitectureName: this.Form.staffArchitectureName,
-                        staffArchitectureId: this.Form.staffArchitectureId,
-                        isDel: 0 // 是否删除(0、未删除 1、已删除)
-                    };
-                    if (this.Form.staffArchitectureId) {
-                        this.$post(this.api.updateProfessional, data).then(res => {
-                            util.successMsg("编辑成功");
-                            this.majorVisible = false;
-                            this.orgList.map(e => {
-                                if (e.staffArchitectureId == this.Form.staffArchitectureId) {
-                                    e.staffArchitectureName = this.Form.staffArchitectureName;
-                                    e.label = this.Form.staffArchitectureName;
-                                }
-                            });
-                            this.$emit("getData");
-                        }).catch(res => {
-                        });
-                    } else {
-                        this.$post(this.api.saveProfessional, data).then(res => {
-                            util.successMsg("添加成功");
-                            this.majorVisible = false;
-                            let newData = {
-                                staffArchitectureId: res.staffArchitectureId,
-                                staffArchitectureName: this.Form.staffArchitectureName,
-                                label: this.Form.staffArchitectureName,
-                                value: res.staffArchitectureId,
-                                ifVisible: false,
-                                ischeck: false,
-                                children: []
-                            };
-                            this.orgList.push(newData);
-                        }).catch(res => {
-                        });
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        handleAdd(node, data) { // 添加部门
-            this.Form.gradeId = ''
-            this.Form.gradeName = ''
-            this.depVisible = true
-            this.Form.staffArchitectureId = data.staffArchitectureId
-        },
-        handleEdit(node, data) { // 编辑部门
-            if (node.level === 1) {
-                this.Form.staffArchitectureId = data.staffArchitectureId
-                this.Form.staffArchitectureName = data.staffArchitectureName
-                this.majorVisible = true
-            } else {
-                this.Form.gradeId = data.gradeId
-                this.Form.gradeName = data.gradeName
-                this.depVisible = true
-            }
-            for (let j = 0; j < this.orgList.length; j++) {
-                for (let k = 0; k < this.orgList[j].children.length; k++) {
-                    if (this.orgList[j].children[k].gradeName == data.gradeName) {
-                        this.Form.staffArchitectureId = this.orgList[j].staffArchitectureId;
-                    }
-                }
-            }
-        },
-        sureDepartment(Form) { // 提交新增编辑部门
-            this.$refs[Form].validate((valid) => {
-                if (valid) {
-                    let data = {
-                        gradeId: this.Form.gradeId,
-                        gradeName: this.Form.gradeName,
-                        staffArchitectureId: this.Form.staffArchitectureId
-                    };
-                    if (this.Form.gradeId) {
-                        this.$post(this.api.updateGrade, data).then(res => {
-                            util.successMsg("编辑成功");
-                            this.depVisible = false;
-                            this.orgList.map(e => {
-                                e.children.map(r => {
-                                    if (r.gradeId == this.Form.gradeId) {
-                                        r.gradeName = this.Form.gradeName;
-                                        r.label = this.Form.gradeName;
-                                    }
-                                });
-                            });
-                        }).catch(res => {
-                        });
-                    } else {
-                        this.$post(this.api.saveGrade, data).then(res => {
-                            util.successMsg("添加成功");
-                            this.depVisible = false;
-                            let newData = {
-                                gradeId: res.gradeId,
-                                gradeName: this.Form.gradeName,
-                                label: this.Form.gradeName,
-                                value: res.gradeId,
-                                ifVisible: false,
-                                ischeck: false
-                            };
-                            this.orgList.map(e => {
-                                if (e.staffArchitectureId == this.Form.staffArchitectureId) {
-                                    e.ifVisible = true;
-                                    e.children.push(newData);
-                                }
-                            });
-                        }).catch(res => {
-                        });
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        handleDel(node, data) {
-            node.level === 1 ? this.delMajor(data) : this.delDepartment(data)
-        },
-        delMajor(item) {
-            this.$confirm("确定要删除该专业吗？该操作将会删除该组织下的用户账号。", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.deleteProfessional}?staffArchitectureId=${item.staffArchitectureId}`).then(res => {
-                    util.successMsg("删除成功")
-                    this.$emit("getData")
-                    this.getStaff()
-                }).catch(res => {})
-            }).catch(() => {})
-        },
-        delDepartment(item) {
-            this.$confirm("确定要删除该部门吗？该操作将会删除该组织下的用户账号。", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.deleteGrade}?gradeId=${item.gradeId}`).then(res => {
-                    util.successMsg("删除成功")
-                    this.getStaff()
-                    this.$emit("delDep", item, this.orgList)
-                    this.$emit("getData")
-                }).catch(res => {})
-            }).catch(() => {})
-        }
-    }
-};
-</script>
-<style scoped>
-.side_view {
-    height: 800px;
-    padding: 40px 20px;
-    background-color: #fff;
-}
-
-.side_icon {
-    text-align: right;
-}
-
-.side_icon i {
-    cursor: pointer;
-    font-size: 20px;
-    color: #9278FF;
-}
-
-.side_tree {
-    width: 100%;
-    font-size: 14px;
-    color: #333;
-}
-
-.side_tree i {
-    color: #9278FF;
-    margin-left: 10px;
-}
-
-.fir_back {
-    width: 100%;
-    padding: 15px 0;
-    background: rgba(255, 255, 255, 1);
-    /* box-shadow:1px 14px 29px 0px rgba(138,97,250,0.19); */
-    border-radius: 10px;
-    text-align: left;
-}
-
-.fir_back:first-child {
-    margin-top: 20px;
-}
-
-.fir_back:hover {
-    box-shadow: 1px 14px 29px 0px rgba(138, 97, 250, 0.19);
-    cursor: pointer;
-}
-
-.fir_back span {
-    margin-left: 10px;
-}
-
-.two_active {
-    color: #9278FF;
-}
-
-/* .two_active:hover{
-    color: #9278FF;
-    cursor:pointer;
-} */
-.two_back:hover {
-    cursor: pointer;
-    color: #9278FF;
-}
-
-.mar_top {
-    margin-top: 20px;
-}
-
-.back_active {
-    box-shadow: 1px 14px 29px 0px rgba(138, 97, 250, 0.19);
-}
-
-.bor_lef {
-    padding: 20px 0 0 0;
-    margin-left: 40px;
-}
-
-.three_lef {
-    margin-left: 60px;
-    padding: 20px 0;
-}
-
-.three_text {
-    font-size: 14px;
-    margin-top: 10px;
-}
-
-.teacher_tab {
-    margin-left: 20px;
-}
-
-.icon_select:before {
-    transform: rotate(180deg);
-}
-
-.list-enter-active, .list-leave-active {
-    transition: all 1s;
-}
-
-.list-enter, .list-leave-to {
-    opacity: 0;
-    transform: translateY(-30px);
-}
-</style>
diff --git a/src/pages/user/list/index.vue b/src/pages/user/list/index.vue
index b98d45e..6b5880f 100644
--- a/src/pages/user/list/index.vue
+++ b/src/pages/user/list/index.vue
@@ -1,371 +1,346 @@
 <template>
-    <div class="flex">
-      <div class="page" style="width: 320px">
-        <div class="m-b-20">
-            <h6 class="p-title">学生</h6>
-            <el-radio-group v-model="studentType" @change="changeStudentType">
-                <div class="m-b-20">
-                    <el-radio :label="1">所有学生</el-radio>
-                </div>
-                <div>
-                    <el-radio :label="2">未加入班级的学生</el-radio>
-                </div>
-            </el-radio-group>
-        </div>
-        <el-divider></el-divider>
-        <div>
-            <div class="flex-between m-b-20">
-                <h6 class="p-title" style="margin-bottom: 0">学生组织架构</h6>
-                <el-button v-auth="'学生组织架构添加'" type="text" @click="handleAdd">添加</el-button>
-            </div>
-
-            <div style="height: 504px; max-height: 504px; overflow: auto">
-              <el-tree :data="orgs" :props="defaultProps" @node-click="handleNodeClick"></el-tree>
-            </div>
+  <div class="flex">
+    <div class="page" style="width: 320px">
+      <div class="m-b-20">
+        <p class="page-name mb">后台员工账号</p>
+        <el-radio-group v-model="studentType" @change="changeType">
+          <div class="m-b-20">
+            <el-radio :label="1">所有员工</el-radio>
+          </div>
+          <div>
+            <el-radio :label="2">未加入部门的员工</el-radio>
+          </div>
+        </el-radio-group>
+      </div>
+      <el-divider></el-divider>
+      <div>
+        <div class="flex-between m-b-20">
+          <p class="page-name">组织管理</p>
+          <el-button type="text" @click="addOrg">添加</el-button>
         </div>
 
-        <el-dialog
-            :title="orgTitle"
-            :visible.sync="orgVisible"
-            :close-on-click-modal="false"
-            width="50%"
-            @close="handleClose"
-        >
-            <el-form v-if="orgVisible" ref="orgForm" :model="orgForm" :rules="rules" label-width="100px">
-                <el-form-item :label="labelName" prop="organizationName">
-                    <el-input v-model.trim="orgForm.organizationName" placeholder="请输入"></el-input>
-                </el-form-item>
-                <el-form-item label="上级部门">
-                    <el-cascader
-                        v-if="showCascader"
-                        v-model="cascaderValue"
-                        :props="cascaderProps"
-                        @change="handleChangeCascader"
-                        clearable
-                        style="width: 100%"
-                    >
-                    </el-cascader>
-                    <span v-else>{{ orgForm.parentName }}</span>
-                </el-form-item>
-            </el-form>
-            <span slot="footer" class="dialog-footer">
-                <el-button v-if="isAddOrg" @click="handleClose">取 消</el-button>
-                <el-button v-if="!isAddOrg" type="danger" plain @click="handleDel">删除</el-button>
-                <el-button type="primary" @click="orgSubmit">确 定</el-button>
+        <div style="height: 504px;overflow: auto">
+          <el-tree ref="orgs" :data="orgs" :props="defaultProps" @node-click="handleNodeClick">
+            <span class="custom-tree-node" slot-scope="{ node, data }">
+              <span class="org-name">{{ node.label }}</span>
+              <span>
+                <el-button
+                  type="text"
+                  icon="el-icon-circle-plus-outline"
+                  @click="() => addOrg(node, data)">
+                </el-button>
+                <el-button
+                  type="text"
+                  icon="el-icon-edit-outline"
+                  @click="() => editOrg(node, data)">
+                </el-button>
+                <el-button
+                  type="text"
+                  icon="el-icon-delete"
+                  @click="() => delOrg(node, data)">
+                </el-button>
+              </span>
             </span>
-        </el-dialog>
-
+          </el-tree>
+        </div>
       </div>
-      <div class="page flex-1 m-l-20">
-        <h6 class="p-title">筛选</h6>
-        <div class="tool">
-            <ul class="filter">
-                <li>
-                    <el-input style="width: 250px;" placeholder="请输入学生姓名/学号" prefix-icon="el-icon-search" v-model="keyWord" clearable></el-input>
-                </li>
-            </ul>
-            <div>
-                <el-button type="info" v-auth @click="addStudent">新增学生</el-button>
-                <el-button type="primary" v-auth @click="batchImport">批量导入</el-button>
-                <el-button type="primary" v-auth @click="delAllSelection">批量删除</el-button>
-            </div>
+      <el-dialog
+        :title="orgForm.id ? '编辑' : '新增' + '部门'"
+        :visible.sync="orgVisible"
+        :close-on-click-modal="false"
+        width="50%"
+      >
+      <el-form v-if="orgVisible" ref="orgForm" :model="orgForm" :rules="orgRules" label-width="100px">
+        <el-form-item label="部门名称" prop="name">
+          <el-input v-model.trim="orgForm.name" placeholder="请输入"></el-input>
+        </el-form-item>
+        <el-form-item label="上级部门">
+          <span v-if="orgForm.pidName">{{ orgForm.pidName }}</span>
+          <el-cascader
+            v-else
+            :options="orgListDia"
+            v-model="cascaderValue"
+            :props="cascaderProps"
+            clearable
+            style="width: 100%"
+          >
+          </el-cascader>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+        <el-button @click="closeOrg">取 消</el-button>
+        <el-button type="primary" @click="orgSubmit">确 定</el-button>
+      </span>
+      </el-dialog>
+    </div>
+    <div class="page list-wrap">
+      <div class="tool">
+        <div class="search-wrap">
+          <el-input placeholder="请输入员工姓名" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
+          <el-button type="primary" @click="initData">查询</el-button>
         </div>
-
-        <el-table :data="listData" class="table" ref="table" stripe header-align="center" @selection-change="handleSelectionChange" :row-key="getRowKeys">
-            <el-table-column type="selection" width="55" align="center" :reserve-selection="true"></el-table-column>
-            <el-table-column type="index" width="60" label="序号" align="center"></el-table-column>
-            <el-table-column prop="userName" label="学生姓名" align="center" min-width="100"></el-table-column>
-            <el-table-column prop="workNumber" label="学生学号" align="center" min-width="100"></el-table-column>
-            <el-table-column prop="className" label="班级" align="center" min-width="200" show-overflow-tooltip></el-table-column>
-            <el-table-column prop="countries" label="账号角色" align="center" width="100">
-                <template slot-scope="scope">学生</template>
-            </el-table-column>
-            <el-table-column prop="loginNumber" label="登录次数" align="center" width="100"></el-table-column>
-            <el-table-column prop="lastLoginTime" label="上次登录时间" align="center" width="120"></el-table-column>
-            <el-table-column label="操作" align="center" width="300">
-                <template slot-scope="scope">
-                    <el-button v-auth v-if="isRemove" type="text" @click="removeStudent(scope.row)">移除</el-button>
-                    <el-button v-auth type="text" @click="editStudent(scope.row,true)">查看</el-button>
-                    <el-button v-auth type="text" @click="editStudent(scope.row,false)">编辑</el-button>
-                    <el-button v-auth type="text" @click="resetPassword(scope.row)">重置密码</el-button>
-                    <el-button v-auth type="text" @click="handleDelete(scope.row)">删除</el-button>
-                    <el-switch
-                        v-auth="'禁用'"
-                        v-model="scope.row.isEnable"
-                        :active-value="1"
-                        :inactive-value="0"
-                        style="margin: 0 5px"
-                        @change="switchOff(scope.row)"
-                    ></el-switch>
-                </template>
-            </el-table-column>
-        </el-table>
-        <div class="pagination">
-            <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
+        <div class="actions">
+          <el-button type="primary" @click="addStaff">新增员工</el-button>
+          <el-button @click="batchImport">批量导入</el-button>
+          <el-button @click="batchDel">批量删除</el-button>
         </div>
+      </div>
 
-        <el-dialog
-            class="dialog"
-            width="60%"
-            :title="isDetail ? '查看学生' : (isAdd ? '新增学生' : '编辑学生')"
-            :visible.sync="studentVisible"
-            :close-on-click-modal="false"
-            @close="closeStudent"
-        >
-            <el-form ref="form" :model="form" :rules="rules" :disabled="isDetail" label-width="100px">
-                <el-row :gutter="20">
-                    <el-col :span="12">
-                        <el-form-item prop="workNumber" label="学生学号">
-                            <el-input v-model="form.workNumber" placeholder="学生学号" @blur="workNumberChange"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="userName" label="学生姓名">
-                            <el-input v-model="form.userName" placeholder="请输入学生姓名"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="roleId" label="账号角色">
-                            学生
-                        </el-form-item>
+      <el-table :data="list" class="table" ref="table" @selection-change="handleSelectionChange" row-key="id">
+        <el-table-column type="selection" width="55" :reserve-selection="true"></el-table-column>
+        <el-table-column type="index" width="60" label="序号"></el-table-column>
+        <el-table-column prop="username" label="员工姓名" min-width="100"></el-table-column>
+        <el-table-column prop="account" label="账号" min-width="100"></el-table-column>
+        <el-table-column prop="phone" label="手机号" min-width="100" show-overflow-tooltip></el-table-column>
+        <el-table-column prop="deptName" label="所在部门" min-width="100"></el-table-column>
+        <el-table-column prop="createTime" label="创建日期" min-width="140"></el-table-column>
+        <el-table-column prop="loginNumber" label="授权角色" min-width="100"></el-table-column>
+        <el-table-column prop="loginNumber" label="用户组" min-width="100"></el-table-column>
+        <el-table-column prop="updateTime" label="最后登录时间" min-width="140"></el-table-column>
+        <el-table-column label="操作" width="180">
+          <template slot-scope="scope">
+            <el-button type="text" @click="editStudent(scope.row,true)">查看</el-button>
+            <el-button type="text" @click="editStudent(scope.row,false)">编辑</el-button>
+            <el-button type="text" @click="resetPassword(scope.row)">重置密码</el-button>
+            <el-button type="text" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+      <div class="pagination">
+        <el-pagination background @current-change="currentChange" :current-page="page" layout="total, prev, pager, next" :total="total"></el-pagination>
+      </div>
 
-                        <el-form-item prop="phone" label="手机号">
-                            <el-input v-model="form.phone" placeholder="可用于登录平台，以及找回密码" maxlength="11"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="email" label="邮箱">
-                            <el-input v-model="form.email" placeholder="可用于登录平台，以及找回密码"></el-input>
-                        </el-form-item>
-                        <el-form-item prop="uniqueIdentification" label="唯一标识">
-                            <el-input disabled v-model="form.uniqueIdentification"></el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="10">
-                        <el-form-item prop="classId" label="所在班级">
-                            <el-input
-                                placeholder="输入关键字进行过滤"
-                                v-model="filterText"
-                                style="margin-bottom: 10px"
-                            >
-                            </el-input>
-                            <div style="max-height: 245px; border: 1px solid #DCDFE6; border-radius: 4px; padding: 10px 10px 10px 0px; overflow: auto">
-                                <org-tree
-                                    v-if="showTree && treeVisible"
-                                    ref="classTree"
-                                    show-checkbox
-                                    node-key="id"
-                                    highlight-current
-                                    default-expand-all
-                                    lazy
-                                    :load="loadClassTree"
-                                    :default-checked-keys="defaultCheckedKeys"
-                                    :filter-node-method="filterNode"
-                                    :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
-                                >
-                                    <span class="custom-tree-node" slot-scope="{ node, data }">
-                                        <span style="display: inline-block; margin-right: 20px">{{ node.label }}</span>
-                                        <span>
-                                            <el-button
-                                                v-auth="'学生组织架构添加'"
-                                                v-if="node.level < 3"
-                                                type="text"
-                                                icon="el-icon-circle-plus-outline"
-                                                @click="() => handleAdd(node, data)">
-                                            </el-button>
-                                        </span>
-                                    </span>
-                                </org-tree>
-                            </div>
-                            <p style="color: #C0C4CC;">提示：需创建班级后才可以勾选</p>
-                        </el-form-item>
-                    </el-col>
-                </el-row>
-            </el-form>
-            <span slot="footer" class="dialog-footer" v-if="!isDetail">
-                <el-button type="primary" :disabled="disableds" @click="saveData(0)">保存</el-button>
-                <el-button v-if="isAdd" type="primary" :disabled="disableds" @click="saveData(1)">保存并继续添加</el-button>
-                <el-button size="small" @click="closeStudent">取消</el-button>
-            </span>
-        </el-dialog>
+      <el-dialog :title="isDetail ? '查看' : (form.accountId ? '编辑' : '新增') + '员工'" :visible.sync="staffVisible" width="500px" class="dialog" :close-on-click-modal="false" @close="closeStaff">
+        <el-form ref="form" :model="form" :rules="rules" label-width="100px" :disabled="isDetail" style='margin-right: 60px;'>
+            <el-form-item prop="workNumber" label="工号">
+                <el-input v-model.trim="form.workNumber" placeholder="请输入工号"></el-input>
+            </el-form-item>
+            <el-form-item prop="userName" label="姓名">
+                <el-input v-model.trim="form.userName" placeholder="请输入姓名"></el-input>
+            </el-form-item>
+            <el-form-item prop="account" label="账号">
+                <el-input v-model.trim="form.account" placeholder="请输入账号"></el-input>
+            </el-form-item>
+            <el-form-item prop="roleList" label="授权角色">
+                <el-select v-model="form.roleList" multiple style="width: 100%">
+                  <template v-for="item in roleList">
+                    <!-- 不显示超管 -->
+                    <el-option
+                      v-if="item.roleName !== '超级管理员'"
+                      :key="item.id"
+                      :label="item.roleName"
+                      :value="item.id">
+                    </el-option>
+                  </template>
+                </el-select>
+            </el-form-item>
+            <el-form-item label="所在部门">
+                <el-cascader
+                    style="width: 100%"
+                    v-model="form.staffArchitectureId"
+                    :options="orgs"
+                    :props="casProps"
+                ></el-cascader>
+            </el-form-item>
+            <el-form-item prop="phone" label="手机号">
+                <el-input v-model.trim="form.phone" placeholder="请输入手机号" maxlength="11"></el-input>
+            </el-form-item>
+            <el-form-item prop="email" label="邮箱">
+                <el-input v-model.trim="form.email" placeholder="请输入邮箱"></el-input>
+            </el-form-item>
+        </el-form>
+        <span slot="footer" class="dialog-footer" v-if="!isDetail">
+            <el-button @click="staffVisible = false">取消</el-button>
+            <el-button type="primary" @click="submitStaff">确定</el-button>
+        </span>
+    </el-dialog>
 
-        <el-dialog title="批量导入" :visible.sync="importVisible" width="24%" :close-on-click-modal="false">
-            <div style="text-align: center">
-                <div style="margin-bottom: 10px;">
-                    <el-button type="primary" @click="downLoad">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
-                </div>
-                <el-upload
-                    name="file"
-                    accept=".xls,.xlsx"
-                    :on-remove="handleRemove"
-                    :on-error="uploadError"
-                    :on-success="uploadSuccess"
-                    :before-remove="beforeRemove"
-                    :limit="1"
-                    :on-exceed="handleExceed"
-                    :action="this.api.importStudent"
-                    :file-list="uploadList"
-                    :headers="headers"
-                >
-                    <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
-                </el-upload>
-                <el-link v-if="uploadFaild" type="primary" @click="showFaild">部分数据导入失败，查看失败原因</el-link>
-            </div>
-            <span slot="footer" class="dialog-footer">
-                <el-button size="small" @click="importVisible = false">取 消</el-button>
-                <el-button size="small" type="primary" @click="uploadSure">确 定</el-button>
-            </span>
-        </el-dialog>
-      </div>
+      <el-dialog title="批量导入" :visible.sync="importVisible" width="24%" :close-on-click-modal="false">
+          <div style="text-align: center">
+              <div style="margin-bottom: 10px;">
+                  <el-button type="primary" @click="download">模板下载<i class="el-icon-download el-icon--right"></i></el-button>
+              </div>
+              <el-upload
+                  name="file"
+                  accept=".xls,.xlsx"
+                  :on-remove="handleRemove"
+                  :on-error="uploadError"
+                  :on-success="uploadSuccess"
+                  :before-remove="beforeRemove"
+                  :limit="1"
+                  :on-exceed="handleExceed"
+                  :action="this.api.importStudent"
+                  :file-list="uploadList"
+                  :headers="headers"
+              >
+                  <el-button type="primary" class="ml20">上传文件<i class="el-icon-upload2 el-icon--right"></i></el-button>
+              </el-upload>
+              <el-link v-if="uploadFaild" type="primary" @click="showFaild">部分数据导入失败，查看失败原因</el-link>
+          </div>
+          <span slot="footer" class="dialog-footer">
+              <el-button size="small" @click="importVisible = false">取 消</el-button>
+              <el-button size="small" type="primary" @click="uploadSure">确 定</el-button>
+          </span>
+      </el-dialog>
     </div>
+  </div>
 </template>
 
 <script>
-import util from "@/libs/util";
-import Setting from "@/setting";
-import OrgTree from "@/components/org-tree/src/tree";
-import { mapState } from "vuex";
+import util from '@/libs/util'
+import Setting from '@/setting'
+import { mapState } from 'vuex'
 export default {
-    components: { OrgTree },
-    data() {
-        let that = this;
+  data() {
+        const accountPass = (rule, value, callback) => {
+          if (value === '') {
+            callback(new Error('请输入账号'))
+          } else {
+            const pattern = /^[A-Za-z0-9]*$/
+            if(pattern.test(value)){
+              this.accountChange()
+              callback()
+            }else{
+              callback(new Error('请输入正确账号格式'))
+            }
+          }
+        }
+        const workNumberPass = (rule, value, callback) => {
+          if (value === '') {
+            callback(new Error('请输入工号'))
+          } else {
+            const pattern = /^[A-Za-z0-9]*$/
+            if(pattern.test(value)){
+              this.worknumberChange()
+              callback()
+            }else{
+              callback(new Error('请输入正确工号格式'))
+            }
+          }
+        }
+        const phonePass = (rule, value, callback) => {
+          if (value) {
+            const pattern = /^1[3456789]\d{9}$/
+            if(pattern.test(value)){
+              // this.phoneChange()
+              callback()
+            }else{
+              callback(new Error('请输入正确手机号格式'))
+            }
+          } else {
+            callback()
+          }
+        }
+        const emailPass = (rule, value, callback) => {
+          if (value) {
+            const pattern = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/
+            if(pattern.test(value)){
+              // this.emailChange()
+              callback()
+            }else{
+              callback(new Error('请输入正确邮箱格式'))
+            }
+          } else {
+            callback()
+          }
+        }
         return {
-            orgs: [],
-            defaultProps: {
-              children: 'children',
-              label: 'label'
-            },
-            isRemove: false, // 是否可以移除
-            currentClassId: "", // 当前班级id
-            studentType: 1, //类型:必填一个(1.所有学生 2.未加入班级学生)
-            architectureId: "", // 架构id
-            orgLevel: "", // 架构层级 层级(1.专业 2.年级 3.班级)
-            orgVisible: false, // 学生组织架对话框
-            orgTitle: "", // 对话框标题
-            labelName: "部门名称", //
-            isAddOrg: true, // 添加组织
-            showCascader: true, // 是否显示上级部门级联组件
-            orgForm: {
-                organizationName: ""
-            },
-            cascaderValue: [], // 上级部门
-            cascaderLevel: 1,
-            cascaderProps: {
-                checkStrictly: true,
-                label: "organizationName",
-                value: "id",
-                lazy: true,
-                lazyLoad(node, resolve) {
-                  console.log(55, that.cascaderValue)
-                    let level = 1;
-                    let parentId = "";
-                    if (node.data && node.data.level && node.data.id) {
-                        level = node.data.level + 1;
-                        parentId = node.data.id;
-                    }
-                    that.$post(`${that.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
-                        const { status, treeList } = res;
-                        const isGrade = that.labelName === '年级' // 编辑的该层级是否是年级（年级只能更换到组织下，所以年级班级都要禁选）
-                        const deepLevel = that.cascaderLevel // 最深层级
-                        if (status === 200 && treeList.length) {
-                            treeList.forEach(i => {
-                                i.leaf = i.level === 2;
-                                if (deepLevel === 3 || (isGrade && i.leaf) || (deepLevel === 2 && i.leaf)) i.disabled = true
-                            });
-                            return resolve(treeList);
-                        } else {
-                            return resolve([]);
-                        }
-                    });
-                }
-            }, // 部门级联数据
-            treeVisible: true,
-            treeNode: {},
-            treeResolve: [],
-            isDetail: false,
-            keyWord: "",
-            originForm: {},
-            form: {
-                userName: "",
-                phone: "",
-                uniqueIdentification: "",
-                workNumber: "",
-                email: "",
-                account: "",
-                classId: ""
-            },
-            rules: {
-                organizationName: [
-                    { required: true, message: "请输入名称", trigger: "blur" }
-                ],
-                userName: [
-                    { required: true, message: "请输入学生姓名", trigger: "blur" }
-                ],
-                workNumber: [
-                    { required: true, message: "请输入学号", trigger: 'blur' },
-                    {
-                        pattern: /^[A-Za-z0-9]*$/,
-                        message: "请输入正确的学号",
-                        trigger: "blur"
-                    }
-                ],
-                phone: [
-                    {
-                        pattern: /^1[3456789]\d{9}$/,
-                        message: "请输入正确的手机号",
-                        trigger: "blur"
-                    }
-                ],
-                email: [
-                    {
-                        pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
-                        message: "请输入正确的邮箱",
-                        trigger: "blur"
-                    }
-                ]
-            },
-            listData: [],
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            multipleSelection: [],
+          orgs: [],
+          defaultProps: {
+            label: 'name'
+          },
+          orgListDia: [],
+          studentType: 1, //类型:必填一个(1.所有员工 2.未加入班级员工)
+          orgVisible: false, // 员工组织架对话框
+          orgForm: {
+            id: '',
+            name: ''
+          },
+          cascaderValue: [], // 上级部门
+          cascaderProps: {
+              checkStrictly: true,
+              label: "name",
+              value: "id"
+          },
+          treeVisible: true,
+          treeNode: {},
+          treeResolve: [],
+          isDetail: false,
+          keyword: '',
+          roleList: [],
+          form: {
+            accountId: '',
+            userName: '',
+            phone: '',
+            roleList: [],
+            uniqueIdentification: '',
+            workNumber: '',
+            email: '',
+            account: '',
+            staffArchitectureId: []
+          },
+          orgRules: {
+              name: [
+                { required: true, message: "请输入部门名称", trigger: "blur" }
+              ]
+          },
+          rules: {
+              account: [
+                { required: true,validator: accountPass, trigger: 'blur' }
+              ],
+              userName: [
+                { required: true, message: "请输入姓名", trigger: "blur" }
+              ],
+              workNumber: [
+                { required: true,validator: workNumberPass, trigger: 'blur' }
+              ],
+              roleList: [
+                { required: true, message: "请选择授权角色", trigger: "change" }
+              ],
+              phone: [
+                { validator: phonePass, trigger: 'blur' }
+              ],
+              email: [
+                { validator: emailPass, trigger: 'blur' }
+              ]
+          },
+          list: [],
+          page: 1,
+          pageSize: 10,
+          total: 0,
+          multipleSelection: [],
 
-            isAdd: true,
-            studentVisible: false,
-            workNumberReapeat: false,
-            phoneRepeat: false,
-            emailRepeat: false,
-            showTree: true, // 是否显示所在班级树
-            defaultCheckedKeys: [],
-            filterText: "", // 通过关键字过滤树节点
+          staffVisible: false,
+          accountReapeat: false,
+          originAccount: '',
+          workNumberReapeat: false,
+          originWorkNumber: '',
+          phoneRepeat: false,
+          emailRepeat: false,
+          casProps: {
+            multiple: true,
+            checkStrictly: true,
+            label: 'name',
+            value: 'id',
+            isLeaf: 'leaf'
+          },
 
-            importVisible: false,
-            uploadList: [],
-            uploadFaild: false,
-            exportCode: "",
-            headers: {
-                token: util.local.get(Setting.tokenKey)
-            },
-            disableds:false,
-            submiting: false // 新增编辑防抖标识
+          importVisible: false,
+          uploadList: [],
+          uploadFaild: false,
+          exportCode: '',
+          headers: {
+              token: util.local.get(Setting.tokenKey)
+          },
+          disableds:false,
+          submiting: false // 新增编辑防抖标识
         };
     },
-    computed: {
-        ...mapState("user", [
-            'schoolId'
-        ])
-    },
     mounted() {
       this.getOrg()
       this.originForm = JSON.parse(JSON.stringify(this.form))
-      // this.getData();
     },
     watch: {
-        keyWord: function(val) {
-            clearTimeout(this.searchTimer);
-            this.searchTimer = setTimeout(() => {
-                if (this.studentType) {
-                    this.initData();
-                } else {
-                    this.getOrgStudentData();
-                }
-
-            }, 500);
-        },
         filterText(val) {
             this.$refs.classTree.filter(val);
         }
@@ -373,614 +348,404 @@ export default {
     methods: {
       // 获取组织树形
       getOrg() {
-        this.$get(this.api.depts).then(res => {
-            this.listData = res.page;
-            this.total = res.total;
+        this.$get(this.api.depts).then(({ data }) => {
+          this.orgs = data
+          this.getStaff()
         }).catch(err => {})
       },
-        handleNodeClick(data) { // 点击树节点查询列表数据
-            if (data.level === 3) {
-                this.isRemove = true;
-                this.currentClassId = data.id;
-            } else {
-                this.isRemove = false;
-                this.currentClassId = "";
-            }
-            this.$refs.table.clearSelection();
-            this.studentType = null;
-            this.architectureId = data.id;
-            this.orgLevel = data.level;
-            util.debounce(this.getOrgStudentData(), 1000);
-        },
-        handleAdd(node, data) { // 添加部门
-            this.orgVisible = true;
-            this.orgTitle = "新增";
-            this.isAddOrg = true;
-            if (data) {
-                if (data.level === 1) {
-                    this.labelName = "年级";
-                } else if (data.level === 2) {
-                    this.labelName = "班级名称";
-                }
-                this.showCascader = false;
-                this.orgForm = {
-                    organizationName: "",
-                    parentName: data.organizationName,
-                    parentId: data.id,
-                    level: data.level + 1
-                };
-            } else {
-                this.labelName = "部门名称";
-                this.orgForm = {
-                    organizationName: "",
-                    parentId: 0,
-                    level: 1
-                };
-            }
-        },
-        // 获取一共有多少级子级
-        getDeep(data) {
-            let list = data
-            let level = 1
-            while (list.childNodes.length) {
-                list = list.childNodes[0]
-                ++level
-            }
-            return level
-        },
-        handleEdit(node, data) { // 编辑部门
-            this.orgVisible = true;
-            this.orgForm = data;
-            this.orgTitle = "编辑";
-            this.isAddOrg = false;
-            if (data.level === 1) {
-                this.labelName = "专业名称";
-            } else if (data.level === 2) {
-                this.labelName = "年级";
-            } else if (data.level === 3) {
-                this.labelName = "班级名称";
-            }
-            if (data.ids.includes(",")) {
-                let tempArr = data.ids.split(",").map(i => Number(i));
-                tempArr.splice(tempArr.length - 1, 1);
-                this.cascaderValue = tempArr;
-            }
-            this.cascaderLevel = this.getDeep(node)
-        },
-        handleChangeCascader(value) {
-            // console.log(JSON.stringify(value));
-            // console.log(JSON.stringify(this.cascaderValue));
-        },
-        handleDel() { // 删除部门
-            let { level, id } = this.orgForm;
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.deleteOrg}?id=${id}&level=${level}`).then(res => {
-                    util.successMsg("删除成功");
-                    this.handleClose();
-                    this.handleRefresh();
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        orgSubmit() { // 提交组织架构新增/编辑
-            this.$refs.orgForm.validate((valid) => {
-                if (valid) {
-                    const cas = this.cascaderValue
-                    if (cas && cas.length) {
-                        this.orgForm.parentId = cas[cas.length - 1];
-                        this.orgForm.level = cas.length + 1;
-                    }
-                    if (this.isAddOrg) {
-                        // 添加
-                        this.$post(this.api.saveOrg, this.orgForm).then(res => {
-                            util.successMsg("新增成功！");
-                            this.handleClose();
-                            this.handleRefresh();
-                        }).catch(err => {
-                        });
-                    } else {
-                        if (cas.length === 1 && this.labelName === '班级名称') return util.errorMsg('请选择年级！')
-                        // 编辑
-                        this.$post(this.api.updateOrg, this.orgForm).then(res => {
-                            util.successMsg("编辑成功！");
-                            this.handleClose();
-                            this.handleRefresh();
-                            this.getOrgStudentData()
-                        }).catch(err => {
-                        });
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        handleRefresh() { // 刷新树节点
-            this.treeVisible = false;
-            setTimeout(() => {
-                this.treeVisible = true;
-            }, 500);
-            this.treeNode.childNodes.splice(0);
-            this.loadNodeTree(this.treeNode, this.treeResolve);
-        },
-        handleClose() { // 关闭
-            this.orgVisible = false;
-            this.showCascader = true;
-            this.cascaderValue = [];
-            this.orgForm = {
-                organizationName: ""
-            };
-        },
-        loadNodeTree(node, resolve) { // 懒加载树结构
-            let level = 1;
-            let parentId = "";
-            if (node.level === 0) {
-                this.treeNode = node;
-                this.treeResolve = resolve;
-                this.getOrgTreeData(resolve, level, parentId);
-            } else if (node.level > 2) {
-                return resolve([]);
-            } else {
-                if (node.data && node.data.level && node.data.id) {
-                    this.getOrgTreeData(resolve, node.data.level + 1, node.data.id, node.data.ids);
-                }
-            }
-        },
-        getOrgTreeData(resolve, level, parentId, ids) { // 获取组织架构树数据
-            this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
-                let { status, treeList } = res;
-                if (status === 200 && treeList.length) {
-                    let result = [];
-                    treeList.forEach(i => {
-                        if (i.level === 3) {
-                            i.leaf = true;
-                        } else {
-                            i.leaf = false;
-                        }
-                        i.ids = ids ? `${ids},${i.id}` : `${i.id}`; // 给树结构添加唯一标识
-                        result.push(i);
-                    });
-                    return resolve(result);
-                } else {
-                    return resolve([]);
-                }
-            }).catch(err => {
-            });
-        },
-        getOrgStudentData() { // 根据组织架构筛选学生列表
-            let params = {
-                architectureId: this.architectureId,
-                level: this.orgLevel,
-                keyWord: this.keyWord,
-                pageNum: 1,
-                pageSize: this.pageSize
-            };
-            this.$post(this.api.organizationalStudentList, params).then(res => {
-                this.listData = res.page;
-                this.total = res.total;
-            }).catch(err => {
-            });
-        },
-        getData() { // 学生列表
-            let data = {
-                type: this.studentType,
-                keyWord: this.keyWord,
-                pageNum: this.page,
-                pageSize: this.pageSize
-            };
-            this.$post(this.api.studentList, data).then(res => {
-                this.listData = res.page;
-                this.total = res.total;
-            }).catch(err => {
-            });
-        },
-        currentChange(val) { // 切换页码
-            this.page = val;
-            if (this.studentType) {
-                this.getData();
-            } else {
-                this.getOrgStudentData();
-            }
-        },
-        getRowKeys(row) { // 表格key
-            return row.accountId;
-        },
-        handleSelectionChange(val) { // 多选
-            this.multipleSelection = val;
-        },
-        changeStudentType() {
-            this.isRemove = false;
-            this.initData();
-        },
-        initData() {
-            this.$refs.table.clearSelection();
-            this.page = 1;
-            this.getData();
-        },
-        delAllSelection() { // 批量删除
-            if (this.multipleSelection.length) {
-                this.$confirm("确定要删除选中用户吗？", "提示", {
-                    type: "warning"
-                }).then(() => {
-                    let ids = this.multipleSelection.map(item => {
-                        return item.accountId;
-                    });
-                    this.$post(`${this.api.delStudent}?accountIds=${ids.toString()}`).then(res => {
-                        this.multipleSelection = [];
-                        this.$refs.table.clearSelection();
-                        util.successMsg("删除成功");
-                        if (this.studentType) {
-                            this.getData();
-                        } else {
-                            this.getOrgStudentData();
-                        }
-                    }).catch(res => {
-                    });
-                    if(this.multipleSelection.length === this.listData.length && this.page>1) {
-                        this.handleCurrentChange(this.page - 1)
-                    }
-                }).catch(() => {
-                });
+      // 每个层级加上父级id的集合
+      handleOrgId(list, ids) {
+        list.forEach(e => {
+          e.ids = ids ? [...ids, e.id] : [e.id]
+          e.children && this.handleOrgId(e.children, e.ids)
+        })
+      },
+      // 组织类别筛选回调
+      changeType() {
+        this.$refs.orgs.setCurrentKey(null)
+        this.initData()
+      },
+      // 添加部门
+      addOrg(node, data) {
+        const list = JSON.parse(JSON.stringify(this.orgs))
+        this.handleOrg(list)
+        this.orgListDia = list
+        this.orgForm = {
+          id: '',
+          pid: data ? data.id : '0',
+          pidName: data ? data.name : '',
+          name: ''
+        }
+        this.orgVisible = true
+      },
+      // 编辑部门
+      editOrg(node, data) {
+        const list = JSON.parse(JSON.stringify(this.orgs))
+        this.handleOrg(list, data.id, 0)
+        this.orgListDia = list
+        this.orgForm = {
+          id: data.id,
+          name: data.name
+        }
+        this.orgVisible = true
+        const ids = data.ids
+        ids.splice(ids.length - 1, 1)
+        this.cascaderValue = ids
+      },
+      // 处理更换部门的禁选
+      handleOrg(list, id, disabled) {
+        list.forEach(e => {
+          // 如果是已经找到了要禁选的层级，则直接改变disabled，并递归
+          if (disabled) {
+            e.disabled = true
+            e.children && this.handleOrg(e.children, id, 1)
+          } else {
+            if (e.id === id) {
+              e.disabled = true
+              e.children && this.handleOrg(e.children, id, 1)
             } else {
-                util.errorMsg("请先选择数据 ！");
+              e.children && this.handleOrg(e.children, id, 0)
             }
-        },
-        handleDelete(row) { // 删除
-            this.$confirm("确定要删除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.delStudent}?accountIds=${row.accountId}`).then(res => {
-                    util.successMsg("删除成功");
-                    if (this.studentType) {
-                        this.getData();
-                    } else {
-                        this.getOrgStudentData();
-                    }
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        removeStudent(row) { // 移除
-            this.$confirm("确定要移除吗？", "提示", {
-                type: "warning"
-            }).then(() => {
-                this.$post(`${this.api.removeStudent}?classId=${this.currentClassId}&stuAccountId=${row.accountId}`).then(res => {
-                    util.successMsg("移除成功");
-                    if (this.studentType) {
-                        this.getData();
-                    } else {
-                        this.getOrgStudentData();
-                    }
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        resetPassword(row) { // 重置密码
-            this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
-                this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=111aaa`).then(res => {
-                    util.successMsg("重置成功");
-                }).catch(res => {
-                });
-            }).catch(() => {
-            });
-        },
-        switchOff(row) { // 更新状态
-            let isEnable = row.isEnable === 0 ? 0 : 1;
-            this.$get(`${this.api.updateAccountEnable}?id=${row.accountId}&isEnable=${isEnable}`).then(res => {
-                util.successMsg("更新状态成功");
-                if (this.studentType) {
-                    this.getData();
-                } else {
-                    this.getOrgStudentData();
-                }
-            }).catch(res => {
-            });
-        },
-        addStudent() { // 添加学生
-            this.isAdd = true;
-            this.showTree = true;
-            this.studentVisible = true;
-        },
-        editStudent(row, isDetail) { // 编辑/查看
-            this.isAdd = false;
-            this.isDetail = isDetail;
-            this.showTree = false;
-            this.studentVisible = true;
-            this.$post(`${this.api.getStudentInfoByAccountId}?stuAccountId=${row.accountId}`).then(res => {
-                this.form = res.data;
-                this.showTree = true;
-            }).catch(res => {});
-        },
-        // 组合账号
-        renderAccount() {
-          const form = this.form
-          // 平台id-端id-schoolId-workNumber组成账号
-          form.account = `${Setting.platformId}-1-${this.schoolId}-${form.workNumber}`
-        },
-        workNumberChange() {
-            const form = this.form
-            const { workNumber } = form
-            // 只有输入了学号并且是新增才需要根据学号查询其他信息
-            if (workNumber && this.isAdd && /^[A-Za-z0-9]*$/.test(workNumber)) {
-                this.$post(`${this.api.getDetailByAccount}?workNumber=${workNumber}&platformId=${Setting.platformId}&type=1`).then(({ data }) => {
-                  if (data) {
-                    this.showTree = true;
-                    const classId = data.classList.map(e => e.id).toString();
-                    this.form = data
-                    this.form.classId = classId
-                    this.renderAccount()
-                    // 无指定范围的classId为1，即没有班级，如果没有班级则直接清空班级选择
-                    if (classId === '1') {
-                      this.$refs.classTree.setCheckedKeys([])
-                    } else {
-                      this.defaultCheckedKeys = classId.split(",").map(i => Number(i))
-                    }
-                    this.$refs.form.clearValidate()
+          }
+        })
+      },
+      // 删除部门
+      delOrg(node, data) {
+        this.$confirm("确定要删除吗？", "提示", {
+            type: "warning"
+        }).then(() => {
+            this.$del(`${this.api.dept}/${data.id}`).then(res => {
+              util.successMsg("删除成功")
+              this.getOrg()
+            }).catch(res => {})
+        }).catch(() => {})
+      },
+      // 提交组织架构新增/编辑
+      orgSubmit() {
+          this.$refs.orgForm.validate((valid) => {
+              if (valid) {
+                  const form = this.orgForm
+                  const cas = this.cascaderValue
+                  const len = cas.length
+                  if (cas && len) {
+                      this.orgForm.pid = cas[len - 1]
+                  }
+                  debugger
+                  if (!form.id) {
+                      // 添加
+                      this.$post(this.api.dept, form).then(res => {
+                          util.successMsg("新增成功！")
+                          this.closeOrg()
+                      }).catch(err => {})
                   } else {
-                    // 如果该学号没有对应的学生，则清空所有信息，除了学号
-                    this.form = JSON.parse(JSON.stringify(this.originForm))
-                    this.form.workNumber = workNumber
-                    this.renderAccount()
-                    this.$refs.classTree.setCheckedKeys([])
+                      // 编辑
+                      this.$put(this.api.dept, form).then(res => {
+                          util.successMsg("编辑成功！")
+                          this.closeOrg()
+                      }).catch(err => {})
                   }
-              }).catch(res => {})
-            } else {
-              this.renderAccount()
-            }
-        },
-        phoneChange() {
-            let regex = /^1[3456789]\d{9}$/;
-            if (regex.test(this.form.phone)) {
-                let url = "";
-                if (this.isAdd && !this.form.accountId) {
-                    url = `${this.api.checkEmailOrPhone}?phone=${this.form.phone}&email=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&phone=${this.form.phone}&email=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.phoneRepeat = false;
-                    }
-                }).catch(err => {
-                    this.phoneRepeat = true;
-                });
-            } else {
-              this.phoneRepeat = false
-            }
-        },
-        emailChange() {
-            let regex = /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/;
-            if (regex.test(this.form.email)) {
-                let url = "";
-                if (this.isAdd && !this.form.accountId) {
-                    url = `${this.api.checkEmailOrPhone}?email=${this.form.email}&phone=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.form.accountId}&email=${this.form.email}&phone=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.emailRepeat = false;
-                    }
-                }).catch(err => {
-                    this.emailRepeat = true;
-                });
+              }
+          })
+      },
+      // 点击树节点查询列表数据
+      handleNodeClick(data) {
+        this.$refs.table.clearSelection()
+        this.studentType = null
+        this.getStaff()
+      },
+      // 关闭组织新增编辑弹框
+      closeOrg() {
+        this.orgVisible = false
+        this.cascaderValue = []
+        this.getOrg()
+      },
+      // 员工列表
+      getStaff() {
+        this.$post(this.api.users, {
+          page: this.page,
+          limit: this.pageSize,
+          // deptId: this.$refs.orgs.getCurrentKey() || '',
+        }).then(({ data }) => {
+          this.list = data.records
+          this.total = +data.total
+        }).catch(err => {})
+      },
+      // 切换页码
+      currentChange(val) {
+        this.page = val
+        this.getStaff()
+      },
+      handleSelectionChange(val) { // 多选
+        this.multipleSelection = val
+      },
+      initData() {
+        this.$refs.table.clearSelection()
+        this.page = 1
+        this.getStaff()
+      },
+      // 删除
+      delStaff(row) { 
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$del(this.api.user, [row.id]).then(res => {
+            util.successMsg("删除成功")
+            this.getStaff()
+          }).catch(res => {})
+        }).catch(() => {})
+      },
+      // 批量删除
+      batchDel() {
+        const list = this.multipleSelection
+        if (list.length) {
+          this.$confirm('确定要删除吗？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.$del(`${this.api.user}`, list.map(e => e.id)).then(res => {
+              this.$refs.table.clearSelection()
+              util.successMsg('删除成功')
+              this.getStaff()
+            }).catch(res => {})
+          }).catch(() => {})
+        } else {
+          util.errorMsg('请先选择数据 ！')
+        }
+      },
+      // 重置密码
+      resetPassword(row) {
+        const newPwd = Setting.initialPassword
+        this.$confirm(`重置后的密码为：${newPwd}，确定重置？`, "提示", { type: "warning" }).then(() => {
+          this.$get(`${this.api.resetPwd}?userId=${row.userId}&newPwd=${newPwd}`).then(res => {
+            util.successMsg("重置成功")
+          }).catch(res => {})
+        }).catch(() => {})
+      },
+      // 添加员工
+      addStaff() {
+        this.staffVisible = true
+        this.$nextTick(() => {
+          this.$refs.form.clearValidate()
+        })
+      },
+      // 编辑/查看
+      queryStaff(row, isDetail) {
+        const archId = []
+        // 处理部门id
+        const handleArchId = (list, ids, pid = []) => {
+          list.map(e => {
+            // 把部门id分割成二维数组，[[1, 2], [3, 4]]，每个层级的id都要放进去，后端返回的是最后一级的id，无法回显
+            if (ids.includes(e.id)) {
+              archId.push([...pid, e.id])
             } else {
-              this.emailRepeat = false
+              e.children && handleArchId(e.children, ids, [...pid, e.id])
             }
-        },
-        filterNode(value, data) {
-            if (!value) return true;
-            return data.organizationName.indexOf(value) !== -1;
-        },
-        loadClassTree(node, resolve) { // 懒加载所在班级树结构
-            let level = 1;
-            let parentId = "";
-            if (node.level === 0) {
-                this.treeNode = node;
-                this.treeResolve = resolve;
-                this.getClassTreeData(resolve, level, parentId);
-            } else if (node.level > 2) {
-                return resolve([]);
-            } else {
-                if (node.data && node.data.level && node.data.id) {
-                    this.getClassTreeData(resolve, node.data.level + 1, node.data.id);
+          })
+        }
+        this.isDetail = isDetail
+        this.staffVisible = true
+        this.$get(`${this.api.staffDetail}?accountId=${row.accountId}`).then(res => {
+          const { data } = res
+          const { staffArchitectureId, roleId } = data
+          if (roleId) {
+            const roleList = roleId.split(',').map(e => Number(e))
+            const list = this.roleList
+            if (roleList.length) {
+              let has = false // 是否在角色列表里有已选择的角色，全部都被删除了，则提示
+              for (const i in roleList) {
+                if (list.find(n => n.id === roleList[i])) {
+                  has = true
+                  break
                 }
+              }
+              if (!has) {
+                util.warningMsg('角色被删请重新选择')
+                data.roleList = []
+              } else {
+                data.roleList = roleList
+              }
             }
-        },
-        getClassTreeData(resolve, level, parentId) { // 获取组织架构树数据
-            this.$post(`${this.api.stuOrganizationTree}?level=${level}&parentId=${parentId}`).then(res => {
-                let { status, treeList } = res;
-                if (status === 200 && treeList.length) {
-                    let result = [];
-                    treeList.forEach(i => {
-                        i.disabled = i.level < 3;
-                        if (i.level === 3) {
-                            i.leaf = true;
-                            // 原本想在数据中添加勾选属性，但并没有效果，文档中props参数没有checked
-                            // i.checked = this.form.classId.includes(i.id.toString());
-                            if (this.form.classId) {
-                                this.defaultCheckedKeys = this.form.classId.split(",").map(i => Number(i));
-                            }
-                            i.showCheckbox = true;
-                        } else {
-                            i.leaf = false;
-                            i.showCheckbox = false;
-                        }
-                        result.push(i);
-                    });
-                    return resolve(result);
-                } else {
-                    return resolve([]);
-                }
-            }).catch(err => {
-            });
-        },
-        saveData(type) { // 提交新增/编辑学生
-            this.$refs.form.validate((valid) => {
-                if (valid) {
-                    if (this.submiting) return false
-                    let nodes = this.$refs.classTree.getCheckedNodes();
-                    let tempArr = [];
-                    nodes.forEach(i => {
-                        if (i.level === 3) {
-                            tempArr.push(i.id);
-                        }
-                    });
-                    this.form.classId = tempArr.toString() || 1
-                    if (this.form.accountId) {
-                        this.submiting = true
-                        this.$post(this.api.modifyStudent, this.form).then(res => {
-                            util.successMsg("编辑成功！");
-                            if (type) {
-                                this.resetStudent();
-                            } else {
-                                this.closeStudent();
-                                if (this.studentType) {
-                                    this.getData();
-                                } else {
-                                    this.getOrgStudentData();
-                                }
-                            }
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        }).catch(res => {
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        })
-                    } else {
-                        if (this.workNumberReapeat) return util.warningMsg("该学生学号已存在");
-                        if (this.phoneRepeat) return util.warningMsg("该手机号已存在");
-                        if (this.emailRepeat) return util.warningMsg("该邮箱已存在");
-                        this.submiting = true
-                        this.form.uniqueIdentification = new Date().getTime();
-                        this.$post(this.api.addStudent, this.form).then(res => {
-                            util.successMsg("新增成功！");
-                            if (type) {
-                                this.resetStudent();
-                            } else {
-                                this.closeStudent();
-                                if (this.studentType) {
-                                    this.getData();
-                                } else {
-                                    this.getOrgStudentData();
-                                }
-                            }
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        }).catch(res => {
-                            setTimeout(() => {
-                                this.submiting = false
-                            }, 2000)
-                        })
-                    }
-                } else {
-                    return false;
-                }
-            });
-        },
-        // 判重重置
-        resetRepeat() {
+          }
+          if (staffArchitectureId) {
+            handleArchId(this.orgs, staffArchitectureId.split(',').map(e => Number(e)))
+            data.staffArchitectureId = archId
+          }
+          this.form = data
+          this.originAccount = data.account
+          this.originWorkNumber = data.workNumber
+        }).catch(res => {})
+      },
+      // 获取角色数据
+      getRole() {
+        this.$get(`${this.api.roleList}?page=1&size=1000&name=&platformId=${Setting.platformId}&port=0`).then(res => {
+          this.roleList = res.rolePage.records
+        }).catch(res => {})
+      },
+      // 账号判重
+      accountChange() {
+        const form = this.form
+        const { account } = form
+        if (account === this.originAccount) {
+          this.accountReapeat = false
+        } else {
+          const { accountId } = form
+          this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=2&account=${account}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
+            this.accountReapeat = false
+          }).catch(err => {
+            this.accountReapeat = true
+          })
+        }
+      },
+      // 工号判重
+      worknumberChange() {
+        const form = this.form
+        const { workNumber } = form
+        if (workNumber === this.originWorkNumber) {
           this.workNumberReapeat = false
-          this.phoneRepeat = false
-          this.emailRepeat = false
-        },
-        resetStudent() { // 重置新增学生对话框
-            this.$refs.form.clearValidate();
-            this.form = {
-                userName: "",
-                account: "",
-                phone: "",
-                uniqueIdentification: "",
-                workNumber: "",
-                email: "",
-                classId: ""
-            };
-            this.$refs.classTree.setCheckedKeys([])
-            this.resetRepeat()
-            if (this.studentType) {
-                this.getData();
-            } else {
-                this.getOrgStudentData();
-            }
-        },
-        closeStudent() { // 关闭新增学生对话框
-            this.$refs.form.clearValidate();
-            this.form = {
-                userName: "",
-                account: "",
-                phone: "",
-                uniqueIdentification: "",
-                workNumber: "",
-                email: "",
-                classId: ""
-            };
-            this.defaultCheckedKeys = [];
-            this.isDetail = false;
-            this.showTree = false;
-            this.studentVisible = false;
-            this.resetRepeat()
-        },
-        batchImport() { // 批量导入
-            this.importVisible = true;
-            this.uploadList = [];
-            this.uploadFaild = false;
-        },
-        downLoad() { // 模板下载
-            location.href = this.api.studentTemplate;
-        },
-        handleExceed(files, fileList) { // 上传文件
-            util.warningMsg(
-                `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
-            );
-        },
-        showFaild() { // 下载失败文件
-            location.href = `${this.api.exportFailure}?exportCode=${this.exportCode}`;
-        },
-        uploadSuccess(res, file, fileList) {
-            this.uploadFaild = false;
-            if (res.status === 200) {
-                if (res.data.exportCode) {
-                    this.exportCode = res.data.exportCode;
-                    this.uploadFaild = true;
-                }
-                util.successMsg(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
-                this.handleRefresh();
-                util.successMsg(`本次上传有${res.data.failureNum}个错误信息录入`);
-
-                this.getClassTreeData('','1','')
+        } else {
+          const { accountId } = form
+          this.$post(`${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=2&workNumber=${workNumber}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
+            this.workNumberReapeat = false
+          }).catch(err => {
+            this.workNumberReapeat = true
+          })
+        }
+      },
+      // 手机号判重
+      phoneChange() {
+        const form = this.form
+        const { phone } = form
+        if (phone) {
+          const { accountId } = form
+          this.$post(`${this.api.checkEmailOrPhone}?phone=${phone}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
+            this.phoneRepeat = false
+          }).catch(err => {
+            this.phoneRepeat = true
+          })
+        }
+      },
+      // 邮箱判重
+      emailChange() {
+        const form = this.form
+        const { email } = form
+        if (email) {
+          const { accountId } = form
+          this.$post(`${this.api.checkEmailOrPhone}?email=${email}${accountId ? `&accountId=${accountId}` : ''}`).then(res => {
+            this.emailRepeat = false
+          }).catch(err => {
+            this.emailRepeat = true
+          })
+        }
+      },
+      // 提交新增/编辑员工
+      submitStaff() {
+        this.$refs.form.validate((valid) => {
+          if (valid) {
+            if (this.submiting) return false
+            if (this.accountReapeat) return util.warningMsg("该账号已存在")
+            if (this.workNumberReapeat) return util.warningMsg("该工号已存在")
+            if (this.phoneRepeat) return util.warningMsg("该手机号已存在")
+            if (this.emailRepeat) return util.warningMsg("该邮箱已存在")
+            this.submiting = true
+            const form = JSON.parse(JSON.stringify(this.form))
+            const ids = form.staffArchitectureId
+            if (ids) form.staffArchitectureId = ids.map(e => e[e.length - 1])
+            if (form.id) {
+              this.$put(this.api.user, form).then(res => {
+                util.successMsg("编辑成功！")
+                this.staffVisible = false
+                setTimeout(() => {
+                  this.submiting = false
+                }, 2000)
+              }).catch(res => {
+                setTimeout(() => {
+                  this.submiting = false
+                }, 2000)
+              })
             } else {
-                res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据");
+              this.$post(this.api.user, form).then(res => {
+                util.successMsg("新增成功！")
+                this.staffVisible = false
+                setTimeout(() => {
+                  this.submiting = false
+                }, 2000)
+              }).catch(res => {
+                setTimeout(() => {
+                  this.submiting = false
+                }, 2000)
+              })
             }
-        },
-        uploadError(err, file, fileList) {
-            this.$message({
-                message: "上传出错，请重试！",
-                type: "error",
-                center: true
-            });
-        },
-        beforeRemove(file, fileList) {
-            return this.$confirm(`确定移除 ${file.name}？`);
-        },
-        handleRemove(file, fileList) {
-            this.uploadList = fileList;
-            this.uploadFaild = false;
-        },
-        uploadSure() {
-            this.importVisible = false;
-            this.studentType = 1;
-            this.keyWord = "";
-            this.handleClose();
-            this.handleRefresh();
-            this.initData();
+          }
+        })
+      },
+      // 关闭新增员工对话框
+      closeStaff() {
+        this.form = {
+          accountId: '',
+          userName: '',
+          account: '',
+          phone: '',
+          uniqueIdentification: '',
+          workNumber: '',
+          email: '',
+          staffArchitectureId: [],
+          roleList: []
         }
+        this.isDetail = false
+        this.getStaff()
+      },
+      // 批量导入
+      batchImport() {
+        this.importVisible = true
+        this.uploadList = []
+        this.uploadFaild = false
+      },
+      // 模板下载
+      download() {
+        location.href = this.api.staffTemplate
+      },
+      // 上传文件
+      handleExceed(files, fileList) {
+        util.warningMsg(
+          `当前限制选择 1 个文件，如需更换，请删除上一个文件再重新选择！`
+        )
+      },
+      // 下载失败文件
+      showFaild() {
+        location.href = `${this.api.exportFailure}?exportCode=${this.exportCode}`
+      },
+      uploadSuccess(res, file, fileList) {
+        this.uploadFaild = false
+        if (res.status === 200) {
+          if (res.data.exportCode) {
+            this.exportCode = res.data.exportCode
+            this.uploadFaild = true
+            util.errorMsg(`本次上传有${res.data.failureNum}个错误信息录入`)
+          }
+        } else {
+          res.message ? util.errorMsg(res.message) : util.errorMsg("上传失败，请检查数据")
+        }
+      },
+      uploadError(err, file, fileList) {
+        this.$message({
+          message: "上传出错，请重试！",
+          type: "error",
+          center: true
+        })
+      },
+      beforeRemove(file, fileList) {
+        return this.$confirm(`确定移除 ${file.name}？`)
+      },
+      handleRemove(file, fileList) {
+        this.uploadList = fileList
+        this.uploadFaild = false
+      },
+      uploadSure() {
+        this.importVisible = false
+        this.studentType = 1
+        this.keyword = ''
+        this.$refs.orgs.setCurrentKey(null)
+        this.getOrg()
+      }
     }
 };
 </script>
@@ -990,6 +755,9 @@ export default {
   display: inline-flex;
   align-items: center;
 }
+.org-name {
+  margin-right: 20px;
+}
 .name {
   display: inline-block;
   max-width: 160px;
@@ -997,4 +765,8 @@ export default {
   overflow: hidden;
   text-overflow: ellipsis;
 }
+.list-wrap {
+  width: calc(100% - 340px);
+  margin-left: 20px;
+}
 </style>
\ No newline at end of file
diff --git a/src/pages/userGroup/list/index.vue b/src/pages/userGroup/list/index.vue
new file mode 100644
index 0000000..4552e8d
--- /dev/null
+++ b/src/pages/userGroup/list/index.vue
@@ -0,0 +1,131 @@
+<template>
+  <div class="page">
+    <div class="tool">
+      <div class="search-wrap">
+        <el-input placeholder="请输入用户组名称" v-model.trim="keyword" clearable @keyup.enter.native="initData"></el-input>
+        <el-button type="primary" @click="initData">查询</el-button>
+      </div>
+      <div class="actions">
+        <el-button type="primary" @click="add" >新增</el-button>
+        <el-button @click="batchDel">删除</el-button>
+      </div>
+    </div>
+
+    <el-table ref="table" :data="list" class="table" header-align="center" @selection-change="handleSelectionChange" row-key="id">
+      <el-table-column type="selection" width="50" :reserve-selection="true"></el-table-column>
+      <el-table-column prop="columnName" label="名称"></el-table-column>
+      <el-table-column prop="name" label="名称" align="center" min-width="250" show-overflow-tooltip></el-table-column>
+      <el-table-column prop="description" label="角色描述" min-width="400" align="center"></el-table-column>
+      <el-table-column label="操作" width="170">
+        <template slot-scope="scope">
+          <el-button type="text" @click="edit(scope.row, 'edit')">编辑</el-button>
+          <el-button type="text" @click="del(scope.row)">删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+  </div>
+</template>
+
+<script>
+import util from '@/libs/util'
+export default {
+    data() {
+        return {
+          keyword: '',
+          list: [],
+          multipleSelection: [],
+        };
+    },
+    mounted() {
+      this.getData()
+    },
+    methods: {
+      getData() {
+        this.$post(this.api.groupList, {
+          columnName: this.keyword,
+          templateId: '',
+          typeId	: '',
+        }).then(({ data }) => {
+          this.list = data
+        }).catch(err => {})
+      },
+      initData() {
+        this.$refs.table.clearSelection()
+        this.page = 1
+        this.getData()
+      },
+      add() {
+        this.$router.push('add')
+      },
+      edit(row, type) {
+        this.$router.push(`add?id=${row.id}&level=${row.level + 1}&type=${type}`)
+      },
+      del(row) {
+        this.$confirm("确定要删除吗？", "提示", {
+          type: "warning"
+        }).then(() => {
+          this.$post(`${this.api.deleteColumn}?id=${row.id}`).then(res => {
+            util.successMsg("删除成功")
+            this.getData()
+          }).catch(res => {})
+        }).catch(() => {})
+      },
+      // 批量删除
+      batchDel() {
+        const list = this.multipleSelection
+        if (list.length) {
+          this.$confirm('确定要删除吗？', '提示', {
+            type: 'warning'
+          }).then(() => {
+            this.$del(`${this.api.user}`, list.map(e => e.id)).then(res => {
+              this.$refs.table.clearSelection()
+              util.successMsg('删除成功')
+              this.getStaff()
+            }).catch(res => {})
+          }).catch(() => {})
+        } else {
+          util.errorMsg('请先选择数据 ！')
+        }
+      },
+      handleSelectionChange(val) {
+        this.multipleSelection = val
+      },
+      handleCurrentChange(val) {
+        this.page = val
+        this.$router.push(`list?page=${val}`)
+        this.getData()
+      },
+      // 更改排序
+      sort() {
+
+      },
+      // 导航样式设置
+      styleSet() {
+        this.styleVisible = true
+      },
+      // 导航样式提交
+      styleSubmit() {
+        
+      }
+    }
+};
+</script>
+
+<style lang="scss" scoped>
+.styles {
+  display: inline-flex;
+  li {
+    margin-right: 20px;
+    text-align: center;
+    &:hover .review {
+      border-color: #2962FF;
+    }
+  }
+  .review {
+    padding: 18px;
+    margin-bottom: 10px;
+    border: 1px solid #DCDEE0;
+    border-radius: 2px;
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/router/modules/role.js b/src/router/modules/role.js
index 5196475..266c198 100644
--- a/src/router/modules/role.js
+++ b/src/router/modules/role.js
@@ -8,16 +8,16 @@ export default {
     path: '/role',
     name: 'role',
     redirect: {
-        name: `${pre}list`
+      name: `${pre}list`
     },
     meta,
     component: BasicLayout,
     children: [
-        {
-            name: `${pre}list`,
-            path: `list`,
-            component: () => import('@/pages/role/list'),
-            meta: { title: '角色管理' }
-        }
+      {
+        name: `${pre}list`,
+        path: `list`,
+        component: () => import('@/pages/role/list'),
+        meta: { title: '角色管理' }
+      }
     ]
 }
diff --git a/src/router/modules/system.js b/src/router/modules/system.js
deleted file mode 100644
index d7753e6..0000000
--- a/src/router/modules/system.js
+++ /dev/null
@@ -1,23 +0,0 @@
-import BasicLayout from "@/layouts/home";
-
-const meta = {};
-
-const pre = "system-";
-
-export default {
-    path: "/system",
-    name: "system",
-    redirect: {
-        name: `${pre}list`
-    },
-    meta,
-    component: BasicLayout,
-    children: [
-        {
-            name: `${pre}list`,
-            path: `list`,
-            component: () => import("@/pages/system/list"),
-            meta: { title: "系统设置" }
-        }
-    ]
-};
diff --git a/src/router/modules/user.js b/src/router/modules/user.js
index a816339..b9a0ebc 100644
--- a/src/router/modules/user.js
+++ b/src/router/modules/user.js
@@ -5,19 +5,19 @@ const meta = {};
 const pre = "user-";
 
 export default {
-    path: "/user",
-    name: "user",
-    redirect: {
-        name: `${pre}list`
-    },
-    meta,
-    component: BasicLayout,
-    children: [
-        {
-            name: `${pre}list`,
-            path: `list`,
-            component: () => import("@/pages/user/list"),
-            meta: { title: '组织与账号管理' }
-        }
-    ]
+  path: "/user",
+  name: "user",
+  redirect: {
+    name: `${pre}list`
+  },
+  meta,
+  component: BasicLayout,
+  children: [
+    {
+      name: `${pre}list`,
+      path: `list`,
+      component: () => import("@/pages/user/list"),
+      meta: { title: '组织与账号管理' }
+    }
+  ]
 };
diff --git a/src/router/modules/userGroup.js b/src/router/modules/userGroup.js
new file mode 100644
index 0000000..a969149
--- /dev/null
+++ b/src/router/modules/userGroup.js
@@ -0,0 +1,23 @@
+import BasicLayout from '@/layouts/home'
+
+const meta = {}
+
+const pre = 'userGroup-'
+
+export default {
+    path: '/userGroup',
+    name: 'userGroup',
+    redirect: {
+      name: `${pre}list`
+    },
+    meta,
+    component: BasicLayout,
+    children: [
+      {
+        name: `${pre}list`,
+        path: `list`,
+        component: () => import('@/pages/userGroup/list'),
+        meta: { title: '用户组管理' }
+      }
+    ]
+}
diff --git a/src/styles/common.scss b/src/styles/common.scss
index 17c7262..3407801 100644
--- a/src/styles/common.scss
+++ b/src/styles/common.scss
@@ -30,17 +30,9 @@
 .el-input {
   .el-input__inner {
     border-color: #DCDEE0;
+    border-radius: 2px;
   }
 }
-.p-title {
-  padding-left: 5px;
-  margin-bottom: 24px;
-  line-height: 1;
-  font-size: 14px;
-  color: #585858;
-  border-left: 3px solid $--color-primary;
-}
-
 .page {
   position: relative;
   padding: 16px 20px;
@@ -65,22 +57,19 @@
         display: inline-flex;
         align-items: center;
         margin-right: 30px;
-
         label {
-          margin-right: 6px;
+          margin-right: 20px;
           font-size: 14px;
-          line-height: 14px;
-          color: rgba(0, 0, 0, .65);
+          line-height: 20px;
+          color: #333;
           white-space: nowrap;
         }
       }
     }
     &.mul {
       margin-bottom: 0;
-
       .filter {
         width: 100vw;
-
         li {
           margin-bottom: 24px;
         }
@@ -91,7 +80,6 @@
 .search-wrap {
   display: flex;
   .el-input__inner {
-    border-radius: 0;
     border-right: 0;
   }
   .el-button {
@@ -323,24 +311,20 @@
   justify-content: center;
   align-items: center;
   padding: 34px 0;
-
   .el-button {
     span {
       display: flex;
       align-items: center;
       color: rgba(0, 0, 0, 0.65);
       font-size: 14px;
-
       img {
         margin-right: 8px;
       }
     }
   }
-
   & > .el-button {
     margin-right: 32px;
   }
-
   .el-upload-list {
     position: absolute;
     bottom: 0;
@@ -348,7 +332,6 @@
     width: 100%;
     max-width: 400px;
   }
-
   .link {
     position: absolute;
     bottom: -20px;
@@ -356,16 +339,13 @@
     width: 100%;
     text-align: center;
   }
-
   &.lg {
     padding-bottom: 50px;
   }
 }
-
 .el-tooltip__popper {
   width: 300px;
 }
-
 @media(max-width: 1600px) {
   .el-table {
     .el-switch__label--right.is-active {
@@ -373,7 +353,6 @@
     }
   }
 }
-
 .el-upload-list{
   width: 100%;
   max-width: 400px;