新增教研室

src/components/pages/data.vue

@@ -12,7 +12,10 @@
       margin: 0;
     "
   >
-    <div class="pb_content_body" style="position: relative; width: 100%">
+    <div
+      class="pb_content_body"
+      style="position: relative; width: 100%; height: 100%"
+    >
       <div style="width: 100%; margin: 0px auto">
         <div class="formTop">
           <div class="tx">
@@ -56,6 +59,9 @@
               <el-radio label="女"></el-radio>
             </el-radio-group>
           </el-form-item>
+          <el-form-item label="教研室" v-if="ruleForm.type == '老师'">
+            <div>{{ ccName }}</div>
+          </el-form-item>
           <el-form-item label="姓名" prop="name">
             <el-input
               v-model="ruleForm.name"
@@ -230,6 +236,7 @@ export default {
         org: "",
         headportrait: "",
       },
+      ccName:"",
       opassword: "",
       password: "",
       password1: "",
@@ -349,7 +356,13 @@ export default {
             this.ruleForm.org = res.data[0][0].org
               ? res.data[0][0].org.split(",")[0]
               : "";
-            this.ruleForm.type = res.data[0][0].type == 1 ? "老师" : res.data[0][0].type == 2 ? "学生" : "管理员";
+            this.ruleForm.type =
+              res.data[0][0].type == 1
+                ? "老师"
+                : res.data[0][0].type == 2
+                ? "学生"
+                : "管理员";
+            this.getCcName(res.data[0][0].organizeid);
             console.log(res.data[0][0]);
           }
         })
@@ -357,6 +370,30 @@ export default {
           console.error(err);
         });
     },
+    getCcName(oid) {
+      let params = { oid: oid };
+      this.ajax
+        .get(this.$store.state.api + "selectTeacherOfficeBySchool", params)
+        .then((res) => {
+          var cBox = res.data[0];
+          var str = this.ruleForm.cclassid;
+          var arr = str.split(",");
+          for (var k = 0; k < cBox.length; k++) {
+            for (var i = 0; i < arr.length; i++) {
+              if (cBox[k].id == arr[i]) {
+                if (this.ccName == "") {
+                  this.ccName = cBox[k].name;
+                } else {
+                  this.ccName += "," + cBox[k].name;
+                }
+              }
+            }
+          }
+        })
+        .catch((err) => {
+          console.error(err);
+        });
+    },
     updatePassword() {
       if (this.password.length < 6) {
         this.$message.error("密码长度不少于6位");

src/components/pages/student.vue

@@ -1,27 +1,53 @@
 <template>
   <div class="pb_content" style="background: unset">
-    <div class="pb_content_body" style="
-          background: #fff;
-          padding: 0px 25px;
-          box-sizing: border-box;
-          border-radius: 5px;
-        ">
+    <div
+      class="pb_content_body"
+      style="
+        background: #fff;
+        padding: 0px 25px;
+        box-sizing: border-box;
+        border-radius: 5px;
+      "
+    >
       <div class="pb_head">
         <span>学生管理</span>
       </div>
       <div class="student_head">
         <div class="head_left">
-          <el-input v-model="sPhoneUser" class="student_input" placeholder="请输入用户名"></el-input>
-          <el-select v-model="cid" placeholder="请选择班级" class="student_input" @change="searchStudent">
+          <el-input
+            v-model="sPhoneUser"
+            class="student_input"
+            placeholder="请输入用户名"
+          ></el-input>
+          <el-select
+            v-model="cid"
+            placeholder="请选择班级"
+            class="student_input"
+            @change="searchStudent"
+          >
             <el-option label="所有人" value=""></el-option>
-            <el-option v-for="(item, index) in classJuri" :key="index" :label="item.name" :value="item.id"></el-option>
+            <el-option
+              v-for="(item, index) in classJuri"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
-          <el-button class="student_button" @click="searchStudent">查询</el-button>
+          <el-button class="student_button" @click="searchStudent"
+            >查询</el-button
+          >
         </div>
         <div class="head_right">
           <el-button @click="addStudent">添加学生</el-button>
-          <el-upload v-show="false" class="upload-demo newCss" :http-request="handleChange" :on-remove="handleRemove"
-            action="#" :file-list="fileListUpload" accept=".xlsx">
+          <el-upload
+            v-show="false"
+            class="upload-demo newCss"
+            :http-request="handleChange"
+            :on-remove="handleRemove"
+            action="#"
+            :file-list="fileListUpload"
+            accept=".xlsx"
+          >
             <el-button size="primary" type="primary">批量添加</el-button>
             <div slot="tip" class="el-upload__tip" style="margin-left: 10px">
               只能上传xlsx文件，且不超过500kb
@@ -34,26 +60,39 @@
     </div>
     <div class="pb_content_body">
       <div class="student_table">
-        <el-table ref="table" :data="tableData" border :height="tableHeight" :fit="true" v-loading="isLoading"
-          style="width: 100%" :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
-          :row-class-name="tableRowClassName">
+        <el-table
+          ref="table"
+          :data="tableData"
+          border
+          :height="tableHeight"
+          :fit="true"
+          v-loading="isLoading"
+          style="width: 100%"
+          :header-cell-style="{ background: '#f1f1f1', fontSize: '17px' }"
+          :row-class-name="tableRowClassName"
+        >
           <el-table-column label="姓名" min-width="10" align="center">
             <template slot-scope="scope">
               <div class="userImg">
                 <div class="tx">
-                  <img :src="
-                    scope.row.headportrait != null
-                      ? scope.row.headportrait
-                      : tx
-                  " alt />
+                  <img
+                    :src="
+                      scope.row.headportrait != null
+                        ? scope.row.headportrait
+                        : tx
+                    "
+                    alt
+                  />
                 </div>
-                <div style="
-                      width: 150px;
-                      text-align: left;
-                      white-space: nowrap;
-                      overflow: hidden;
-                      text-overflow: ellipsis;
-                    ">
+                <div
+                  style="
+                    width: 150px;
+                    text-align: left;
+                    white-space: nowrap;
+                    overflow: hidden;
+                    text-overflow: ellipsis;
+                  "
+                >
                   {{ scope.row.name }}
                 </div>
               </div>
@@ -77,19 +116,41 @@
             align="center"
           >
           </el-table-column>-->
-          <el-table-column prop="classname2" label="班级" min-width="15" align="center">
+          <el-table-column
+            prop="classname2"
+            label="班级"
+            min-width="15"
+            align="center"
+          >
           </el-table-column>
           <el-table-column label="操作" width="250px">
             <template slot-scope="scope">
               <div class="btnBox">
-                <el-button class="de_button" type="primary" size="small" style="
-                      width: auto;
-                      padding: 5px !important;
-                      line-height: 15px;
-                    " @click="iniPassword(scope.row.userid)">初始化密码</el-button>
-                <el-button class="de_button" type="primary" size="small" @click="updateStudentA(scope.row)">修改</el-button>
+                <el-button
+                  class="de_button"
+                  type="primary"
+                  size="small"
+                  style="
+                    width: auto;
+                    padding: 5px !important;
+                    line-height: 15px;
+                  "
+                  @click="iniPassword(scope.row.userid)"
+                  >初始化密码</el-button
+                >
+                <el-button
+                  class="de_button"
+                  type="primary"
+                  size="small"
+                  @click="updateStudentA(scope.row)"
+                  >修改</el-button
+                >
                 <div class="delete">
-                  <img src="../../assets/remove.png" alt @click="deleteStudent(scope.row.userid, scope.row.state)" />
+                  <img
+                    src="../../assets/remove.png"
+                    alt
+                    @click="deleteStudent(scope.row.userid, scope.row.state)"
+                  />
                 </div>
               </div>
             </template>
@@ -97,12 +158,23 @@
         </el-table>
       </div>
       <div class="student_page">
-        <el-pagination background layout="prev, pager, next" :page-size="10" :total="total" v-if="page"
-          @current-change="handleCurrentChange"></el-pagination>
+        <el-pagination
+          background
+          layout="prev, pager, next"
+          :page-size="10"
+          :total="total"
+          v-if="page"
+          @current-change="handleCurrentChange"
+        ></el-pagination>
       </div>
     </div>
-    <el-dialog :visible.sync="dialogVisible" :append-to-body="true" width="700px" :before-close="handleClose"
-      class="add_student">
+    <el-dialog
+      :visible.sync="dialogVisible"
+      :append-to-body="true"
+      width="700px"
+      :before-close="handleClose"
+      class="add_student"
+    >
       <div slot="title" class="header-title">
         <div class="logoImg">
           <img src="../../assets/logo.png" alt />
@@ -112,30 +184,64 @@
       <el-form>
         <el-form-item label="学生姓名" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生姓名" clearable v-model="sName" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生姓名"
+              clearable
+              v-model="sName"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生学号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生学号" clearable v-model="sId" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生学号"
+              clearable
+              v-model="sId"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生手机号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生手机号" clearable v-model="sPhone" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生手机号"
+              clearable
+              v-model="sPhone"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生账号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生账号" clearable v-model="sMail" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生账号"
+              clearable
+              v-model="sMail"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="所属学校" :label-width="formLabelWidth">
-          <el-input disabled style="width: 300px" v-model="schoolName"></el-input>
+          <el-input
+            disabled
+            style="width: 300px"
+            v-model="schoolName"
+          ></el-input>
         </el-form-item>
         <el-form-item label="班级" :label-width="formLabelWidth">
-          <el-select multiple collapse-tags v-model="sByClass" placeholder="请选择班级">
-            <el-option v-for="(item, index) in classJuri" :key="index" :label="item.name" :value="item.id"></el-option>
+          <el-select
+            multiple
+            collapse-tags
+            v-model="sByClass"
+            placeholder="请选择班级"
+          >
+            <el-option
+              v-for="(item, index) in classJuri"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <div style="text-align: center; color: #adb3b7">
@@ -146,8 +252,13 @@
         <el-button class="right" @click="insertStudent">确认</el-button>
       </span>
     </el-dialog>
-    <el-dialog :visible.sync="dialogVisibleUpdate" :append-to-body="true" width="700px" :before-close="handleClose"
-      class="add_student">
+    <el-dialog
+      :visible.sync="dialogVisibleUpdate"
+      :append-to-body="true"
+      width="700px"
+      :before-close="handleClose"
+      class="add_student"
+    >
       <div slot="title" class="header-title">
         <div class="logoImg">
           <img src="../../assets/logo.png" alt />
@@ -157,30 +268,64 @@
       <el-form>
         <el-form-item label="学生名称" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生姓名" clearable v-model="userinfo.name" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生姓名"
+              clearable
+              v-model="userinfo.name"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生学号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生学号" clearable v-model="userinfo.studentid" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生学号"
+              clearable
+              v-model="userinfo.studentid"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生手机号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生手机号" clearable v-model="userinfo.phonenumber" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生手机号"
+              clearable
+              v-model="userinfo.phonenumber"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="学生账号" :label-width="formLabelWidth">
           <span>
-            <el-input placeholder="请输入学生账号" clearable v-model="userinfo.un" class="add_input"></el-input>
+            <el-input
+              placeholder="请输入学生账号"
+              clearable
+              v-model="userinfo.un"
+              class="add_input"
+            ></el-input>
           </span>
         </el-form-item>
         <el-form-item label="所属学校" :label-width="formLabelWidth">
-          <el-input disabled style="width: 300px" v-model="schoolName"></el-input>
+          <el-input
+            disabled
+            style="width: 300px"
+            v-model="schoolName"
+          ></el-input>
         </el-form-item>
         <el-form-item label="班级" :label-width="formLabelWidth">
-          <el-select multiple collapse-tags v-model="userinfo.classid" placeholder="请选择班级">
-            <el-option v-for="(item, index) in classJuri" :key="index" :label="item.name" :value="item.id"></el-option>
+          <el-select
+            multiple
+            collapse-tags
+            v-model="userinfo.classid"
+            placeholder="请选择班级"
+          >
+            <el-option
+              v-for="(item, index) in classJuri"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <div style="text-align: center; color: #adb3b7">
@@ -224,6 +369,7 @@ export default {
       sPhoneUser: "",
       userid: this.$route.query.userid,
       oid: this.$route.query.oid,
+      org: this.$route.query.org,
       cid: "",
       tx: require("../../assets/avatar.png"),
     };
@@ -303,7 +449,8 @@ export default {
         this.$message.error("请为学生选择班级");
         return;
       } else if (
-        this.sPhone != "" && !/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)
+        this.sPhone != "" &&
+        !/^[1][3,4,5,7,8][0-9]{9}$/.test(this.sPhone)
       ) {
         this.$message.error("手机号格式不正确");
         return;
@@ -371,10 +518,11 @@ export default {
           ph: this.sPhone,
           sid: this.sId,
           cid: this.sByClass.join(","),
+          org: this.org,
         },
       ];
       this.ajax
-        .post(this.$store.state.api + "batchRegistration", params)
+        .post(this.$store.state.api + "batchRegistrationOrg", params)
         .then((res) => {
           // console.log(res.data.uid, res.data.ph, res.data.oid, res.data.cid);
           // this.isLoading = false;
@@ -390,11 +538,12 @@ export default {
               cid: res.data.cid,
               intro: "",
               sex: "0",
+              org: this.org,
             },
           ];
           this.ajax
             // .post(this.$store.state.api + "updateUser", params)
-            .post(this.$store.state.api + "updateUserByEdu", params)
+            .post(this.$store.state.api + "updateUserByEduOrg", params)
             .then((res) => {
               console.log(res);
             })
@@ -481,7 +630,7 @@ export default {
       if (this.fileTemp) {
         if (
           this.fileTemp.type ==
-          "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ||
+            "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" ||
           this.fileTemp.type == "application/vnd.ms-excel"
         ) {
           this.importCount = 1;
@@ -955,7 +1104,7 @@ export default {
               console.error(err);
             });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     iniPassword(id) {
       this.$confirm("确定" + "初始化" + "此学生的密码吗?", "提示", {
@@ -982,12 +1131,12 @@ export default {
               console.error(err);
             });
         })
-        .catch(() => { });
+        .catch(() => {});
     },
     updateStudentA(res) {
       this.userinfo = JSON.parse(JSON.stringify(res));
       this.userinfoA = JSON.parse(JSON.stringify(res));
-      this.userinfo.classid = this.userinfo.classid.split(",")
+      this.userinfo.classid = this.userinfo.classid.split(",");
       this.dialogVisibleUpdate = true;
     },
     updateStudent() {
@@ -1073,7 +1222,7 @@ export default {
 </script>
 
 <style scoped>
-.pb_head>span:nth-child(2) {
+.pb_head > span:nth-child(2) {
   font-size: 20px;
   margin-left: 5px;
   color: #828282;
@@ -1107,7 +1256,7 @@ export default {
   align-items: baseline;
 }
 
-.student_input>>>.el-input__inner {
+.student_input >>> .el-input__inner {
   height: 30px;
   width: 190px;
   font-size: 13px;
@@ -1124,7 +1273,7 @@ export default {
   line-height: 30px;
 }
 
-.head_right>button:nth-child(1) {
+.head_right > button:nth-child(1) {
   color: #fff;
   background: #2268bc;
   width: 70px;
@@ -1134,7 +1283,7 @@ export default {
   line-height: 30px;
 }
 
-.head_right>button:nth-child(2) {
+.head_right > button:nth-child(2) {
   color: #fff;
   background: #2268bc;
   width: 70px;
@@ -1144,7 +1293,7 @@ export default {
   line-height: 30px;
 }
 
-.head_right>div {
+.head_right > div {
   font-size: 12px;
   line-height: 40px;
   margin-left: 10px;
@@ -1153,16 +1302,16 @@ export default {
   cursor: pointer;
 }
 
-.student_table>>>.el-table--border td {
+.student_table >>> .el-table--border td {
   border-right: 0px !important;
 }
 
-.student_table>>>.el-table,
-.student_table>>>.el-table__body-wrapper {
+.student_table >>> .el-table,
+.student_table >>> .el-table__body-wrapper {
   height: auto !important;
 }
 
-.el-table>>>.even_row {
+.el-table >>> .even_row {
   background-color: #f1f1f1 !important;
 }
 
@@ -1176,30 +1325,30 @@ export default {
   line-height: 25px;
 }
 
-.add_student>>>.el-dialog__header {
+.add_student >>> .el-dialog__header {
   padding: 20px 20px 10px;
   text-align: center;
   background: #32455b;
 }
 
-.add_student>>>.el-dialog__title {
+.add_student >>> .el-dialog__title {
   font-size: 14px !important;
   color: #fff !important;
 }
 
-.add_student>>>.el-dialog__headerbtn {
+.add_student >>> .el-dialog__headerbtn {
   font-size: 20px !important;
 }
 
-.add_student>>>.el-form-item__label {
+.add_student >>> .el-form-item__label {
   margin-left: 65px;
 }
 
-.add_student>>>.el-form-item {
+.add_student >>> .el-form-item {
   display: flex;
 }
 
-.add_student>>>.el-form-item__content {
+.add_student >>> .el-form-item__content {
   margin: 0 !important;
 }
 
@@ -1207,7 +1356,7 @@ export default {
   width: 365px;
 }
 
-.add_student>>>.el-dialog__footer {
+.add_student >>> .el-dialog__footer {
   text-align: center !important;
 }
 
@@ -1226,7 +1375,7 @@ export default {
   width: 30px;
 }
 
-.logoImg>img {
+.logoImg > img {
   width: 100%;
   height: 100%;
 }
@@ -1240,7 +1389,7 @@ export default {
   line-height: 0px !important;
 }
 
-.upload-demo>>>.el-button {
+.upload-demo >>> .el-button {
   color: #fff;
   background: #2268bc;
   width: 70px;
@@ -1269,8 +1418,8 @@ export default {
   margin-left: 10px;
 }
 
-.tx>img,
-.delete>img {
+.tx > img,
+.delete > img {
   width: 100%;
   height: 100%;
 }
@@ -1290,7 +1439,7 @@ export default {
   margin-right: 10px;
 }
 
-.student_input>>>.el-input__icon {
+.student_input >>> .el-input__icon {
   line-height: unset;
 }