班主任分班mock

mock/modules/elective-dispatch.js

@@ -33,9 +33,13 @@ module.exports = [
         code: 200,
         msg: 'success',
         data: {
-          '407': {
-            userId: 0,  // 老师用户ID
-            nickName: '张老师' // 老师称乎
+          '405': {
+            headteacherCode: '72b034d5ee7642ae90af044098f524ff',  // 老师用户ID
+            nickName: '王铭传' // 老师称乎
+          },
+          '406': {
+            headteacherCode: '72b034d5ee7642ae90af044098f524ff',  // 老师用户ID
+            nickName: '曾老师' // 老师称乎
           }
         }
       }

src/api/webApi/elective/dispatch.js

@@ -65,6 +65,7 @@ export function lockDispatch(params) {
   })
 }
 
+// 所属组合班级
 export function getClass(params) {
   return request({
     url: '/front/elective/classes/list',
@@ -73,9 +74,19 @@ export function getClass(params) {
   })
 }
 
-export function getDispatchResult(params) {
+// mock 学生分班详情
+// export function getDispatchResult(params) {
+//   return request({
+//     url: '/mock/front/report/getDispatchResult',
+//     method: 'get',
+//     params
+//   })
+// }
+
+// 班主任分班settings   mock
+export function getHeadteacherDispatchSettings(params) {
   return request({
-    url: '/mock/front/report/getDispatchResult',
+    url: '/mock/front/dispatch/getHeadteacherDispatchSettings',
     method: 'get',
     params
   })

src/views/elective/master/components/choose-class.vue

@@ -34,6 +34,7 @@ export default{
   computed: {
     classes() {
       if (!this.classTree.length) return []
+      if (!this.year) return []
       return this.classTree.find(item => item.year == this.year).classList
     }
   },
@@ -49,7 +50,7 @@ export default{
       this.dialogVisible = true
       this.activeClass= row
       // console.log(row)
-      this.value = row.newClassId || row.prevClassId
+      this.value = row.classId
     }
   }
 }

src/views/elective/master/index.vue

@@ -29,11 +29,12 @@
       </div>
       <evaluation-empty v-else-if="!queryParams.roundId" shadow title="当前学年没有班主任选班数据"></evaluation-empty>
     </el-card>
-<!--    <choose-master-teacher ref="chooseMasterTeacher"></choose-master-teacher>-->
+    <choose-master-teacher ref="chooseMasterTeacher"></choose-master-teacher>
     <choose-class ref="chooseClass" :year="queryParams.year"></choose-class>
   </div>
 </template>
 <script>
+import {getHeadteacherDispatchSettings} from  '@/api/webApi/elective/dispatch'
 import ChooseMasterTeacher from './components/choose-master-teacher'
 import classTreeMixin from '@/components/Cache/modules/mx-classTree-translate-mixin'
 import ChooseClass from './components/choose-class'
@@ -64,7 +65,7 @@ export default  {
         newClassName:{
           label:'新班级号'
         },
-        newMasterName:{
+        newHeadteacherName:{
           label:'新班主任姓名'
         },
         cancel: {
@@ -80,17 +81,21 @@ export default  {
         year: '',
         roundId: '',
       },
+      headteacherSettings: { },
     }
   },
   computed:{
     formatRows() {
       if(!this.classTree) return []
       if(!this.queryParams.year) return []
-
+      const headteacherSettings =  this.headteacherSettings
       return this.classTree.find(item => {
         return item.year == this.queryParams.year
       })?.classList.map(item => {
+        console.log(headteacherSettings.hasOwnProperty(item.classId))
         item.year = this.queryParams.year
+        item.newClassName = headteacherSettings.hasOwnProperty(item.classId) ? this.getClassName(item.classId) : ''    // 新班级名称
+        item.newHeadteacherName = headteacherSettings.hasOwnProperty(item.classId) ? headteacherSettings[item.classId].nickName  : ''    // 新班主任名称
         return item
       })
     }
@@ -98,6 +103,12 @@ export default  {
   methods: {
     keepAll() {
 
+    },
+    getHeadteacherSettings() {
+      getHeadteacherDispatchSettings().then(res => {
+        console.log(res.data)
+        this.headteacherSettings  =res.data
+      })
     },
     send() {
       const isSend = this.rows.filter(item => {
@@ -115,6 +126,7 @@ export default  {
     },
     handleQuery() {
       // 获取班主任 settings
+      this.getHeadteacherSettings()
     },
     changeMaster(){
       this.$refs.chooseMasterTeacher.dialogVisible = true
@@ -123,7 +135,7 @@ export default  {
       this.$refs.chooseClass.init(row)
     },
     handleInvalidQuery() {
-      this.dataList = []
+      this.headteacherSettings = []
     },
   }