From f4850af50f7341d6e7ac6637b9297d3edfa7be23 Mon Sep 17 00:00:00 2001
From: yujialong <479214531@qq.com>
Date: Wed, 23 Mar 2022 09:56:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8E=E5=8F=B0=E8=B4=A6=E5=8F=B7=E7=BB=84?=
 =?UTF-8?q?=E7=BB=87=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 package-lock.json              |    5 +
 package.json                   |    1 +
 src/utils/api.js               |   11 +
 src/views/system/manageLog.vue |    1 +
 src/views/system/staff.vue     | 1507 ++++++++++++++++++++------------
 src/views/system/staffSide.vue |  387 --------
 6 files changed, 955 insertions(+), 957 deletions(-)
 delete mode 100644 src/views/system/staffSide.vue

diff --git a/package-lock.json b/package-lock.json
index 105fa7a..372a0ba 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7403,6 +7403,11 @@
       "resolved": "https://registry.npmjs.org/js-base64/-/js-base64-2.5.1.tgz",
       "integrity": "sha512-M7kLczedRMYX4L8Mdh4MzyAMM9O5osx+4FcOQuTvr3A9F2D9S5JXheN0ewNbrvK2UatkTRhL5ejGmGSjNMiZuw=="
     },
+    "js-cookie": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.1.tgz",
+      "integrity": "sha512-+0rgsUXZu4ncpPxRL+lNEptWMOWl9etvPHc/koSRp6MPwpRYAhmk0dUG00J4bxVV3r9uUzfo24wW0knS07SKSw=="
+    },
     "js-levenshtein": {
       "version": "1.1.6",
       "resolved": "https://registry.npmjs.org/js-levenshtein/-/js-levenshtein-1.1.6.tgz",
diff --git a/package.json b/package.json
index b1310b0..bb6b76f 100644
--- a/package.json
+++ b/package.json
@@ -12,6 +12,7 @@
     "babel-polyfill": "^6.26.0",
     "element-theme": "^2.0.1",
     "element-ui": "^2.13.0",
+    "js-cookie": "^3.0.1",
     "mavon-editor": "^2.6.17",
     "postcss-px2rem": "^0.3.0",
     "px2rem-loader": "^0.1.9",
diff --git a/src/utils/api.js b/src/utils/api.js
index 1212069..f96f436 100644
--- a/src/utils/api.js
+++ b/src/utils/api.js
@@ -210,6 +210,17 @@ export default {
     deleteKeyword: `data/keyword/deleteKeyword`,
     getKeywordByCategoryId: `data/keyword/getKeywordByCategoryId`,
     
+    // 后台账号
+    deleteArch: `${host1}/nakadai/staffAccountArchitecture/delete`,
+    saveArch: `${host1}/nakadai/staffAccountArchitecture/save`,
+    treeListArch: `${host1}/nakadai/staffAccountArchitecture/treeList`,
+    updateArch: `${host1}/nakadai/staffAccountArchitecture/update`,
+    delStaff: `${host1}/nakadai/backstageStaff/delStaff`,
+    modifyStaff: `${host1}/nakadai/backstageStaff/modifyStaff`,
+    saveStaff: `${host1}/nakadai/backstageStaff/saveStaff`,
+    staffDetail: `${host1}/nakadai/backstageStaff/staffDetail`,
+    staffList: `${host1}/nakadai/backstageStaff/staffList`,
+
     // 角色管理
     batchRemove: `users/role/batchRemove`, //批量删除角色
     checkRoleIsExist: `users/role/checkRoleIsExist`, //判断该角色是否存在
diff --git a/src/views/system/manageLog.vue b/src/views/system/manageLog.vue
index 6491483..d08f30e 100644
--- a/src/views/system/manageLog.vue
+++ b/src/views/system/manageLog.vue
@@ -203,6 +203,7 @@ export default {
     }
     .sign {
         position: relative;
+        display: inline-block;
         margin: -11px 0 0 -22%;
         font-size: 14px;
         color: #9076FF;
diff --git a/src/views/system/staff.vue b/src/views/system/staff.vue
index e87ea16..08375a5 100644
--- a/src/views/system/staff.vue
+++ b/src/views/system/staff.vue
@@ -1,140 +1,257 @@
 <template>
-    <div class="wrap">
-        <div class="side">
-            <div class="m-b-20">
-                <el-radio-group v-model="studentType" @change="changeStudentType">
+    <div>
+        <el-row :gutter="20">
+            <el-col :span="4">
+                <div class="page">
                     <div class="m-b-20">
-                        <el-radio :label="1">所有员工</el-radio>
+                        <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>
-                        <el-radio :label="2">未加入部门的员工</el-radio>
+                        <div class="flex-between">
+                            <h6 class="p-title" style="margin-bottom: 0">学生组织架构</h6>
+                            <el-button type="text" @click="addOrg">添加</el-button>
+                        </div>
+
+                        <div style="height: 504px; max-height: 504px; overflow: auto">
+                            <el-tree
+                                :data="orgList"
+                                default-expand-all
+                                ref="orgTree"
+                                node-key="id"
+                                highlight-current
+                                :expand-on-click-node="false"
+                                @node-click="handleNodeClick"
+                                :props="{children: 'children', label: 'organizationName', isLeaf: 'leaf'}"
+                            >
+                                <span class="custom-tree-node" slot-scope="{ node, data }">
+                                    <span class="org-name">{{ node.label }}</span>
+                                    <span>
+                                        <el-button
+                                            type="text"
+                                            icon="el-icon-edit-outline"
+                                            @click="() => editOrg(node, data)">
+                                        </el-button>
+                                        <el-button
+                                            type="text"
+                                            icon="el-icon-circle-plus-outline"
+                                            @click="() => addOrg(node, data)">
+                                        </el-button>
+                                    </span>
+                                </span>
+                            </el-tree>
+                        </div>
                     </div>
-                </el-radio-group>
-            </div>
-            <el-divider></el-divider>
-            <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 type="primary" round @click="addTeacher">新增员工</el-button>
-                    <el-button type="primary" round @click="batchImport">批量导入</el-button>
-                    <el-button type="primary" round @click="delAllSelection">批量删除</el-button>
+                    <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="rules" label-width="100px">
+                            <el-form-item label="部门名称" prop="organizationName">
+                                <el-input v-model.trim="orgForm.organizationName" placeholder="请输入"></el-input>
+                            </el-form-item>
+                            <el-form-item label="上级部门">
+                              <span v-if="orgForm.parentName">{{ orgForm.parentName }}</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 v-if="!orgForm.id" @click="closeOrg">取 消</el-button>
+                            <el-button v-else type="danger" plain @click="delOrg">删除</el-button>
+                            <el-button type="primary" @click="orgSubmit">确 定</el-button>
+                        </span>
+                    </el-dialog>
+
                 </div>
-            </div>
+            </el-col>
+            <el-col :span="20">
+                <div class="page">
+                    <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="primary" @click="addStudent">新增学生</el-button>
+                            <el-button type="primary" @click="batchImport">批量导入</el-button>
+                            <el-button type="primary" @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" :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="account" label="账号" align="center" min-width="100"></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-if="isRemove" type="text" @click="removeStudent(scope.row)">移除</el-button>
+                                <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>
+                                <el-switch
+                                    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>
 
-            <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="account" 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 type="text" @click="showTeacher(scope.row)">查看</el-button>
-                        <el-button type="text" @click="editTeacher(scope.row)">编辑</el-button>
-                        <el-button type="text" @click="resetPassword(scope.row)">重置密码</el-button>
-                        <el-button 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
+                        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="学生学号"></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-form-item prop="account" label="学生账号">
+                                        <el-input v-model="form.account" placeholder="请输入学生账号"></el-input>
+                                    </el-form-item>
 
-        <el-dialog :title="isDetail ? '查看员工' : (isAdd ? '新增员工' : '编辑员工')" :visible.sync="teacherVisible"
-                   width="30%" @close="closeTeacher" class="dialog" :close-on-click-modal="false">
-            <el-form ref="teacherForm" :model="teacherForm" :rules="rules" label-width="150px" :disabled="isDetail" style='margin-right: 80px;'>
-                <el-form-item prop="account" label="账号">
-                    <el-input v-model.trim="teacherForm.account" placeholder="请输入职工账号"></el-input>
-                </el-form-item>
-                <el-form-item prop="userName" label="用户姓名">
-                    <el-input v-model.trim="teacherForm.userName" placeholder="请输入员工姓名"></el-input>
-                </el-form-item>
-                <el-form-item prop="roleValue" label="账号角色">
-                    <el-select v-model="teacherForm.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="teacherForm.uniqueIdentification" placeholder="请输入职工工号获取唯一标识"></el-input>
-                </el-form-item>
-                <el-form-item prop="workNumber" label="工号">
-                    <el-input v-model.trim="teacherForm.workNumber" placeholder="请输入职工工号"></el-input>
-                </el-form-item>
-                <el-form-item v-for="item in teacherForm.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="teacherForm.phone" placeholder="请输入手机号" maxlength="11" @blur="phoneChange"></el-input>
-                </el-form-item>
-                <el-form-item prop="email" label="邮箱">
-                    <el-input v-model.trim="teacherForm.email" placeholder="请输入邮箱" @blur="emailChange"></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('teacherForm')">确 定</el-button>
-            </span>
-        </el-dialog>
+                                    <el-form-item prop="phone" label="手机号">
+                                        <el-input v-model="form.phone" placeholder="可用于登录平台，以及找回密码" maxlength="11" @blur="phoneChange"></el-input>
+                                    </el-form-item>
+                                    <el-form-item prop="email" label="邮箱">
+                                        <el-input v-model="form.email" placeholder="可用于登录平台，以及找回密码" @blur="emailChange"></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="height: 300px; max-height: 300px; 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-if="node.level < 3"
+                                                            type="text"
+                                                            icon="el-icon-circle-plus-outline"
+                                                            @click="() => addOrg(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="批量导入" :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>
+                    <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-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>
+            </el-col>
+        </el-row>
     </div>
 </template>
+
 <script>
+import util from "@/libs/util";
 import Setting from "@/setting";
-import org from "./staffSide"
+import OrgTree from "@/components/org-tree/src/tree";
 export default {
+    components: { OrgTree },
     data() {
         var accountPass = (rule, value, callback) => {
             if (value === '') {
@@ -151,484 +268,734 @@ export default {
         };
         var workNumberPass = (rule, value, callback) => {
             if (value === '') {
-                callback(new Error('请输入职工工号'));
+                callback(new Error('请输入学生学号'));
             } else {
-                var pattern = /^[a-zA-Z0-9]*$/;
+                var pattern = /^[A-Za-z0-9]*$/;
                 if(pattern.test(value)){
-                    this.workNumberChange();
+                    this.worknumberChange();
                     callback();
                 }else{
-                    callback(new Error('职工工号必须为数字或英文'));
+                    callback(new Error('请输入正确学生学号格式'));
                 }
             }
         };
+        let that = this;
         return {
-            exportCode: "",
-            headers: {
-                // token: util.local.get(Setting.tokenKey)
-            },
-            isDetail: false,
-            isAdd: false,
-            teacherVisible: false,
-            roleList: [], // 角色列表
-            orgList: [], // 员工组织架构列表
-            casProps: {
-                value: 'id'
-            },
-            teacherForm: {
-                accountId: "",
-                account: "",
-                userName: "",
-                roleValue: [],
-                roleAndDeptList: [],
-                uniqueIdentification: "",
-                workNumber: "",
-                phone: "",
-                email: ""
-            },
-            rules: {
-                account: [
-                    { required: true, validator: accountPass, trigger: 'blur' }
-                ],
-                userName: [
-                    { required: true, message: "请输入用户姓名", trigger: "blur" }
-                ],
-                roleValue: [
-                    { required: true, message: "请选择账号角色", trigger: "change" }
-                ],
-                workNumber: [
-                    { required: true, validator: workNumberPass , trigger: 'blur' }
-                ],
-                uniqueIdentification: [
-                    // { required: true, message: '请输入唯一标识', trigger: 'blur' },
-                ],
-                phone: [
-                    // { required: true, message: '请输入职工手机号', trigger: 'blur' },
-                    { pattern: /^1[3456789]\d{9}$/, message: "请输入正确的手机号", trigger: "blur"}
-                ],
-                email: [
-                    // { required: true, message: '请输入邮箱', trigger: 'blur' },
-                    {
-                        pattern: /^([a-zA-Z]|[0-9])(\w|\-)+@[a-zA-Z0-9]+\.([a-zA-Z]{2,4})$/,
-                        message: "请输入正确的邮箱",
-                        trigger: "blur"
-                    }
-                ],
-            },
-            accountReapeat: false,
-            workNumberReapeat: false,
-            phoneRepeat: false,
-            emailRepeat: false,
-
-            listData: [], // 员工列表数据
-            keyword: "",
-            page: 1,
-            pageSize: 10,
-            total: 0,
-            multipleSelection: [], // 多选
+          orgList: [],
+          orgListDia: [],
+          isRemove: false, // 是否可以移除
+          currentClassId: '', // 当前班级id
+          studentType: 1, //类型:必填一个(1.所有学生 2.未加入班级学生)
+          architectureId: '', // 架构id
+          orgLevel: '', // 架构层级 层级(1.专业 2.年级 3.班级)
+          orgVisible: false, // 学生组织架对话框
+          labelName: "部门名称", //
+          orgForm: {
+            id: '',
+            organizationName: ''
+          },
+          cascaderValue: [], // 上级部门
+          cascaderProps: {
+              checkStrictly: true,
+              label: "organizationName",
+              value: "id"
+          }, // 部门级联数据
+          treeVisible: true,
+          treeNode: {},
+          treeResolve: [],
+          isDetail: false,
+          keyWord: '',
+          form: {
+              userName: '',
+              phone: '',
+              uniqueIdentification: '',
+              workNumber: '',
+              email: '',
+              account: '',
+              classId: ""
+          },
+          rules: {
+              organizationName: [
+                  { required: true, message: "请输入名称", trigger: "blur" }
+              ],
+              account: [
+                  { required: true,validator: accountPass, trigger: 'blur' }
+                  // { required: true, message: "请输入账号", trigger: "blur" },
+                  // {
+                  //     pattern: /^[A-Za-z0-9]*$/,
+                  //     message: "请输入正确的账号",
+                  //     trigger: "blur"
+                  // }
+              ],
+              userName: [
+                  { required: true, message: "请输入学生姓名", trigger: "blur" }
+              ],
+              workNumber: [
+                  { required: true,validator: workNumberPass, trigger: 'blur' }
+                  // { required: true, message: "请输入学生学号", trigger: "blur" },
+                  // {
+                  //     pattern: /^[A-Za-z0-9]*$/,
+                  //     message: "请输入正确的学号",
+                  //     trigger: "blur"
+                  // }
+              ],
+              phone: [
+                  // { required: true, message: '请输入职工手机号', trigger: 'blur' },
+                  {
+                      pattern: /^1[3456789]\d{9}$/,
+                      message: "请输入正确的手机号",
+                      trigger: "blur"
+                  }
+              ],
+              email: [
+                  // { required: true, message: '请输入邮箱', trigger: 'blur' },
+                  {
+                      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: [],
 
-            importVisible: false, // 批量导入对话框
-            uploadList: [], // 上传文件列表
-            uploadFaild: false, // 上传失败
+          isAdd: true,
+          studentVisible: false,
+          accountReapeat: false,
+          workNumberReapeat: false,
+          phoneRepeat: false,
+          emailRepeat: false,
+          showTree: true, // 是否显示所在班级树
+          defaultCheckedKeys: [],
+          filterText: '', // 通过关键字过滤树节点
 
-            gradeId: "", // 员工年级ID
-            staffArchitectureId: "", // 员工部门ID
-            submiting: false // 新增编辑员工防抖标识
+          importVisible: false,
+          uploadList: [],
+          uploadFaild: false,
+          exportCode: '',
+          headers: {
+              token: util.local.get(Setting.tokenKey)
+          },
+          disableds:false,
+          submiting: false // 新增编辑防抖标识
         };
     },
-    components: {
-        org
-    },
     watch: {
-        keyword: function(val) {
+        keyWord: function(val) {
             clearTimeout(this.searchTimer);
             this.searchTimer = setTimeout(() => {
-                this.initData();
+                if (this.studentType) {
+                    this.initData();
+                } else {
+                    this.getOrgStudentData();
+                }
+
             }, 500);
+        },
+        filterText(val) {
+            this.$refs.classTree.filter(val);
         }
     },
     mounted() {
-        // this.getRoleData()
-        // this.getData()
+      this.getOrg()
     },
     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`).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.teacherForm = {
-                accountId: "",
-                account: "",
-                userName: "",
-                roleValue: [],
-                roleAndDeptList: [],
-                uniqueIdentification: "",
-                workNumber: "",
-                phone: "",
-                email: ""
-            };
-            this.$refs.teacherForm.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.teacherForm = data;
-                this.teacherForm.roleValue = data.roleAndDeptList.map(i => i.roleId);
-                this.teacherForm.roleAndDeptList = data.roleAndDeptList.map(i => {
-                    i.cascaderValue = [i.staffArchitectureId, i.gradeId]
-                    return i;
-                });
-                console.log(22, this.teacherForm)
-            }).catch(res => {});
-        },
-        resetPassword(row) { // 重置密码
-            this.$confirm(`重置后的密码为：${Setting.initialPassword}，确定重置？`, "提示", { type: "warning" }).then(() => {
-                this.$get(`${this.api.resetPassword}?userId=${row.userId}&newPwd=111aaa`).then(res => {
-                    this.$message.success("重置成功");
-                }).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);
-        },
-        accountChange() { // 切换账号
-            if (this.teacherForm.account) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}&account=${this.teacherForm.account}&workNumber=`;
-                } else {
-                    url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}&accountId=${this.teacherForm.accountId}&account=${this.teacherForm.account}&workNumber=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.accountReapeat = false;
-                    }
-                }).catch( err => {
-                    this.accountReapeat = true;
-                });
-            }
-        },
-        workNumberChange() { // 切换工号
-            if (this.teacherForm.workNumber) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}&workNumber=${this.teacherForm.workNumber}&account=`;
-                } else {
-                    url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=${Setting.platformType}&accountId=${this.teacherForm.accountId}&workNumber=${this.teacherForm.workNumber}&account=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.workNumberReapeat = false;
-                    }
-                }).catch( err => {
-                    this.workNumberReapeat = true;
-                });
-            }
-        },
-        phoneChange() { // 切换手机号
-            let regex = /^1[3456789]\d{9}$/;
-            if (regex.test(this.teacherForm.phone)) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkEmailOrPhone}?phone=${this.teacherForm.phone}&email=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.teacherForm.accountId}&phone=${this.teacherForm.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.teacherForm.email)) {
-                let url = "";
-                if (this.isAdd) {
-                    url = `${this.api.checkEmailOrPhone}?email=${this.teacherForm.email}&phone=`;
-                } else {
-                    url = `${this.api.checkEmailOrPhone}?accountId=${this.teacherForm.accountId}&email=${this.teacherForm.email}&phone=`;
-                }
-                this.$post(url).then(res => {
-                    if (res.status === 200) {
-                        this.emailRepeat = false;
-                    }
-                }).catch( err => {
-                    this.emailRepeat = true;
-                });
-            }
-        },
-        roleChange(value) { // 处理切换角色
-            console.log(this.teacherForm.roleValue)
-            if (value.length) {
-                let ids = this.teacherForm.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.teacherForm.roleAndDeptList.push(obj);
-                    }
-                });
+      // 获取组织
+      async getOrg() {
+        const res = await this.$post(this.api.treeListArch)
+        const list = res.treeList
+        this.orgList = list
+        this.handleOrgId(list)
+      },
+      // 每个层级加上父级id的集合
+      handleOrgId(list, ids) {
+        list.forEach(e => {
+          e.ids = ids ? [...ids, e.id] : [e.id]
+          this.handleOrgId(e.children, e.ids)
+        })
+      },
+      // 添加部门
+      addOrg(node, data) {
+        this.orgForm = {
+          id: '',
+          parentId: data ? data.id : 1,
+          level: data ? data.level + 1 : 1,
+          parentName: data ? data.organizationName : '',
+          organizationName: ''
+        }
+        this.orgListDia = this.orgList
+        this.orgVisible = true
+      },
+      // 编辑部门
+      editOrg(node, data) {
+        const list = JSON.parse(JSON.stringify(this.orgList))
+        this.handleOrg(list, data.id, 0)
+        this.orgListDia = list
+        this.orgForm = {
+          id: data.id,
+          organizationName: data.organizationName
+        }
+        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
+            this.handleOrg(e.children, id, 1)
+          } else {
+            if (e.id === id) {
+              e.disabled = true
+              this.handleOrg(e.children, id, 1)
             } else {
-                this.teacherForm.roleAndDeptList.splice(0);
+              this.handleOrg(e.children, id, 0)
             }
-        },
-        roleRemove(value) { // 处理移除角色
-            let list = [];
-            for(var i=0;i<this.teacherForm.roleAndDeptList.length;i++){
-                if (this.teacherForm.roleAndDeptList[i].roleId == value){
+          }
+        })
+      },
+      // 删除部门
+      delOrg() {
+        this.$confirm("确定要删除吗？", "提示", {
+            type: "warning"
+        }).then(() => {
+            this.$post(`${this.api.deleteArch}?id=${this.orgForm.id}`).then(res => {
+              util.successMsg("删除成功")
+              this.closeOrg()
+            }).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.parentId = cas[len - 1]
+                      this.orgForm.level = len + 1
+                  }
+                  debugger
+                  if (!form.id) {
+                      // 添加
+                      this.$post(this.api.saveArch, form).then(res => {
+                          util.successMsg("新增成功！")
+                          this.closeOrg()
+                      }).catch(err => {})
+                  } else {
+                      if (cas.length === 1 && this.labelName === '班级名称') return util.errorMsg('请选择年级！')
+                      // 编辑
+                      this.$post(this.api.updateArch, form).then(res => {
+                          util.successMsg("编辑成功！")
+                          this.closeOrg()
+                      }).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);
+      },
+      // 关闭组织新增编辑弹框
+      closeOrg() {
+        this.orgVisible = false
+        this.cascaderValue = []
+        this.getOrg()
+      },
+      getOrgTreeData(resolve, level, parentId, ids) { // 获取组织架构树数据
+          this.$post(`${this.api.treeListArch}?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.treeListArch, 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(() => {
+              });
+          } else {
+              util.errorMsg("请先选择数据 ！");
+          }
+      },
+      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 => {});
+      },
+      accountChange() { // 切换账号
+          if (this.form.account) {
+              let url = "";
+              if (this.isAdd) {
+                  url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&account=${this.form.account}&workNumber=`;
+              } else {
+                  url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&accountId=${this.form.accountId}&account=${this.form.account}&workNumber=`;
+              }
+              this.$post(url).then(res => {
+                  this.disableds = false
+                  if (this.isAdd && this.form.accountId) {
+                      this.$refs.form.clearValidate();
+                      this.form = {
+                          account: this.form.account,
+                          userName: '',
+                          phone: '',
+                          uniqueIdentification: '',
+                          workNumber: '',
+                          email: '',
+                          classId: ""
+                      };
+                      this.$refs.classTree.setCheckedKeys([]);
+                  } else {
+                      this.$refs.form.clearValidate();
+                  }
+                  this.accountReapeat = false;
+              }).catch(err => {
 
-                }else{
-                    list.push(this.teacherForm.roleAndDeptList[i])
-                }
-            }
-            this.teacherForm.roleAndDeptList = list
-        },
-        async saveSure(teacherForm) {
-            this.$refs[teacherForm].validate((valid) => {
-                if (valid) {
-                    if (this.submiting) return false
-                    if (this.accountReapeat) return this.$message.warning("该账号已存在");
-                    if (this.workNumberReapeat) return this.$message.warning("该员工工号已存在");
-                    if (this.phoneRepeat) return this.$message.warning("该手机号已存在");
-                    if (this.emailRepeat) return this.$message.warning("该邮箱已存在");
-                    let data = {
-                        accountId: this.teacherForm.accountId,
-                        account: this.teacherForm.account,
-                        userName: this.teacherForm.userName,
-                        roleAndDeptList: [],
-                        uniqueIdentification: this.teacherForm.uniqueIdentification ? this.teacherForm.uniqueIdentification : new Date().getTime(),
-                        workNumber: this.teacherForm.workNumber,
-                        phone: this.teacherForm.phone,
-                        email: this.teacherForm.email
-                    };
-                    if (this.teacherForm.roleAndDeptList.length){
-                        for (let i = 0; i < this.teacherForm.roleAndDeptList.length; i++) {
-                            if (this.teacherForm.roleAndDeptList[i].cascaderValue.length < 2) {
-                                this.$message.warning(`请选择${this.teacherForm.roleAndDeptList[i].roleName}所属部门`)
-                                return;
-                            } else {
-                                let obj = {
-                                    roleId: this.teacherForm.roleAndDeptList[i].roleId,
-                                    staffArchitectureId: this.teacherForm.roleAndDeptList[i].cascaderValue[0],
-                                    gradeId: this.teacherForm.roleAndDeptList[i].cascaderValue[1]
-                                };
-                                data.roleAndDeptList.push(obj);
-                            }
-                        }
-                    }
-                    this.submiting = true
-                    if (this.teacherForm.accountId) {
-                        this.$post(this.api.modifyStaff, data).then(res => {
-                            this.$message.success("编辑成功");
-                            this.closeTeacher();
-                            this.getData();
-                            this.submiting = false
-                        }).catch(res => {
-                            this.submiting = false
-                        });
-                    } else {
-                        this.$post(this.api.saveStaff, data).then(res => {
-                            this.$message.success("添加成功");
-                            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 => {
-                    this.$message.success("删除成功");
-                    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();
-                        this.$message.success("删除成功");
-                        this.getData();
-                    }).catch(res => {
-                    });
-                }).catch(() => {
-                });
-            } else {
-                this.$message.error("请先选择员工 ！");
-            }
-        },
-        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) {
-            this.$message.warning(
-                `当前限制选择 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;
-                }
-                this.$message.success(`上传成功${res.data.successNum}，上传失败${res.data.failureNum}`);
-            } else {
-                res.message ? this.$message.error(res.message) : this.$message.error("上传失败，请检查数据");
-            }
-        },
-        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();
-        }
+                  if (this.isAdd) {
+                      this.showTree = false;
+                  } else {
+                      this.accountReapeat = true;
+                  }
+              });
+          }
+      },
+      worknumberChange() {
+          if (this.form.workNumber) {
+              let url = "";
+              if (this.isAdd && !this.form.accountId) {
+                  url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&workNumber=${this.form.workNumber}&account=`;
+              } else {
+                  url = `${this.api.checkWorkNumOrAccount}?platformId=${Setting.platformId}&type=1&accountId=${this.form.accountId}&workNumber=${this.form.workNumber}&account=`;
+              }
+              this.$post(url).then(res => {
+                  if (res.status === 200) {
+                      this.workNumberReapeat = false;
+                  }
+              }).catch(err => {
+                  this.$post(`${this.api.getDetailByAccount}?workNumber=${this.form.workNumber}&platformId=${Setting.platformId}&type=1`).then(res => {
+                      this.showTree = true;
+                      let classId = res.data.classList.map(e => e.id);
+                      this.form.classId = classId.toString();
+                      delete this.form.classList;
+                      // this.showTree = true;
+                      this.accountReapeat = false;
+                      this.$refs.form.clearValidate();
+                  }).catch(res => {});
+                  this.workNumberReapeat = true;
+              });
+          }
+      },
+      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;
+              });
+          }
+      },
+      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;
+              });
+          }
+      },
+      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);
+              }
+          }
+      },
+      getClassTreeData(resolve, level, parentId) { // 获取组织架构树数据
+          this.$post(`${this.api.treeListArch}?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();
+                  if (nodes.length) {
+                      let tempArr = [];
+                      nodes.forEach(i => {
+                          if (i.level === 3) {
+                              tempArr.push(i.id);
+                          }
+                      });
+                      this.form.classId = tempArr.toString();
+                  }
+                  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.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
+                      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;
+              }
+          });
+      },
+      resetStudent() { // 重置新增学生对话框
+          this.$refs.form.clearValidate();
+          this.form = {
+              userName: '',
+              account: '',
+              phone: '',
+              uniqueIdentification: '',
+              workNumber: '',
+              email: '',
+              classId: ""
+          };
+          this.$refs.classTree.setCheckedKeys([]);
+          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;
+      },
+      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}`);
+              util.successMsg(`本次上传有${res.data.failureNum}个错误信息录入`);
+
+              this.getClassTreeData('','1','')
+          } 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.initData();
+      }
     }
 };
 </script>
+
 <style lang="scss" scoped>
 .m-b-20 {
-    margin-bottom: 20px;
-}
-.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;
-    }
+  margin-bottom: 20px;
 }
-.el-input__inner{
-    height: 32px;
+.org-name {
+  margin-right: 20px;
 }
 </style>
\ No newline at end of file
diff --git a/src/views/system/staffSide.vue b/src/views/system/staffSide.vue
deleted file mode 100644
index c77057f..0000000
--- a/src/views/system/staffSide.vue
+++ /dev/null
@@ -1,387 +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">添加</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
-                            type="text"
-                            icon="el-icon-edit-outline"
-                            @click="() => handleEdit(node, data)">
-                        </el-button>
-                        <el-button
-                            v-if="node.level === 1"
-                            type="text"
-                            icon="el-icon-circle-plus-outline"
-                            @click="() => handleAdd(node, data)">
-                        </el-button>
-                        <el-button
-                            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 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 => {
-                            this.$message.success("编辑成功");
-                            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 => {
-                            this.$message.success("添加成功");
-                            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 => {
-                            this.$message.success("编辑成功");
-                            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 => {
-                            this.$message.success("添加成功");
-                            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 => {
-                    this.$message.success("删除成功")
-                    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 => {
-                    this.$message.success("删除成功")
-                    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>