更新

src/views/class/classStuList.vue

@@ -18,6 +18,7 @@
             @onForm="onAssignShow"
             @handleClose="handleClose"
             :classid="this.id"
+            :schoolList="schoolList"
           ></headStuList>
         </el-col>
       </el-col>
@@ -32,6 +33,7 @@ import _ from 'lodash';
 import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
 const { mapActions: mapStudent } = createNamespacedHelpers('student');
 const { mapActions: mapGroup } = createNamespacedHelpers('group');
+const { mapActions: school } = createNamespacedHelpers('school');
 export default {
   name: 'classStuList',
   props: {},
@@ -40,13 +42,15 @@ export default {
     headStuList, //学生列表
   },
   data: () => ({
+    title: '',
+    isleftarrow: '',
+    navShow: true,
     headStuList: [],
     noGroupStuList: [],
     groupStuList: [],
     assignShow: false,
     assignForm: {},
     job_list: [],
-
     job1: [
       {
         name: '班长',
@@ -67,7 +71,6 @@ export default {
         name: '普通学生',
       },
     ],
-
     job3: [
       {
         name: '学委',
@@ -77,23 +80,22 @@ export default {
         name: '普通学生',
       },
     ],
-
     job4: [
       {
         name: '普通学生',
       },
     ],
-
-    title: '',
-    isleftarrow: '',
-    navShow: true,
+    // 学校
+    schoolList: [],
   }),
   created() {
     this.searchInfo();
+    this.seachschool();
   },
   computed: {
     id() {
-      return this.$route.query.id;
+      // return this.$route.query.id;
+      return '5f40887f624726b578b5d0af';
     },
     ...mapState(['user']),
   },
@@ -110,6 +112,12 @@ export default {
   methods: {
     ...mapStudent({ list: 'query', add: 'create', fet: 'fetch', updates: 'update' }),
     ...mapGroup({ groupQuery: 'query' }),
+    ...school(['query']),
+    // 查询学校
+    async seachschool() {
+      const res = await this.query();
+      if (this.$checkRes(res)) this.$set(this, `schoolList`, res.data);
+    },
     // 查询学生列表-并带有职务
     async searchInfo() {
       let classid = this.id;
@@ -117,12 +125,14 @@ export default {
       const res = await this.list({ classid });
       // 班级所有组
       const groups = await this.groupQuery({ classid });
-      //班级所有进组的学生id
-      let groupstuids = _.map(_.flattenDeep(_.map(groups.data, 'students')), 'stuid');
-      let noGroupStuList = res.data.filter(f => !groupstuids.includes(f.id));
-      if (this.$checkRes(res)) {
-        this.$set(this, `groupStuList`, groups.data);
+      if (this.$checkRes(res && groups)) {
+        // 班级学生
         this.$set(this, `headStuList`, res.data);
+        // 分组
+        this.$set(this, `groupStuList`, groups.data);
+        //班级所有进组的学生id,过滤出未分组学生
+        let groupstuids = _.map(_.flattenDeep(_.map(groups.data, 'students')), 'stuid');
+        let noGroupStuList = res.data.filter(f => !groupstuids.includes(f.id));
         this.$set(this, `noGroupStuList`, noGroupStuList);
       }
     },

src/views/class/info/headStuList.vue

@@ -12,16 +12,24 @@
         <el-col v-for="item in groupStuList" :key="item.id">
           <el-col v-if="item.students.length > 0">
             <van-divider content-position="left">{{ item.name }}</van-divider>
-            <el-col :span="6" class="list" v-for="i in item.students" :key="i.stuid" @click.native="clickAssign({ id: i.stuid })">
+            <el-col :span="11" class="list" v-for="i in item.students" :key="i.stuid" @click.native="clickAssign({ id: i.stuid })">
               <p class="name" :style="`font-size:${changeNum(i.stuname)}px`">{{ i.stuname }}</p>
+              <p>{{ getGroupsch(i.stuid) || '暂无' }}</p>
+              <p>{{ getlevel(i.stuid) || '暂无' }}</p>
+              <p>{{ getmajor(i.stuid) || '暂无' }}</p>
+              <p>{{ getfinsh(i.stuid) || '暂无' }}</p>
               <p class="job" v-if="i.job">{{ i.job }}<i class="el-icon-circle-check"></i></p>
             </el-col>
           </el-col>
         </el-col>
         <el-col>
           <van-divider content-position="left">未分组学生</van-divider>
-          <el-col :span="6" class="list" v-for="(item, index) in noGroupStuList" :key="index" @click.native="clickAssign(item)">
+          <el-col :span="11" class="list" v-for="(item, index) in noGroupStuList" :key="index" @click.native="clickAssign(item)">
             <p class="name" :style="`font-size:${changeNum(item.name)}px`">{{ item.name }}</p>
+            <p class="other">{{ item.school_name }}</p>
+            <p class="other">{{ getSchool(item.schid) }}</p>
+            <p class="other">{{ item.major }}</p>
+            <p class="other">毕业年份：{{ item.finish_year }}</p>
             <p class="job" v-if="item.job">{{ item.job }}<i class="el-icon-circle-check"></i></p>
           </el-col>
         </el-col>
@@ -60,15 +68,21 @@
 
 <script>
 import { mapState, createNamespacedHelpers, mapGetters } from 'vuex';
+
 export default {
   name: 'headStuList',
   props: {
-    headStuList: null,
+    // 学生信息
+    headStuList: { type: Array },
+    // 分组学生
     groupStuList: null,
+    // 未分组学生
     noGroupStuList: null,
     assignForm: null,
     assignShow: null,
     job_list: null,
+    // 学校列表
+    schoolList: { type: Array },
   },
   components: {},
   data: () => ({
@@ -79,9 +93,35 @@ export default {
   },
   computed: { ...mapState(['user']) },
   methods: {
+    // 过滤学校
+    getSchool(schid) {
+      let schoolInfo = this.schoolList.find(i => i.code == schid);
+      if (schoolInfo) return schoolInfo.level;
+    },
+    // 过滤学校
+    getGroupsch(stuid) {
+      let headStu = this.headStuList.find(i => i.id == stuid);
+      if (headStu) return headStu.school_name;
+    },
+    // 过滤专业
+    getmajor(stuid) {
+      let headStu = this.headStuList.find(i => i.id == stuid);
+      if (headStu) return headStu.major;
+    },
+    // 过滤毕业年份
+    getfinsh(stuid) {
+      let headStu = this.headStuList.find(i => i.id == stuid);
+      if (headStu) return headStu.finish_year;
+    },
+    // 过滤学校层次
+    getlevel(stuid) {
+      let headStu = this.headStuList.find(i => i.id == stuid);
+      if (headStu) {
+        let schoolInfo = this.schoolList.find(i => i.code == headStu.schid);
+        if (schoolInfo) return schoolInfo.level;
+      }
+    },
     changedisabled() {
-      console.log(this.user.type);
-
       if (this.user.type === '3') {
         this.disabled = true;
         console.log(this.disabled);
@@ -123,11 +163,14 @@ p {
 .list {
   text-align: center;
   border: 1px solid #2c69fe;
-  width: 70px;
-  margin: 0 11px 10px 12px;
-  padding: 5px 0px;
   border-radius: 10px;
-  height: 50px;
+  margin: 5px 7px;
+  p {
+    padding: 2px 0;
+  }
+}
+.list .other {
+  font-size: 14px;
 }
 .list .job {
   font-size: 10px;