Merge branch 'master' of http://121.4.203.192:9000/mingxue/front

src/views/elective/dispatch/master/index.vue

@@ -134,6 +134,13 @@ export default {
       })
     },
     async keepAll() {
+      // 是否含有原班级班主
+      const isExist = this.classList.filter(item =>  {
+        return item.headteacherCode}).length > 0
+      if(!isExist) {
+        this.$message.warning('没有原班级班主任')
+        return
+      }
       if (this.headteacherSettings && Object.keys(this.headteacherSettings).length > 0) {
         await this.$confirm(`一键维持原班级会覆盖您之前的设置，是否继续?`)
         this.keepAllOfTeacher()

src/views/elective/dispatch/student/components/set-classcount.vue

@@ -142,15 +142,16 @@ export default {
         return
       }
       // 没有setting就初始化人数
+      console.log('初始化')
       const remainder = roundGroup.number % roundGroup.classCount // 余数
       const divide = Math.floor(roundGroup.number / roundGroup.classCount) // 向下取整的除数
       this.settingContainer = settingContainer.filter(item => item.groupId == roundGroup.groupId).map((item,index)  => {
         if (index + 1 <= remainder) {
           // 余数平分给前面
-          item.expectedCount = divide + 1
+          item.actualCount = divide + 1
         }else {
           // 余数分完
-          item.expectedCount = divide
+          item.actualCount = divide
         }
         return item
         console.log(item)