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

src/router/index.js

@@ -771,7 +771,7 @@ export const constantRoutes = [{
       },
       {
         path: '/elective/dispatch/detail',
-        component: (resolve) => require(['@/views/elective/dispatch/detail'], resolve),
+        component: (resolve) => require(['@/views/elective/dispatch/student/detail'], resolve),
         name: 'DispatchDetail',
         meta: {
           title: '分班详情'

src/views/elective/dispatch/master/info/self.vue

@@ -0,0 +1,71 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card mb10">
+      <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
+                    @invalid="handleInvalidQuery"
+      ></mx-condition>
+    </el-card>
+    <!--   班主任查看  -->
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <p class="f20 text-center">凤凰中学2021级2101班分班信息 张兰老师</p>
+      </div>
+      <div>
+        <p class="mb10 f14">备注：<span class="f-red">请通知学生按照学校规定到新班级报道</span></p>
+        <mx-table :prop-defines="propDefines" :rows="rows">
+          <template #tmp="{row}">
+            <el-button type="primary">通知</el-button>
+          </template>
+        </mx-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+import MxCondition from '@/components/MxCondition/mx-condition'
+
+export default {
+  components: { MxCondition },
+  data() {
+    return {
+      requireFields: ['year', 'roundId'],
+      queryParams: {
+        year: '',
+        roundId: ''
+      },
+      propDefines: {
+        name: {
+          label: '学年'
+        },
+        oldClass: {
+          label: '原班级'
+        },
+        group: {
+          label: ' 原班主任姓名'
+        },
+        newClass: {
+          label: '新班级'
+        },
+        tips: {
+          label: ' 新班主任姓名'
+        },
+        time: {
+          label: '是否更换'
+        },
+      },
+      rows: []
+    }
+  },
+  methods: {
+    handleQuery() {
+    },
+    handleInvalidQuery() {
+      console.log('query取消')
+      this.round = {}
+    }
+  }
+}
+</script>
+<style>
+
+</style>

src/views/elective/dispatch/master/info/student.vue

@@ -0,0 +1,76 @@
+<template>
+  <div class="app-container">
+    <el-card class="box-card mb10">
+      <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
+                    @invalid="handleInvalidQuery"
+      ></mx-condition>
+    </el-card>
+    <!--   班主任查看  -->
+    <el-card class="box-card">
+      <div slot="header" class="clearfix">
+        <span class="f20">凤凰中学2021级2101班分班信息</span>
+        <el-button style="float: right; padding: 3px 0" type="text">打印</el-button>
+      </div>
+      <div>
+        <p class="mb10 f14">备注：<span class="f-red">请通知学生按照学校规定到新班级报道</span></p>
+        <mx-table :prop-defines="propDefines" :rows="rows">
+          <template #tmp="{row}">
+            <el-button type="primary">通知</el-button>
+          </template>
+        </mx-table>
+      </div>
+    </el-card>
+  </div>
+</template>
+<script>
+import MxCondition from '@/components/MxCondition/mx-condition'
+
+export default {
+  components: { MxCondition },
+  data() {
+    return {
+      requireFields: ['year', 'roundId'],
+      queryParams: {
+        year: '',
+        roundId: ''
+      },
+      propDefines: {
+        name: {
+          label: '姓名'
+        },
+        oldClass: {
+          label: '原班级'
+        },
+        newClass: {
+          label: '新班级'
+        },
+        group: {
+          label: '录取组合'
+        },
+        tips: {
+          label: '新班报班主任'
+        },
+        time: {
+          label: '分班信息生效时间'
+        },
+        tmp: {
+          label: '操作',
+          slot: 'tmp'
+        }
+      },
+      rows: []
+    }
+  },
+  methods: {
+    handleQuery() {
+    },
+    handleInvalidQuery() {
+      console.log('query取消')
+      this.round = {}
+    }
+  }
+}
+</script>
+<style>
+
+</style>

src/views/elective/dispatch/components/edit-group.vue → src/views/elective/dispatch/student/components/edit-group.vue

@@ -27,8 +27,8 @@
 </template>
 <script>
 
-import ChooseClass from '@/views/elective/dispatch/components/choose-class'
-import SetClasscount from '@/views/elective/dispatch/components/set-classcount'
+import ChooseClass from '@/views/elective/dispatch/student/components/choose-class'
+import SetClasscount from '@/views/elective/dispatch/student/components/set-classcount'
 
 export default {
   props: {

src/views/elective/dispatch/detail.vue → src/views/elective/dispatch/student/detail.vue

@@ -21,7 +21,7 @@
 import MxSelectTranslateMixin from '@/components/Cache/modules/mx-select-translate-mixin.js'
 import MxCondition from '@/components/MxCondition/mx-condition'
 import MxTransferMixin from '@/components/mx-transfer-mixin.js'
-import ClassTable from '@/views/elective/dispatch/components/class-table'
+import ClassTable from '@/views/elective/dispatch/student/components/class-table'
 import { classesResult } from '@/api/webApi/elective/dispatch'
 import { mapGetters } from 'vuex'
 

src/views/elective/dispatch/index.vue → src/views/elective/dispatch/student/index.vue

@@ -1,6 +1,6 @@
 <template>
   <div class="app-container">
-    <el-card class="box-card" style="margin-bottom: 10px;">
+    <el-card class="box-card mb10">
       <mx-condition ref="condition" :query-params="queryParams" :require-fields="requireFields" @query="handleQuery"
                     @invalid="handleInvalidQuery"
       ></mx-condition>