zc

src/views/integratedManagement/personnelManage/studentInfo/addPage.vue

@@ -147,18 +147,6 @@
             />
           </el-form-item>
           <el-form-item label="导师：" prop="tutorUserId">
-            <!--<el-select-->
-            <!--:disabled="editType"-->
-            <!--v-model="form.tutorUserId"-->
-            <!--filterable-->
-            <!--placeholder="请选择导师">-->
-            <!--<el-option-->
-            <!--v-for="item in tutorUserOptions"-->
-            <!--:key="item.itemId"-->
-            <!--:label="item.label"-->
-            <!--:value="item.itemId">-->
-            <!--</el-option>-->
-            <!--</el-select>-->
             <el-select
               :disabled="editType"
               v-model="form.tutorUserId"
@@ -207,44 +195,14 @@
           <el-form-item label="来源：" prop="cardNum">
             <p style="line-height:40px;color:#999;width:250px;padding-left:40px;">{{form.source==1?'统一认证平台':'系统用户'}}</p>
           </el-form-item>
-          <!--<el-form-item label="人脸照片：" prop="status" v-if="editType">-->
-          <!--<div style="width:180px;" v-if="form.faceImg">-->
-          <!--<img :src="form.faceImg" style="width:140px;height:140px;">-->
-          <!--</div>-->
-          <!--<p v-if="!form.faceImg" style="line-height:40px;color:#999;width:180px;padding-left:40px;">未上传</p>-->
-          <!--</el-form-item>-->
-          <!--<el-form-item label="电子签名：" prop="status" v-if="editType">-->
-          <!--<div style="width:180px;" v-if="form.signature">-->
-          <!--<img :src="form.signature" style="width:140px;height:140px;">-->
-          <!--</div>-->
-          <!--<p v-if="!form.signature" style="line-height:40px;color:#999;width:180px;padding-left:40px;">未上传</p>-->
-          <!--</el-form-item>-->
         </div>
       </el-form>
     </div>
-    <el-dialog title="添加班级" :visible.sync="gradeOpen" width="600px" append-to-body class="teacher-revise-dialog-box" :close-on-click-modal="false">
-      <el-form :model="gradeForm" ref="gradeForm" :inline="true" :rules="rules" class="addCheckPage-min">
-        <el-form-item label="班级名称" prop="gradeName" label-width="110px" >
-          <el-input v-model="gradeForm.gradeName" clearable maxlength="20" style="width:420px;" placeholder="请输入班级名称"/>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer dialog-footer-box">
-        <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-info" @click="gradeOpenOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="gradeOpenUp">提交</p>
-        <p class="dialog-footer-button-null"></p>
-      </div>
-    </el-dialog>
   </div>
 </template>
 
 <script>
-import { listDepartments } from "@/apiDemo/system/dept";
-import { optionselect, noAuthOptionselect } from "@/apiDemo/system/user_teacher";
-import { getWorkList, getVague, addSystemClass, getMajorList,getTeacherOption,addUserStudent,putUserStudent } from "@/apiDemo/system/user_student";
 import { getToken } from "@/utils/auth";
-
-//V3新
 import { getDeptList,systemUserAdd,systemUserUpdate,getDeptDropList,
   systemUserSelect,systemUserMajorSelect,systemPostSelect } from "@/api/commonality/permission";
 import { getDicts } from "@/api/commonality/noPermission";
@@ -298,23 +256,8 @@ export default {
         ],
       },
       textType:false,
-      //数据范围列表
-      optionsDataList:[
-        {type: 0, value: "所有数据",},
-        {type: 1, value: "本部门及下级部门数据",},
-        {type: 2, value: "本部门及指定部门数据",},
-        {type: 3, value: "当前账号数据",},
-      ],
       //学院数据列表
       deptOptions:[],
-      //快捷权限列表
-      templateList:[{name:"校领导",id:"0"},{name:"教师",id:"1"},{name:"助教",id:"2"}],
-      templateKey:"",
-      templateName:"",
-      //权限勾选数据
-      permissionOpen:false,
-      permissionCheckData:{},
-      allCheckType:false,
       //身份列表
       positionOptions:[],
       //导师查询数据
@@ -322,18 +265,11 @@ export default {
       //专业查询数据
       majorOptions:[],
       //班级查询数据
-      gradeOptions:[
-        {id:9981,className:"+ 添加班级"}
-      ],
+      gradeOptions:[],
       //学生类别查询数据
       educationOptions:[],
       //学籍状态查询数据
       workStatusOptions:[{dictLabel:'在读',dictValue:true},{dictLabel:'结业',dictValue:false}],
-      //新增班级弹窗开关
-      gradeOpen:false,
-      gradeForm:{
-        gradeName:"",
-      },
       //角色列表
       roleOptionselectOptions:[],
     }
@@ -531,33 +467,12 @@ export default {
           this.$set(this.form,'major','');
           this.$set(this,'majorOptions',response.data);
           this.$set(this.form,'grade','');
-          // this.$set(this,'gradeOptions',[]);
         }else if(type == 2){
           this.$set(this.form,'grade','');
           this.$set(this,'gradeOptions',response.data);
         }
       });
     },
-    //新增班级关闭
-    gradeOpenOff(){
-      this.gradeOpen = false;
-    },
-    //新增班级提交
-    gradeOpenUp(){
-      this.$refs["gradeForm"].validate(valid => {
-        if (valid) {
-          let obj = {
-            className:this.gradeForm.gradeName,
-          }
-          addSystemClass(obj).then(response => {
-            this.gradeOptions.unshift({className:response.data.classObject.className,id:response.data.classObject.id});
-            this.form.grade = response.data.classObject.id;
-            this.gradeOpen = false;
-            this.msgSuccess(response.message);
-          });
-        }
-      });
-    },
     systemPostSelect(){
       systemPostSelect({}).then(response => {
         let list = [];

src/views/integratedManagement/personnelManage/studentInfo/bindingCardPage.vue

@@ -33,8 +33,6 @@
 </template>
 
 <script>
-  import { studentBatchSelect, studentUpdateCardNum } from "@/apiDemo/system/user_student";
-  //V3新
   import { systemUserSelect } from "@/api/commonality/permission";
   import { systemUserBatchBindCard } from "@/api/integratedManagement/index";
   export default {

src/views/integratedManagement/personnelManage/studentInfo/index.vue

@@ -155,19 +155,9 @@
 </template>
 
 <script>
-import { Message } from 'element-ui'
-import { listDepartments } from "@/apiDemo/system/dept";
-import { getAuthRole, updateAuthRole, resetUserPwd } from "@/apiDemo/system/user";
-import { listUser, getUser, delUser, addUser, updateUser, changeUserStatus,getListAll, putUserTeacher,putUserResetPwd,delUserInfo,getStudentInfo } from "@/apiDemo/system/user_student";
-import { optionUser } from "@/apiDemo/system/user_teacher";
-import { treeselect } from "@/apiDemo/system/dept";
-import {listMajorAll} from "@/apiDemo/system/major";
-
-import { getToken } from "@/utils/auth";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 import addPage from "./addPage.vue"
 import bindingCardPage from "./bindingCardPage.vue"
-//V3新
 import { systemUserList,systemUserEditState,systemUserResetPasswd,
   systemUserDelete,systemUserDetail,getDeptDropList  } from "@/api/commonality/permission";
 import { getDicts } from "@/api/commonality/noPermission";
@@ -202,12 +192,6 @@ export default {
       },
       tableButtonType:this.hasPermiDom(['system:user:detail','system:user:edit','system:user:del','system:user:reset',]),
       tableDropdownType:this.hasPermiDom(['system:user:edit','system:user:del','system:user:reset',]),
-      uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/student/importData", // 上传地址
-      headers: {
-        Authorization: "Bearer " + getToken(),
-      },
-      //专业列表
-      majorList:[],
       // 遮罩层
       loading: false,
       // 选中数组
@@ -224,8 +208,6 @@ export default {
       userList: [],
       // 弹出层标题
       title: "",
-      // 部门树选项
-      deptOptions: undefined,
       //专业列表
       professionOptions:[
         {
@@ -239,35 +221,8 @@ export default {
       ],
       //学院列表
       collegeOptions:[],
-      // 是否显示弹出层
-      open: false,
       // 部门名称
       deptName: undefined,
-      // 岗位选项
-      postOptions: [],
-      // 角色选项
-      roleOptions: [],
-      // 表单参数
-      form: {},
-      defaultProps: {
-        children: "children",
-        label: "label"
-      },
-      // 用户导入参数
-      upload: {
-        // 是否显示弹出层（用户导入）
-        open: false,
-        // 弹出层标题（用户导入）
-        title: "",
-        // 是否禁用上传
-        isUploading: false,
-        // 是否更新已经存在的用户数据
-        updateSupport: 0,
-        // 设置上传的请求头部
-        headers: { Authorization: "Bearer " + getToken() },
-        // 上传的地址
-        url: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/importData"
-      },
       // 查询参数
       queryParams: {
         page: 1,
@@ -278,16 +233,6 @@ export default {
         cardNumSimple: "",
         userType:2,
       },
-      // 列信息
-      columns: [
-        { key: 0, label: `用户编号`, visible: true },
-        { key: 1, label: `用户名称`, visible: true },
-        { key: 2, label: `用户昵称`, visible: true },
-        { key: 3, label: `部门`, visible: true },
-        { key: 4, label: `手机号码`, visible: true },
-        { key: 5, label: `状态`, visible: true },
-        { key: 6, label: `创建时间`, visible: true }
-      ],
       //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
       selectedNum:0,
       //页面选项
@@ -297,35 +242,8 @@ export default {
       propsData:{},
       //弹窗状态
       shadeType:1,
-      // 教师列表
-      teacherList: [],
-      //学院列表
-      deptList:[],
       //类别列表
       educationOptions:[],
-      // 新增学生开关
-      addStudentType:false,
-      addTitle:"",
-      addForm:{
-          tutorUserName:"",
-          tmpTutorUserId:"",
-      },
-      subForm:{
-          tutorUserName:""
-      },
-      //导入弹层开关
-      importOpen:false,
-      //导入数据
-      upImportData:{
-        sysUserEnable:true,
-        upDate:false,
-      },
-      getImportData:{
-        downFile:false,
-        successNum:0,
-        failureNum:0,
-        textName:"",
-      },
       //重置密码id
       reviseOpen:false,
       userId:"",
@@ -341,9 +259,6 @@ export default {
   created() {
     this.getList();
     this.getAll();
-    // this.getListAll();
-    // this.getDicts("sys_user_sex").then(response => {});
-    // this.getConfigKey("sys.user.initPassword").then(response => {});
   },
   methods: {
     //批量绑卡页面跳转与数量检测
@@ -442,7 +357,6 @@ export default {
         }).catch(() => {});
       }else if(item.command == 3){
         if(item.row.source == 1){
-          this.reset();
           this.title = "重置密码";
           this.userId = item.row.userId;
           this.reviseOpen = true;
@@ -471,30 +385,6 @@ export default {
         }
       );
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        userId: undefined,
-        deptId: undefined,
-        userName: undefined,
-        nickName: undefined,
-        password: undefined,
-        newPassword: undefined,
-        phonenumber: undefined,
-        email: undefined,
-        sex: undefined,
-        status: "0",
-        remark: undefined,
-        postIds: [],
-        roleIds: []
-      };
-      this.resetForm("form");
-    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.pageType = 1;

src/views/integratedManagement/personnelManage/teacherInfo/addPage.vue

@@ -157,15 +157,8 @@
 </template>
 
 <script>
-import { listMenuAll} from "@/apiDemo/system/menu";
-import { getToken } from "@/utils/auth";
-import { treeselect } from "@/apiDemo/system/dept";
-import { optionselect, noAuthOptionselect, getVaguet, userPermit } from "@/apiDemo/system/user_teacher";
-import { getPermitOptionList, getPermitInfo } from "@/apiDemo/laboratory/managePermissionTemplates";
-import { addSystemPermit } from "@/apiDemo/laboratory/managePermissionTemplates";
 import Treeselect from "@riophae/vue-treeselect";
-
-//V3新
+import { getToken } from "@/utils/auth";
 import { getDeptList,systemUserAdd,systemUserUpdate,systemPostSelect } from "@/api/commonality/permission";
 import { getDicts } from "@/api/commonality/noPermission";
 
@@ -185,9 +178,6 @@ export default {
       headers: {
         Authorization: getToken(),
       },
-      menuList:[],
-      menuListData:[],
-      originalMenuList:[],
       form:{
         avatar:"",     //头像
         userName:"",     //姓名
@@ -217,43 +207,8 @@ export default {
           { required: true, message: "请输入手机号码", validator: this.spaceJudgment, trigger: "blur" }
         ],
       },
-      textType:false,
-      //数据范围列表
-      optionsDataListOne:[
-        {type: 1, value: "所有数据",},
-        {type: 2, value: "本部门及下级部门数据",},
-        {type: 3, value: "本部门及指定部门数据",},
-      ],
-      optionsDataList:[
-        {type: 1, value: "所有数据",},
-        {type: 2, value: "本部门及下级部门数据",},
-        {type: 3, value: "本部门及指定部门数据",},
-        {type: 4, value: "当前账号数据",},
-      ],
-      //数据范围部门弹窗
-      deptOpen:false,
-      deptOpenType:'',
       //部门数据结构树
       treeselectList:[],
-      //指定部门数据
-      deptForm:{
-        deptIds:[],
-        maxIndex:"",
-        bigIndex:"",
-        minIndex:"",
-        dataScope:"",
-      },
-      //快捷权限列表
-      templateList:[],
-      templateKey:"",
-      templateName:"",
-      //权限勾选数据
-      permissionOpen:false,
-      permissionCheckData:{},
-      allCheckType:false,
-      maxIndex:'',
-      bigIndex:'',
-      minIndex:'',
       //身份列表
       positionOptions:[],
       //部门列表
@@ -262,15 +217,6 @@ export default {
       categoryOptions:[],
       //文化列表
       educationOptions:[],
-      //另存
-      saveOpen:false,
-      saveForm:{
-        name:"",
-        type:0,
-        text:"",
-      },
-      //角色列表
-      roleOptionselectOptions:[],
     }
   },
   created(){
@@ -440,33 +386,6 @@ export default {
         this.$set(this,'positionOptions',list)
       });
     },
-    //查询身份
-    positionSelect(query){
-      if (query !== '') {
-        let obj = {
-          postName:query,
-        };
-        optionselect(obj).then(response => {
-          let list = [];
-          for(let i=0;i<response.data.length;i++){
-            if(response.data[i].roleIds){
-              list.push(response.data[i]);
-            }
-          }
-          this.$set(this,'positionOptions',list)
-        });
-      } else {
-        optionselect({postName:""}).then(response => {
-          let list = [];
-          for(let i=0;i<response.data.length;i++){
-            if(response.data[i].roleIds){
-              list.push(response.data[i]);
-            }
-          }
-          this.$set(this,'positionOptions',list)
-        });
-      }
-    },
     positionSelectClick(data){
       //选中
       let self = this;

src/views/integratedManagement/personnelManage/teacherInfo/bindingCardPage.vue

@@ -33,8 +33,6 @@
 </template>
 
 <script>
-  import { teacherBatchSelect, teacherUpdateCardNum } from "@/apiDemo/system/user_teacher";
-  //V3新
   import { systemUserSelect } from "@/api/commonality/permission";
   import { systemUserBatchBindCard } from "@/api/integratedManagement/index";
   export default {

src/views/integratedManagement/personnelManage/teacherInfo/index.vue

@@ -14,7 +14,6 @@
               @clear="getDeptOrganizeStructure"
               size="small"
             />
-            <!--@clear="getTreeselect"-->
             <p class="button-right page-submit-common-style-button" @click="getDeptOrganizeStructure">搜索</p>
           </div>
           <div class="bottom-button-max-box scrollbar-box">
@@ -207,103 +206,15 @@
         <p class="dialog-footer-button-null"></p>
       </div>
     </el-dialog>
-    <!--编辑--组织架构-->
-    <el-dialog title="修改部门" v-if="treeOpen" :visible.sync="treeOpen" width="600px" append-to-body class="teacher-tree-dialog-box">
-      <el-form :model="treeForm" class="teacher-tree-dialog-form-box" ref="treeForm" :rules="rules" v-show="showSearch">
-        <el-form-item label="上级部门" prop="parentId" label-width="90px" v-if="treeForm.parentId != 0">
-          <treeselect v-model="treeForm.parentId" :options="deptOptionsOne"
-                      :normalizer="normalizer" :show-count="true" @select="deptSelect" placeholder="请选择上级部门" />
-        </el-form-item>
-        <el-form-item label="部门编号" prop="deptNum" label-width="90px" v-if="treeForm.parentId != 0">
-          <el-input v-model="treeForm.deptNum" maxlength="15"
-                    onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" placeholder="请输入部门编号"/>
-        </el-form-item>
-        <el-form-item label="部门名称" prop="deptName" label-width="90px">
-          <el-input v-model="treeForm.deptName" maxlength="15" placeholder="请输入部门名称"/>
-        </el-form-item>
-        <el-form-item label="状态" prop="state" label-width="90px" v-if="treeForm.parentId != 0">
-          <el-radio-group v-model="treeForm.state">
-            <el-radio :label="true">启用</el-radio>
-            <el-radio :label="false">禁用</el-radio>
-          </el-radio-group>
-        </el-form-item>
-        <el-form-item  v-if="treeForm.parentId != 0 && deptLevel == 1"
-          label="部门类型" prop="deptType" label-width="90px">
-          <el-radio-group v-model="treeForm.deptType" style="margin:4px 0 0 10px;">
-            <el-radio :label="1">学院</el-radio>
-            <el-radio :label="0">非学院</el-radio>
-          </el-radio-group>
-        </el-form-item>
-      </el-form>
-      <div slot="footer" class="dialog-footer dialog-footer-box">
-        <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-info" @click="treeOpenOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="editDeptButton">提交</p>
-        <p class="dialog-footer-button-null"></p>
-      </div>
-    </el-dialog>
-    <!--新增--组织架构-->
-    <el-dialog title="新增部门" v-if="treeAddOpen" :visible.sync="treeAddOpen" width="600px" append-to-body class="teacher-tree-dialog-box">
-      <el-form :model="treeAddForm" class="teacher-tree-dialog-form-box" ref="treeAddForm" :rules="rules" v-show="showSearch">
-        <el-form-item label="上级部门" prop="id" label-width="110px">
-          <treeselect style="width:402px;" v-model="treeAddForm.id" :options="deptOptions" :show-count="true"
-                      :normalizer="normalizer" @select="deptAddSelect" placeholder="请选择上级部门"/>
-        </el-form-item>
-        <div class="scrollbar-box" style="max-height:456px">
-          <div style="display:flex;border:1px solid #d8d8d8;border-radius:6px;margin:0 20px 20px;padding-top:20px;position: relative"
-               v-for="(item,index) in treeAddForm.teaCherDpetList" :key="index">
-            <div style="width:490px;">
-              <el-form-item label="部门编号" :prop="'teaCherDpetList.' + index + '.deptNum'" :rules="rules.deptNum" label-width="90px">
-                <el-input v-model="item.deptNum" onkeyup="this.value=this.value.replace(/[^\d.]/g,'')" maxlength="15" placeholder="请输入部门编号"/>
-              </el-form-item>
-              <el-form-item label="部门名称" :prop="'teaCherDpetList.' + index + '.deptName'" :rules="rules.deptName" label-width="90px">
-                <el-input v-model="item.deptName" maxlength="15" placeholder="请输入部门名称"/>
-              </el-form-item>
-              <el-form-item label="状态" :prop="'teaCherDpetList.' + index + '.state'" :rules="rules.state" label-width="90px">
-                <el-radio-group v-model="item.state">
-                  <el-radio :label="true">启用</el-radio>
-                  <el-radio :label="false">禁用</el-radio>
-                </el-radio-group>
-              </el-form-item>
-              <el-form-item v-if="deptLevel == 1"
-                label="部门类型" :prop="'teaCherDpetList.' + index + '.deptType'" :rules="rules.deptType" label-width="90px">
-                <el-radio-group v-model="item.deptType" style="margin:4px 0 0 10px;">
-                  <el-radio :label="1">学院</el-radio>
-                  <el-radio :label="0">非学院</el-radio>
-                </el-radio-group>
-              </el-form-item>
-            </div>
-          </div>
-        </div>
-      </el-form>
-      <div slot="footer" class="dialog-footer dialog-footer-box">
-        <p class="dialog-footer-button-null"></p>
-        <p class="dialog-footer-button-info" @click="treeAddOpenOff">取消</p>
-        <p class="dialog-footer-button-primary" @click="addDeptButton">提交</p>
-        <p class="dialog-footer-button-null"></p>
-      </div>
-    </el-dialog>
-    <user-list ref="userOpen"></user-list>
   </div>
 </template>
 
 <script>
-  import { getAuthRole, updateAuthRole, resetUserPwd } from "@/apiDemo/system/user";
-  import { allListPost } from "@/apiDemo/system/post";
-  import { listDepartments } from "@/apiDemo/system/dept";
-  import { setSubjectAdmin,getSubjectList,getNoAdminSubjectList,getNoAdminSubjectListNopage } from "@/apiDemo/laboratory/subject";
-  import { listUser, delUser, addUser, updateUser, changeUserStatus,putUserTeacher,delTeacher,
-           teacherResetPwd,addDeptByTeacher,putDeptByTeacher,updateDeptName,editDeptOrder,delDept,
-           editUserByDept,getTeacherInfo,editNatureLinkage,treeselect } from "@/apiDemo/system/user_teacher";
-  import { getUser } from "@/apiDemo/system/user_student";
   import { getToken } from "@/utils/auth";
   import Treeselect from "@riophae/vue-treeselect";
   import "@riophae/vue-treeselect/dist/vue-treeselect.css";
-  import { Message } from 'element-ui'
-  import userList from "./userList.vue"
   import addPage from "./addPage.vue"
   import bindingCardPage from "./bindingCardPage.vue"
-  //V3新
   import { setDeptAdd,setDeptUpdate,setDeptDelete,setDeptSort,getDeptOrganizeStructure,
     systemUserList,systemUserEditState,systemUserResetPasswd,systemUserDelete,
     systemUserDetail,} from "@/api/commonality/permission";
@@ -314,7 +225,6 @@
     name: "User",
     components: {
       Treeselect,
-      userList,
       addPage,
       bindingCardPage,
       exportComponent,
@@ -365,10 +275,6 @@
         /*============V3结束*/
         tableButtonType:this.hasPermiDom(['system:user:detail','system:user:edit','system:user:del','system:user:reset']),
         tableDropdownType:this.hasPermiDom(['system:user:edit','system:user:del','system:user:reset']),
-        uploadImgUrl: window.location.href.split('://')[0]+'://' + this.judgmentNetworkReturnAddress() + "/system/user/teacher/importData", // 上传地址
-        headers: {
-          Authorization: "Bearer " + getToken(),
-        },
         // 遮罩层
         loading: true,
         // 选中数组
@@ -394,31 +300,6 @@
         initPassword: undefined,
         // 日期范围
         dateRange: [],
-        // 职称字典
-        professional: [],
-        // 是否是检查者
-        userTypeList:[
-          {
-            id:0,
-            name:"否",
-          },
-          {
-            id:1,
-            name:"是",
-          },
-        ],
-        // 性别状态字典
-        sexOptions: [],
-        // 岗位选项
-        postOptions: [],
-        // 角色选项
-        roleOptions: [],
-        // 学院选项
-        facultyOptions: [],
-        // 实验室选项
-        laboratoryOptions: [],
-        // 表单参数
-        form: {},
         // 查询参数
         queryParams: {
           page: 1,
@@ -429,57 +310,6 @@
           cardNumSimple: "",
           userType:1,
         },
-        // 列信息
-        columns: [
-          { key: 0, label: `用户编号`, visible: true },
-          { key: 1, label: `用户名称`, visible: true },
-          { key: 2, label: `用户昵称`, visible: true },
-          { key: 3, label: `部门`, visible: true },
-          { key: 4, label: `手机号码`, visible: true },
-          { key: 5, label: `状态`, visible: true },
-          { key: 6, label: `创建时间`, visible: true }
-        ],
-        addRules:{
-          userName: [
-            { required: true, message: "请输入学号", trigger: "blur" },
-            { required: true, message: "请输入学号", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          nickName: [
-            { required: true, message: "请输入姓名", trigger: "blur" },
-            { required: true, message: "请输入姓名", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          deptId: [
-            { required: true, message: "请选择学院", trigger: "blur" }
-          ],
-          sex: [
-            { required: true, message: "请选择性别", trigger: "blur" }
-          ],
-        },
-        // 表单校验
-        rules: {
-          parentId: [
-            { required: true, message: "请选择上级部门", trigger: "blur" }
-          ],
-          id: [
-            { required: true, message: "请选择上级部门", trigger: "blur" }
-          ],
-          deptNum: [
-            { required: true, message: "请输入部门编号", trigger: "blur" },
-            { required: true, message: "请输入部门编号", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          deptName: [
-            { required: true, message: "请输入部门名称", trigger: "blur" },
-            { required: true, message: "请输入部门名称", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          state: [
-            { required: true, message: "请选择状态", trigger: "blur" },
-            { required: true, message: "请选择状态", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-          deptType: [
-            { required: true, message: "请选择部门类型", trigger: "blur" },
-            { required: true, message: "请选择部门类型", validator: this.spaceJudgment, trigger: "blur" }
-          ],
-        },
         //表格扩展选择器---需要在@selection-change绑定的方法内监控selection数组长度
         selectedNum:0,
         //页面状态
@@ -487,10 +317,6 @@
         editType:false,
         //组件传参数据
         propsData:{},
-        //危险源数据
-        laboratoryList:[],
-        //学院列表
-        deptList:[],
         // 工作性质字典
         workClass:[
           {
@@ -513,19 +339,6 @@
             postId:"1",
           },
         ],
-        //文化程度
-        educationList:[],
-        // 新增学生开关
-        addStudentType:false,
-        addTitle:"",
-        addForm:{},
-        //导入弹层开关
-        importOpen:false,
-        //导入数据
-        upImportData:{
-          sysUserEnable:true,
-          upDate:false,
-        },
         getImportData:{
           downFile:false,
           successNum:0,
@@ -595,198 +408,6 @@
         this.$refs['table-box'].clearSelection()
         this.getList();
       },
-      //编辑部门关闭
-      treeOpenOff(){
-        this.treeOpen = false;
-      },
-      //编辑部门提交
-      editDeptButton(){
-        let self = this;
-        this.$refs["treeForm"].validate(valid => {
-          if (valid) {
-            let obj = {
-              deptId:this.treeForm.id,
-              parentId:this.treeForm.parentId,
-              deptNum:this.treeForm.deptNum,
-              deptName:this.treeForm.deptName,
-              state:this.treeForm.state,
-              deptType:this.deptLevel == 1?this.treeForm.deptType:0,
-            };
-            setDeptUpdate(obj).then(response => {
-              this.treeOpen = false;
-              this.delTreeForm();
-              this.msgSuccess(response.message)
-              this.getDeptOrganizeStructure();
-              this.$set(this,'treeForm',{});
-              this.$set(this,'treeAddForm',{});
-            });
-          }
-        });
-      },
-      //新增部门提交
-      addDeptButton(){
-        let self = this;
-        this.$refs["treeAddForm"].validate(valid => {
-          if (valid) {
-            let newObj = {
-              teaCherDpetList:[]
-            }
-            for(let i=0;i<self.treeAddForm.teaCherDpetList.length;i++){
-              let obj = {
-                parentId:this.treeAddForm.id,
-                deptNum:this.treeAddForm.teaCherDpetList[i].deptNum,
-                deptName:this.treeAddForm.teaCherDpetList[i].deptName,
-                state:this.treeAddForm.teaCherDpetList[i].state,
-                deptType:this.deptLevel == 1?this.treeAddForm.teaCherDpetList[i].deptType:0,
-              }
-              newObj.teaCherDpetList.push(obj);
-            }
-            setDeptAdd(newObj.teaCherDpetList[0]).then(response => {
-              this.treeAddOpen = false;
-              this.msgSuccess(response.message)
-              this.getDeptOrganizeStructure();
-              this.$set(this,'treeForm',{});
-              this.$set(this,'treeAddForm',{});
-            });
-          }
-        });
-      },
-      //关闭新增页面
-      treeAddOpenOff(){
-        this.treeAddOpen = false;
-      },
-      //新增节点选择部门
-      deptAddSelect(item){
-        this.$set(this.treeAddForm,'parentId',item.id);
-        this.$set(this,'deptLevel',item.level);
-      },
-      //编辑节点选择部门
-      deptSelect(item){
-        this.$set(this.treeForm,'parentId',item.id);
-        this.$set(this,'deptLevel',item.level);
-      },
-      // 组织树操作
-      treeButtonClick(type){
-        let self = this;
-        if(type == 1){
-          if(!this.queryParams.deptId){
-            this.msgError("请先选择部门")
-            return
-          }
-          //新增部门
-          let obj = {
-            id:this.treeForm.id?this.treeForm.id:'',
-            parentId:this.treeForm.id?this.treeForm.parentId:'',
-            relation:"",
-            teaCherDpetList:[
-              {deptNum:"",deptName:""}
-            ]
-          }
-          this.$set(this,'treeAddForm',obj);
-          this.treeAddOpen = true;
-        }else {
-          if(!this.queryParams.deptId){
-            this.msgError("请先选择部门")
-            return
-          }
-          if(type == 2){
-            //部门上移动
-            if(!this.moveDept(this.treeForm.id,this.deptOptions,'1')){
-              this.msgError('当前部门位置,无法继续向上移动')
-              return
-            }
-            let obj = {
-              deptId:this.treeForm.id,
-              move:'1',
-            }
-            setDeptSort(obj).then(response => {
-              this.delTreeForm();
-              this.msgSuccess(response.message)
-              this.getDeptOrganizeStructure();
-            });
-          }else if(type == 3){
-            //部门下移动
-            if(!this.moveDept(this.treeForm.id,this.deptOptions,'-1')){
-              this.msgError('当前部门位置,无法继续向下移动')
-              return
-            }
-            let obj = {
-              deptId:this.treeForm.id,
-              move:'-1',
-            }
-            setDeptSort(obj).then(response => {
-              this.delTreeForm();
-              this.msgSuccess(response.message)
-              this.getDeptOrganizeStructure();
-            });
-          }else if(type == 4){
-            //部门编辑
-            this.$set(this,'treeForm',JSON.parse(JSON.stringify(this.treeFormOne)));
-            this.$set(this,'deptLevel',this.deptLevel==2?1:this.deptLevel);
-            let list = this.handleTreeList(this.treeFormOne.id,JSON.parse(JSON.stringify(this.deptOptions)));
-            this.$set(this,'deptOptionsOne',list);
-            this.treeOpen = true;
-          }else if(type == 5){
-            //部门添加人员
-            this.$refs.userOpen.show();
-          }else if(type == 6){
-            //部门删除
-            this.$confirm('确认要删除吗?', "警告", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
-              type: "warning"
-            }).then(() => {
-              //  确定
-              setDeptDelete({deptId:self.treeForm.id}).then(response => {
-                self.delTreeForm();
-                self.msgSuccess(response.message)
-                self.getDeptOrganizeStructure();
-              });
-            }).catch(function() {});
-          }
-        }
-      },
-      delTreeForm(){
-        this.queryParams.deptId = "";
-        this.treeForm = {
-          id:"",
-          parentId:null,
-          deptName:"",
-          relation:"",
-        }
-      },
-      //移动部门判定
-      moveDept(deptId,list,status){
-        let self = this;
-        for(let i=0;i<list.length;i++){
-          if(deptId == list[i].deptId){
-            if(status == '1'){
-              //向上移动
-              return i != 0;
-            }else if(status == '-1'){
-              // 向下移动
-              return i != list.length - 1;
-            }
-          }else if(list[i].child){
-            let type = self.moveDept(deptId,list[i].child,status);
-            if(type != undefined){
-              return type
-            }
-          }
-        }
-      },
-      // 编辑时上级部门数组处理(剔除自身部门)
-      handleTreeList(deptId,list){
-        let self = this;
-        for(let i=0;i<list.length;i++){
-          if(deptId == list[i].deptId){
-            list.splice(i,1);
-          }else if(list[i].child){
-            self.handleTreeList(deptId,list[i].child);
-          }
-        }
-        return list
-      },
       /** 查询用户列表 */
       getList() {
         this.loading = true;
@@ -837,24 +458,6 @@
         }
         this.pageType = 3;
       },
-      //人员添加接口
-      takeUserData(ids,idsData){
-        let list = [];
-        for(let i=0;i<ids.length;i++){
-          let obj = {
-            userId:ids[i],
-            deptId:this.queryParams.deptId
-          }
-          list.push(obj);
-        }
-        editUserByDept(list).then(response => {
-          this.msgSuccess(response.message)
-          this.$refs.userOpen.show();
-          this.getList();
-          this.getTreeselect();
-          this.delTreeForm();
-        });
-      },
       //操作在职开关
       userStateChange(row){
         let text = row.state === "0" ? "启用" : "停用";
@@ -870,31 +473,6 @@
         }).catch(function() {
         });
       },
-      //****************************************导入功能**************************************
-      handleAvatarSuccess(res, file) {
-        if(res.code == 200){
-          this.getImportData.downFile = res.data.downFile
-          this.getImportData.successNum = res.data.successNum
-          this.getImportData.failureNum = res.data.failureNum
-          // this.importOpen = false;
-          // this.getList();
-        }else{
-          this.msgError(res.message);
-        }
-        this.loading = false;
-      },
-      beforeAvatarUpload(file) {
-        let type = false;
-        if (file.type == 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet' || file.type == 'application/vnd.ms-excel') {
-          this.getImportData.textName = file.name;
-          type = true;
-          this.loading = true;
-        }else{
-          this.$message.error('只能上传xls/xlsx格式文件');
-          type = false;
-        }
-        return type;
-      },
       outPage(){
         this.pageType = 1;
         this.getList();
@@ -940,7 +518,6 @@
         }else if(item.command == 3){
           if(item.row.source == 1){
             this.userId = item.row.userId;
-            this.reset();
             this.title = "重置密码";
             this.reviseOpen = true;
           }else{
@@ -959,38 +536,6 @@
         return row.userId
       },
       //=========表格扩展选择器方法---结束=========
-      /** 查询部门下拉树结构 */
-      getTreeselect() {
-        let obj = {
-          deptName:this.inputDeptName,
-        }
-        treeselect(obj).then(response => {
-          this.deptOptions = response.data;
-        });
-      },
-      // 取消按钮
-      cancel() {
-        this.open = false;
-        // this.reset();
-      },
-      // 表单重置
-      reset() {
-        this.form = {
-          userId: undefined,
-          deptId: undefined,
-          userName: undefined,
-          nickName: undefined,
-          password: undefined,
-          phonenumber: undefined,
-          email: undefined,
-          sex: undefined,
-          status: "0",
-          remark: undefined,
-          postIds: [],
-          roleIds: []
-        };
-        this.resetForm("form");
-      },
       /** 搜索按钮操作 */
       handleQuery() {
         this.pageType = 1;

src/views/integratedManagement/personnelManage/teacherInfo/userList.vue

@@ -1,263 +0,0 @@
-<!--分级管控/人员列表-->
-<template>
-  <div class="userList" v-if="userOpen">
-    <el-dialog title="添加部门人员" :visible.sync="userOpen" width="1500px" append-to-body>
-      <div class="gradeManage-userList" style="height:626px;display: flex;flex-direction: column">
-        <el-form :model="queryParams" ref="queryForm" :inline="true" v-show="showSearch">
-          <el-form-item label="关键字" prop="searchValue" label-width="80px">
-            <el-input
-              style="width:160px;"
-              maxlength="10"
-              v-model="queryParams.searchValue"
-              placeholder="请输入关键字"
-              clearable
-              size="small"
-            />
-          </el-form-item>
-          <el-form-item label="在职状态" prop="nature" label-width="80px">
-            <el-select
-              v-model="queryParams.nature"
-              placeholder="请选择"
-              clearable
-              style="width:160px;"
-            >
-              <el-option
-                key="0"
-                label="在职"
-                value="0"/>
-              <el-option
-                key="1"
-                label="离职"
-                value="1"/>
-            </el-select>
-          </el-form-item>
-          <el-form-item label="学院" prop="deptId" label-width="80px">
-            <el-cascader
-              :show-all-levels="false"
-              v-model="queryParams.deptId"
-              :options="deptOptions"
-              :props="{ checkStrictly: true, value: 'id', label: 'label',emitPath:false  }"></el-cascader>
-          </el-form-item>
-          <el-form-item>
-            <p class="inquire-button-one" @click="handleQuery">查询</p>
-            <p class="reset-button-one" @click="resetQuery">重置</p>
-          </el-form-item>
-        </el-form>
-        <el-table v-loading="loading" border border :data="userList" @selection-change="handleSelectionChange" ref="multipleTable" :row-key="getRowKeys">
-          <el-table-column type="selection" width="55" :reserve-selection="true" align="center" />
-          <el-table-column label="序号"  width="50" align="center"  type="index"/>
-          <el-table-column label="姓名" align="left" prop="nickName" />
-          <el-table-column label="工号" align="left" prop="userName" />
-          <el-table-column label="部门" align="left" prop="deptName" />
-          <el-table-column label="职位" align="left" prop="positionName" />
-          <el-table-column label="账号状态" align="left" prop="status">
-            <template slot-scope="scope">
-              <span :class="scope.row.status == 0?'color_14AE10':'color_FF4E00'">{{scope.row.status == 0?"已启用":"已停用"}}</span>
-            </template>
-          </el-table-column>
-        </el-table>
-        <div style="display: flex;width:1460px;margin-top:7px;">
-          <!--<p style="flex:4;"></p>-->
-          <p style="text-align: left;margin:0;line-height:32px;margin-right:20px;color:#999;">
-            <i class="el-icon-warning" style="color:#0183FA;"></i>
-            已选择 {{selectedNum}} 项
-          </p>
-          <div style="flex:5;">
-            <pagination :page-sizes="[20, 30, 40, 50]"
-              v-show="total>0"
-              :total="total"
-              style="margin:0;"
-              :page.sync="queryParams.pageNum"
-              :limit.sync="queryParams.pageSize"
-              @pagination="getList"
-            />
-          </div>
-        </div>
-        <div slot="footer" class="dialog-footer dialog-footer-box">
-          <p class="dialog-footer-button-null"></p>
-          <p class="dialog-footer-button-info" @click="show(2)">取消</p>
-          <p class="dialog-footer-button-primary" @click="okButton">提交</p>
-          <p class="dialog-footer-button-null"></p>
-        </div>
-      </div>
-    </el-dialog>
-  </div>
-</template>
-
-<script>
-  import { listDepartments } from "@/apiDemo/system/dept";
-  import { optionselect } from "@/apiDemo/laboratory/gradeManage";
-  import { listUser } from "@/apiDemo/system/user_teacher";
-  import { listClassifiedAll } from "@/apiDemo/laboratory/classified";
-  import { listClasstypeAll } from "@/apiDemo/laboratory/classtype";
-  import { treeselect } from "@/apiDemo/system/dept";
-  export default {
-    name: "userList",
-    props:{
-
-    },
-    data() {
-      return {
-        userOpen:false,
-        loading:false,
-        // 显示搜索条件
-        showSearch: true,
-        // 总条数
-        total: 0,
-        queryParams:{
-          pageNum:1,
-          pageSize:20,
-          searchValue:null,
-          nature:null,
-          deptId:null,
-        },
-        userList:[],
-        //已选中数量
-        selectedNum:0,
-        //已选中
-        ids:[],
-        idData:[],
-        // 非单个禁用
-        single: true,
-        // 非多个禁用
-        multiple: true,
-        //分类数据
-        typeList:[],
-        //分级数据
-        levelList:[],
-        //状态列表
-        workClass:[],
-        // 部门树选项
-        deptOptions: [],
-      }
-    },
-    created(){
-    },
-    mounted(){
-      // this.getDicts("work_class").then(response => {
-      //   this.workClass = response.data;
-      // });
-      // this.getListClassifiedAll();
-      // this.listDepartments();
-      // this.optionselect();
-      // this.getList();
-      // this.getTreeselect();
-    },
-    methods:{
-      deptAddSelect(){},
-      /** 查询部门下拉树结构 */
-      getTreeselect() {
-        treeselect().then(response => {
-          this.deptOptions = response.data;
-        });
-      },
-      //确定按钮
-      okButton(){
-        if(!this.ids[0]){
-          this.msgError("请勾选人员")
-          return
-        }
-        this.$parent.takeUserData(this.ids,this.idData);
-      },
-      show(data){
-        this.queryParams = {
-          pageNum:1,
-          pageSize:20,
-          searchValue:null,
-          nature:null,
-          deptId:null,
-        };
-        this.getList();
-        let self = this;
-        this.userOpen = !this.userOpen;
-        if(data){
-          this.queryParams.pageNum = 1;
-          setTimeout(function(){
-            for(let i=0;i<data.length;i++){
-              self.$refs.multipleTable.toggleRowSelection(data[i],true)
-            }
-            self.getList();
-          },100);
-        }
-      },
-      //获取学院
-      listDepartments(){
-        listDepartments().then(response => {
-          this.deptList = response.data;
-        });
-      },
-      //获取身份
-      optionselect(){
-        optionselect().then(response => {
-          this.typeList = response.data;
-        });
-      },
-      //获取数据列表
-      getList(){
-        this.loading = true;
-        listUser(this.queryParams).then(response => {
-          this.userList = response.rows;
-          this.total = response.total;
-          this.loading = false;
-        });
-      },
-      /** 搜索按钮操作 */
-      handleQuery() {
-        this.queryParams.pageNum = 1;
-        this.getList();
-      },
-      /** 重置按钮操作 */
-      resetQuery() {
-        this.resetForm("queryForm");
-        this.handleQuery();
-      },
-      /*===记录勾选数据===
-        需要再el-table 添加  :row-key="getRowKeys"
-        需要在selection 添加 :reserve-selection="true"
-      */
-      getRowKeys(row) {
-        return row.userId
-      },
-      //选择本页
-      selectPage(){
-        this.$refs.multipleTable.toggleAllSelection()
-      },
-      //清除选择
-      clearSelection(){
-        this.$refs.multipleTable.clearSelection()
-      },
-      // 多选框选中数据
-      handleSelectionChange(selection) {
-        this.selectedNum = selection.length;
-        this.ids = selection.map(item => item.userId);
-        this.idData = selection.map(item => item);
-        this.single = selection.length!==1
-        this.multiple = !selection.length
-      },
-      //查询安全分级
-      getListClassifiedAll(){
-        listClassifiedAll().then(response=>{
-          if(response.code==200){
-            this.levelList=response.data
-          }
-        })
-      },
-      //查询安全分类
-      getListClasstypeAll(){
-        listClasstypeAll().then(response=>{
-          if(response.code==200){
-            this.typeList=response.data;
-          }
-        });
-      },
-    }
-  }
-</script>
-
-<style lang="scss" scoped>
-  .userList{
-    height:700px;
-    display: flex!important;
-    flex-direction: column;
-  }
-</style>