修改教师管理

src/components/TeacherRegister.vue

@@ -0,0 +1,551 @@
+<template>
+  <div>
+    <!---lxh-修改密码-->
+    <div class="dig_update">
+      <el-dialog
+        :visible.sync="dialogVisible"
+        :close-on-click-modal="false"
+        width="40%"
+        style="border-radius: 40px"
+        top="15vh"
+      >
+        <div slot="title">
+          <el-form
+            :model="ruleForm"
+            :rules="rules"
+            :inline="true"
+            ref="ruleForm"
+            label-width="150px"
+            class="demo-ruleForm"
+          >
+            <p v-if="isView" class="dig_title">单独注册</p>
+            <p v-if="!isView" class="dig_title">编辑</p>
+            <div slot=""></div>
+            <div slot="footer"></div>
+            <!-- :show-all-levels="false" -->
+            <!-- <el-form-item label="所属组织架构" prop="group">
+              <el-cascader
+                placeholder="请选择组织架构"
+                v-model="ruleForm.group"
+                :options="groupData"
+                
+                clearable
+              ></el-cascader>
+            </el-form-item> -->
+            <el-form-item label="编号" prop="studentNumber">
+              <el-input v-model="ruleForm.studentNumber"></el-input>
+            </el-form-item>
+            <el-row>
+              <el-col :span="12">
+                <el-form-item label="姓名" prop="name">
+                  <el-input v-model="ruleForm.name" autocomplete="off"></el-input>
+                </el-form-item>
+              </el-col>
+              <el-col :span="12">
+                <el-form-item label="性别" prop="name">
+                  <el-radio-group v-model="ruleForm.sex" style="margin-left: 20px">
+                    <el-radio label="1">男</el-radio>
+                    <el-radio label="0">女</el-radio>
+                  </el-radio-group>
+                </el-form-item>
+              </el-col>
+            </el-row>
+
+            <!-- <el-form-item v-if="isView" label="密码" prop="password">
+              <el-input
+                type="password"
+                v-model="ruleForm.password"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item>
+            <el-form-item v-if="isView" label="确认密码" prop="comPassword">
+              <el-input
+                type="password"
+                v-model="ruleForm.comPassword"
+                autocomplete="off"
+              ></el-input>
+            </el-form-item> -->
+            <div class="dig_button">
+              <el-button type="info" round @click="resetData()">重置</el-button>
+              <!-- <el-button type="success" round @click="submitForm('ruleForm')"
+                >提交</el-button
+              > -->
+              <el-button type="success" round @click="submitCom()">提交</el-button>
+            </div>
+          </el-form>
+        </div>
+      </el-dialog>
+    </div>
+  </div>
+</template>
+<script>
+// import { oSessionStorage } from "../../utils/utils";
+import { oSessionStorage } from "../utils/utils";
+import md5 from "md5";
+export default {
+  data() {
+    var validatePass = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请输入密码"));
+      } else if (value.length < 6) {
+        callback(new Error("密码至少6位"));
+      } else {
+        callback();
+      }
+    };
+    var validateComPass = (rule, value, callback) => {
+      if (value === "") {
+        callback(new Error("请输入密码"));
+      } else if (value.length < 6) {
+        callback(new Error("密码至少6位"));
+      } else if (value !== this.ruleForm.password) {
+        callback(new Error("两次密码不一致"));
+        // callback();
+      } else {
+        callback();
+      }
+    };
+    var validatePhone = (rule, value, callback) => {
+      let myreg = /^[1][3,4,5,6,7,8,9][0-9]{9}$/;
+      if (value === "") {
+        callback(new Error("请输入手机号"));
+      } else if (!myreg.test(value)) {
+        callback(new Error("请输入正确格式"));
+      } else {
+        callback();
+      }
+    };
+    return {
+      userInfo: "",
+      //编辑返回的值
+      userDetailData: {},
+      //组织架构名字
+      groupName: "",
+      ppData: [],
+      groupData: [],
+      options: [
+        {
+          value: "1",
+          label: "选项1",
+          children: [
+            {
+              value: "11",
+              label: "选项11",
+              children: [{ value: "111", label: "选项111" }],
+            },
+          ],
+        },
+      ],
+      disableFlag: false,
+      phoneFlag: false,
+      flag: 3,
+      dialogVisible: false,
+      //渠道列表
+      channelList: [{ name: "渠道天成", id: "1" }],
+      ruleForm: {
+        //所属组织架构
+        group: "",
+        //学号
+        studentNumber: "",
+        //姓名
+        name: "",
+        //性别
+        sex: "",
+        //密码
+        password: "",
+        comPassword: "",
+      },
+      isView: true,
+      rules: {
+        // group: [{ required: true, message: "请选择组织架构", trigger: "blur" }],
+        studentNumber: [{ required: true, message: "请输入编号", trigger: "blur" }],
+        name: [{ required: true, message: "请输入姓名", trigger: "blur" }],
+        // password: [{ required: true, message: "请输密码", trigger: "blur" }],
+        // password: [{ required: true, validator: validatePass, trigger: "blur" }],
+        // comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],
+      },
+    };
+  },
+  mounted() {
+    //获取渠道信息
+    // this.ruleForm.type = "3";
+  },
+  methods: {
+    resetData() {
+      this.$refs["ruleForm"].clearValidate();
+      //清空表单
+      // this.ruleForm.group = "";
+      this.ruleForm.name = "";
+      this.ruleForm.studentNumber = "";
+      // this.ruleForm.password = "";
+      // this.ruleForm.comPassword = "";
+      this.ruleForm.sex = "";
+    },
+    //获取组织架构方法--------------------开始-----------------------
+    getChannel() {
+      this.$http.get(`/org/findAllOrgByPOrgNo?orgNo=${this.userInfo.orgNo}`, {}, (res) => {
+        //  this.$toast.success({message:'成功'});
+        if (res && res.code == 200) {
+          //将值赋值给list
+          if (res.data.length > 0) {
+            let resAdd = this.addPro(res.data);
+            this.ppData = JSON.parse(JSON.stringify(resAdd));
+            let forRes = this.arrToTree(resAdd);
+            // console.log('格式化的结构')
+            // console.log(forRes)
+            let resultRes = this.deleteChildren(forRes);
+
+            this.groupData = resultRes[0].children;
+          } else {
+            this.groupData = [];
+          }
+          // this.channelList = res.data;
+        } else {
+          this.$message.error(res.msg);
+        }
+      });
+    },
+    //z增加
+    addPro(val) {
+      let data = JSON.parse(JSON.stringify(val));
+      for (let i = 0; i < val.length; i++) {
+        data[i].value = val[i].orgNo;
+        data[i].label = val[i].orgName;
+      }
+      return data;
+    },
+    //非递归方式：将平铺数据转换为树形结构数据
+    arrToTree(arr) {
+      console.log("arr----");
+      console.log(arr);
+      console.log(this.userInfo);
+      console.log(this.userInfo.orgNo);
+      let data = arr.filter((item) => {
+        item.children = arr.filter((e) => {
+          return item.orgNo === e.parentOrgNo;
+        });
+
+        return this.userInfo.orgNo == item.orgNo;
+        //return !item.parentOrgNo;
+      });
+      console.log("data------");
+      console.log(data);
+      return data;
+    },
+    //去除转换树形结构数据后存在的空children
+    deleteChildren(arr) {
+      let childs = arr;
+      for (let i = childs.length; i--; i > 0) {
+        if (childs[i].children) {
+          if (childs[i].children.length) {
+            this.deleteChildren(childs[i].children);
+          } else {
+            delete childs[i].children;
+          }
+        }
+      }
+      return arr;
+    },
+    queryOrgName() {
+      for (let i = 0; i < this.ppData.length; i++) {
+        if (this.ruleForm.group[this.ruleForm.group.length - 1] == this.ppData[i].orgNo) {
+          this.groupName = this.ppData[i].orgName;
+        }
+      }
+    },
+    //获取组织架构方法--------------------结束-----------------------
+    timeChange(val) {
+      if (val !== null) {
+        //根据时间得到格式化的数据
+        this.ruleForm.birthDate = this.formatterTime(val);
+      }
+    },
+    formatterTime(val) {
+      let date = new Date(val);
+      let year = date.getFullYear();
+      let month = date.getMonth() + 1;
+      month = this.formatterMon(month);
+      let day = date.getDate();
+      day = this.formatterMon(day);
+      return year + "-" + month + "-" + day;
+    },
+    formatterMon(val) {
+      if (val < 10) {
+        return "0" + val;
+      } else {
+        return val;
+      }
+    },
+    open(val) {
+      this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
+      this.cancle();
+      // this.getChannel();
+      this.dialogVisible = true;
+      this.isView = val;
+
+      this.$nextTick(() => {
+        this.$refs.ruleForm.clearValidate();
+      });
+    },
+    edit(val) {
+      this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
+      console.log("userInfo");
+      console.log(this.userInfo);
+      this.getChannel();
+      this.dialogVisible = true;
+      this.isView = false;
+      this.queryUserDetail(val.id);
+      //调用查询详情的接口
+    },
+    //调用查询详情的接口
+    queryUserDetail(val) {
+      let url = `/user/findUserById?id=${val}`;
+
+      this.$http.get(url, {}, (res) => {
+        console.log(res);
+        if (res && res.code == 200) {
+          //获取返回值
+          //根据将数据存储
+          this.userDetailData = res.data;
+          let a = [];
+
+          //当角色等于2时
+          // if (this.userInfo.roleType == "2") {
+          //   //
+
+          //   a.push(res.data.orgNo);
+          // }
+          // //当角色等于1时
+          // if (this.userInfo.roleType == "3") {
+          //   for (let i = 0; i < res.data.orgList.length; i++) {
+          //     if (i < 2) {
+          //       a.push(res.data.orgList[i].orgNo);
+          //     }
+          //   }
+          // }
+          // a.push(this.userInfo.orgNo);
+          // a.push(res.data.orgNo);
+          //判断用户登录类型
+
+          console.log("a------------------");
+          console.log(a);
+          // debugger;
+          // for (let i = res.data.orgList.length; i > 0; i--) {
+          //   //
+          //   a.push(res.data.orgList[i - 1].orgNo);
+          // }
+          //回显学号
+          this.ruleForm.studentNumber = res.data.userNo;
+          //回显姓名
+          this.ruleForm.name = res.data.userName;
+          //回显性别
+          this.ruleForm.sex = res.data.gender;
+          //
+          // this.ruleForm.group = a.reverse();
+        } else {
+          // this.$toast.fail(res.msg);
+          this.$message.error(res.msg);
+        }
+      });
+    },
+    cancle() {
+      this.$refs["ruleForm"].clearValidate();
+      //清空表单
+      this.ruleForm.group = "";
+      this.ruleForm.name = "";
+      this.ruleForm.studentNumber = "";
+      this.ruleForm.password = "";
+      this.ruleForm.comPassword = "";
+      this.ruleForm.sex = "";
+      this.dialogVisible = false;
+    },
+    disableFlagStatus() {
+      setTimeout(() => {
+        this.disableFlag = false;
+      }, 1500);
+    },
+    submitCom() {
+      if (this.disableFlag) {
+        return;
+      }
+      this.disableFlag = true;
+      let validSp = [];
+      if (this.isView) {
+        // validSp = ["group", "studentNumber", "name", "sex", "password", "comPassword"];
+        validSp = [ "studentNumber", "name", "sex"];
+      } else {
+        validSp = ["studentNumber", "name", "sex"];
+      }
+      let aa = [];
+      this.$refs["ruleForm"].validateField(validSp, (valid) => {
+        if (!valid) {
+          aa.push(valid);
+          //判断是编辑还是新增
+          if (this.isView) {
+            if (aa.length == 3) {
+              this.register();
+            } else {
+              this.disableFlagStatus();
+            }
+          } else {
+            if (aa.length == 3) {
+              this.editUserFun();
+            } else {
+              this.disableFlagStatus();
+            }
+          }
+
+          //都校验通过后可以触发注册接口了
+          //调用方法进行入参
+        } else {
+          this.disableFlagStatus();
+        }
+      });
+    },
+    register() {
+      // if (this.ruleForm.group.length == 1) {
+      //   this.$message({
+      //     message: "请选择专业节点",
+      //     type: "warning",
+      //   });
+      //   return;
+      // }
+      // this.queryOrgName();
+
+      console.log(this.ruleForm.group);
+      let that = this;
+      // this.ruleForm.password = md5(this.ruleForm.password);
+      this.$http.post(
+        `/user/addOrUpdateUser`,
+        {
+          orgNo:this.userInfo.orgNo,
+          orgName:this.userInfo.orgName,
+          // orgNo: this.ruleForm.group[this.ruleForm.group.length - 1],
+          // orgName: this.groupName,
+          userNo: this.ruleForm.studentNumber,
+          userName: this.ruleForm.name,
+          gender: this.ruleForm.sex,
+          // password: md5(this.ruleForm.password),
+          //roleType     5超级管理员 4 院管理员  3 辅导员  2 教师 1学生
+          roleType: "2",
+        },
+        (res) => {
+          this.disableFlagStatus();
+          // this.disableFlag = false;
+          if (res && res.code == 200) {
+            this.dialogVisible = false;
+
+            // this.$toast.success({ message: "成功" });
+            //调用父组件的查询方法
+            this.$message.success(res.msg);
+            that.$emit("search");
+          } else {
+            // this.$toast.fail({ message: res.msg });
+            this.$message.error(res.msg);
+          }
+          //清空缓存
+          this.cancle();
+        }
+      );
+    },
+    editUserFun() {
+      let that = this;
+      this.queryOrgName();
+      // this.userDetailData.orgNo = this.ruleForm.group[this.ruleForm.group.length - 1];
+      // this.userDetailData.orgName = this.groupName;
+      this.userDetailData.userName = this.ruleForm.name;
+      this.userDetailData.gender = this.ruleForm.sex;
+      this.userDetailData.userNo = this.ruleForm.studentNumber;
+      this.$http.post(
+        `/user/addOrUpdateUser`,
+        {
+          ...this.userDetailData,
+        },
+        (res) => {
+          this.disableFlagStatus();
+          if (res && res.code == 200) {
+            this.dialogVisible = false;
+            // this.$toast.success({ message: "成功" });
+            //调用父组件的查询方法
+            that.$emit("search");
+            this.$message.success("修改成功");
+          } else {
+            // this.$toast.fail({ message: res.msg });
+            this.$message.error(res.msg);
+          }
+
+          //清空缓存
+
+          //清空缓存
+        }
+      );
+    },
+  },
+};
+</script>
+<style lang="less" scoped>
+.el-form-item{
+ margin-bottom: 5px !important;
+}
+.dig_update /deep/.el-cascader {
+  position: relative;
+  font-size: 14px;
+  line-height: 40px;
+  width: 100%;
+}
+.dig_update /deep/.el-dialog {
+  box-shadow: none !important;
+  background: transparent !important;
+}
+.demo-ruleForm /deep/ .el-form-item {
+  margin-right: 10px;
+  vertical-align: top;
+  display: flex !important;
+  flex-direction: column;
+}
+.demo-ruleForm /deep/.el-form-item__label {
+  text-align: left;
+  vertical-align: middle;
+  float: left;
+  font-size: 14px;
+  color: #606266;
+  line-height: 40px;
+  padding: 0 12px 0 0;
+  -webkit-box-sizing: border-box;
+  box-sizing: border-box;
+}
+
+.demo-ruleForm /deep/.el-input {
+  width: 100% !important;
+}
+
+.demo-ruleForm /deep/.el-input__inner {
+  width: 100% !important;
+  background-color: #f7f7f7;
+  border: 0px;
+}
+
+.dig_button {
+  margin-top:20px;
+  display: flex;
+  width: 100%;
+  justify-content: space-around;
+}
+
+.demo-ruleForm {
+  background-color: #ffffff;
+  // border-radius: 20px;
+  margin-right: -10px;
+  margin-top: -10px;
+  padding-right: 100px;
+  padding-left: 100px;
+  border-radius: 20px;
+  padding-top: 20px;
+  padding-bottom: 40px;
+  .dig_title {
+    margin-bottom: 30px;
+    text-align: center;
+    font-weight: 700;
+  }
+}
+</style>

src/components/instructorRegister.vue

@@ -7,7 +7,7 @@
         :close-on-click-modal="false"
         width="40%"
         style="border-radius: 40px"
-        top="5vh"
+        top="15vh"
       >
         <div slot="title">
           <el-form
@@ -67,7 +67,7 @@
               </el-col>
             </el-row>
 
-            <el-form-item v-if="isView" label="密码" prop="password">
+            <!-- <el-form-item v-if="isView" label="密码" prop="password">
               <el-input
                 type="password"
                 v-model="ruleForm.password"
@@ -80,7 +80,7 @@
                 v-model="ruleForm.comPassword"
                 autocomplete="off"
               ></el-input>
-            </el-form-item>
+            </el-form-item> -->
             <div class="dig_button">
               <el-button type="info" round @click="resetData()">重置</el-button>
               <!-- <el-button type="success" round @click="submitForm('ruleForm')"
@@ -158,8 +158,8 @@ export default {
         //性别
         sex: "",
         //密码
-        password: "",
-        comPassword: "",
+        // password: "",
+        // comPassword: "",
       },
       isView: true,
       rules: {
@@ -167,8 +167,8 @@ export default {
         studentNumber: [{ required: true, message: "请输入编号", trigger: "blur" }],
         name: [{ required: true, message: "请输入编号", trigger: "blur" }],
         // password: [{ required: true, message: "请输密码", trigger: "blur" }],
-        password: [{ required: true, validator: validatePass, trigger: "blur" }],
-        comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],
+        // password: [{ required: true, validator: validatePass, trigger: "blur" }],
+        // comPassword: [{ required: true, validator: validateComPass, trigger: "blur" }],
       },
       gradeList: [],
     };
@@ -218,8 +218,8 @@ export default {
       this.ruleForm.group = "";
       this.ruleForm.name = "";
       this.ruleForm.studentNumber = "";
-      this.ruleForm.password = "";
-      this.ruleForm.comPassword = "";
+      //   this.ruleForm.password = "";
+      //   this.ruleForm.comPassword = "";
       this.ruleForm.sex = "";
     },
     //获取组织架构方法--------------------开始-----------------------
@@ -409,8 +409,8 @@ export default {
       this.ruleForm.group = "";
       this.ruleForm.name = "";
       this.ruleForm.studentNumber = "";
-      this.ruleForm.password = "";
-      this.ruleForm.comPassword = "";
+      //   this.ruleForm.password = "";
+      //   this.ruleForm.comPassword = "";
       this.ruleForm.sex = "";
       this.dialogVisible = false;
     },
@@ -426,7 +426,7 @@ export default {
       this.disableFlag = true;
       let validSp = [];
       if (this.isView) {
-        validSp = ["grade", "studentNumber", "name", "sex", "password", "comPassword"];
+        validSp = ["grade", "studentNumber", "name", "sex"];
       } else {
         validSp = ["grade", "studentNumber", "name", "sex"];
       }
@@ -436,7 +436,7 @@ export default {
           aa.push(valid);
           //判断是编辑还是新增
           if (this.isView) {
-            if (aa.length == 6) {
+            if (aa.length == 4) {
               this.register();
             } else {
               this.disableFlagStatus();
@@ -457,8 +457,6 @@ export default {
       });
     },
     register() {
-      //   this.queryOrgName();
-      //   console.log(this.ruleForm.group);
       let that = this;
       console.log("grade");
       //   gradeList
@@ -485,7 +483,7 @@ export default {
           userNo: this.ruleForm.studentNumber,
           userName: this.ruleForm.name,
           gender: this.ruleForm.sex,
-          password: md5(this.ruleForm.password),
+          //   password: md5(this.ruleForm.password),
           //roleType     1普通用户    roleType   管理员
           roleType: "3",
         },
@@ -497,6 +495,7 @@ export default {
 
             // this.$toast.success({ message: "成功" });
             //调用父组件的查询方法
+            this.$message.success(res.msg);
             that.$emit("search");
           } else {
             // this.$toast.fail({ message: res.msg });
@@ -601,6 +600,7 @@ export default {
 }
 
 .dig_button {
+  margin-top: 20px;
   display: flex;
   width: 100%;
   justify-content: space-around;

src/views/manage/instructorManage.vue

@@ -80,7 +80,7 @@
             width=""
           >
           </el-table-column>
-          <el-table-column prop="userNo" label="学号" align="center" width="">
+          <el-table-column prop="userNo" label="编号" align="center" width="">
           </el-table-column>
           <el-table-column
             prop="gender"

src/views/manage/teacherManage.vue

@@ -14,7 +14,7 @@
             ></el-input
             >&nbsp;&nbsp;&nbsp;&nbsp;
             <el-cascader
-             v-show="userInfo.roleType=='3'"
+              v-show="userInfo.roleType == '3'"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
@@ -23,11 +23,10 @@
             ></el-cascader>
             <!-- :props="{ checkStrictly: true }" -->
             <el-cascader
-              v-show="userInfo.roleType=='2'"
+              v-show="userInfo.roleType == '2'"
               placeholder="请选择组织架构"
               v-model="group"
               :options="groupData"
-            
               clearable
             ></el-cascader>
             &nbsp;&nbsp;&nbsp;&nbsp;
@@ -135,7 +134,7 @@
       <!-- <el-pagination small background layout="total prev, pager, next" :total="36">
       </el-pagination> -->
     </div>
-    <Register ref="register" @search="searchTarget" />
+    <TeacherRegister ref="register" @search="searchTarget" />
     <el-dialog
       class="dig_update"
       :visible.sync="centerDialogVisible"
@@ -207,23 +206,23 @@
       <div slot="title">
         <div class="demo-ruleForm">
           <p v-show="!isDelete" class="dig_title">批量导入</p>
-
           <!-- 先选择组织架构 -->
           <!-- :props="{ checkStrictly: true }" -->
-          <el-cascader
+          <!-- <el-cascader
             placeholder="请选择组织架构"
             v-model="groupLead"
             :options="groupData"
             clearable
-          ></el-cascader>
+          ></el-cascader> -->
           <el-upload
             class="upload-demo"
             style="margin-top: 40px"
             drag
             :before-upload="beforeUploadFun"
             :action="
-              basePath + `/user/userImport?orgNo=${groupLead[groupLead.length - 1]}`
+              basePath + `/user/userImport?orgNo=${this.userInfo.orgNo}&roleType=2`
             "
+            :headers="headers"
             :on-success="fileSuccess"
             :on-error="fileError"
           >
@@ -239,7 +238,7 @@
               color: #409eff;
               cursor: pointer;
             "
-            :href="basePath + '/user/templateDownload'"
+            :href="basePath + '/user/templateDownload?roleType=2'"
           >
             下载模版
           </a>
@@ -256,12 +255,12 @@
 
 <script>
 import { oSessionStorage } from "../../utils/utils";
-import register from "../../components/Register.vue";
+import teacherRegister from "../../components/TeacherRegister.vue";
 import { basePath } from "../../utils/http";
 export default {
   name: "userManage",
   components: {
-    Register: register,
+    TeacherRegister: teacherRegister,
   },
   data() {
     return {
@@ -326,11 +325,18 @@ export default {
       },
       channel: "",
       channelList: [{ name: "渠道天成", id: "1" }],
+      headers: {},
     };
   },
   created() {},
   mounted() {
     this.userInfo = JSON.parse(oSessionStorage.getItem("userInfo"));
+    this.headers = {
+      Authorization: oSessionStorage.getItem("token")
+        ? `Bearer ${oSessionStorage.getItem("token")}`
+        : "",
+    };
+
     console.log("this.userInfo");
     console.log(this.userInfo);
     this.getChannel();
@@ -344,13 +350,13 @@ export default {
     //文件上传之前
     beforeUploadFun(file) {
       //查询是否选择了组织架构
-      if (this.groupLead.length == 0) {
-        this.$message({
-          message: "请选择组织架构",
-          type: "error",
-        });
-        return false;
-      }
+      // if (this.groupLead.length == 0) {
+      //   this.$message({
+      //     message: "请选择组织架构",
+      //     type: "error",
+      //   });
+      //   return false;
+      // }
     },
     //文件上传成功
     fileSuccess(res) {
@@ -424,7 +430,7 @@ export default {
               // console.log(forRes)
               let resultRes = this.deleteChildren(forRes);
               console.log("格式化的结构且去掉children");
-              
+
               this.groupData = resultRes[0].children;
             } else {
               this.groupData = [];