lrf402788946 4 years ago
parent
commit
2ed71f92c8
3 changed files with 19 additions and 23 deletions
  1. 10 10
      src/router/index.js
  2. 2 0
      src/store/index.js
  3. 7 13
      src/views/trainStudent/index.vue

+ 10 - 10
src/router/index.js

@@ -58,7 +58,7 @@ const routes = [
       },
       },
       //考勤
       //考勤
       {
       {
-        path: '/kaoqin/index',
+        path: '/train/plan/attendance',
         name: 'kaoqin_list',
         name: 'kaoqin_list',
         meta: { title: '考勤', sub: '管理' },
         meta: { title: '考勤', sub: '管理' },
         component: () => import('@/views/kaoqin/index.vue'),
         component: () => import('@/views/kaoqin/index.vue'),
@@ -83,7 +83,7 @@ const routes = [
         component: () => import('@/views/teacher/detail.vue'),
         component: () => import('@/views/teacher/detail.vue'),
       },
       },
       {
       {
-        path: '/leave/index',
+        path: '/train/plan/leave',
         name: 'leave_list',
         name: 'leave_list',
         meta: { title: '请假', sub: '管理' },
         meta: { title: '请假', sub: '管理' },
         component: () => import('@/views/leave/index.vue'),
         component: () => import('@/views/leave/index.vue'),
@@ -94,12 +94,12 @@ const routes = [
         meta: { title: '学生', sub: '信息' },
         meta: { title: '学生', sub: '信息' },
         component: () => import('@/views/leave/stud.vue'),
         component: () => import('@/views/leave/stud.vue'),
       },
       },
-      {
-        path: '/student/index',
-        name: 'student_index',
-        meta: { title: '学生', sub: '管理' },
-        component: () => import('@/views/student/index.vue'),
-      },
+      // {
+      //   path: '/student/index',
+      //   name: 'student_index',
+      //   meta: { title: '学生', sub: '管理' },
+      //   component: () => import('@/views/student/index.vue'),
+      // },
       {
       {
         path: '/student/detail',
         path: '/student/detail',
         name: 'student_detail',
         name: 'student_detail',
@@ -115,14 +115,14 @@ const routes = [
       // 08-23
       // 08-23
       // 培训学生管理
       // 培训学生管理
       {
       {
-        path: '/trainStudent/index',
+        path: '/student/index',
         name: 'trainStudent_index',
         name: 'trainStudent_index',
         meta: { title: '培训学生', sub: '管理' },
         meta: { title: '培训学生', sub: '管理' },
         component: () => import('@/views/trainStudent/index.vue'),
         component: () => import('@/views/trainStudent/index.vue'),
       },
       },
       // 09-16学校信息维护
       // 09-16学校信息维护
       {
       {
-        path: '/schoolInfo/index',
+        path: '/info',
         name: 'schoolInfo_index',
         name: 'schoolInfo_index',
         meta: { title: '信息维护', sub: '管理' },
         meta: { title: '信息维护', sub: '管理' },
         component: () => import('@/views/schoolInfo/index.vue'),
         component: () => import('@/views/schoolInfo/index.vue'),

+ 2 - 0
src/store/index.js

@@ -18,6 +18,7 @@ import classtype from '@frame/store/classtype';
 import school from '@frame/store/school';
 import school from '@frame/store/school';
 
 
 import util from '@frame/store/util';
 import util from '@frame/store/util';
+import userMenu from '@frame/store/auth/userMenu';
 import * as ustate from '@frame/store/user/state';
 import * as ustate from '@frame/store/user/state';
 import * as umutations from '@frame/store/user/mutations';
 import * as umutations from '@frame/store/user/mutations';
 import * as dostate from '@frame/store/setting/state';
 import * as dostate from '@frame/store/setting/state';
@@ -43,6 +44,7 @@ export default new Vuex.Store({
     trainBatch,
     trainBatch,
     classtype,
     classtype,
     school,
     school,
+    userMenu,
   },
   },
   state: { ...ustate, ...dostate },
   state: { ...ustate, ...dostate },
   mutations: { ...umutations, ...domutations },
   mutations: { ...umutations, ...domutations },

+ 7 - 13
src/views/trainStudent/index.vue

@@ -2,15 +2,8 @@
   <div id="index">
   <div id="index">
     <list-frame title="培训学生管理" @query="onsearch" :total="total" :needFilter="false" :needAdd="false">
     <list-frame title="培训学生管理" @query="onsearch" :total="total" :needFilter="false" :needAdd="false">
       <el-form :inline="true" size="mini">
       <el-form :inline="true" size="mini">
-        <el-form-item label="期">
-          <el-select v-model="form.termid" placeholder="请选择期数" @change="getClass">
-            <el-option v-for="(i, index) in termList" :key="index" :label="`第${i.term}期`" :value="i._id"></el-option>
-          </el-select>
-        </el-form-item>
-        <el-form-item label="班级">
-          <el-select v-model="form.classid" placeholder="请先选择批次">
-            <el-option v-for="(i, index) in classList" :key="index" :label="i.name" :value="i._id"></el-option>
-          </el-select>
+        <el-form-item label="姓名">
+          <el-input size="small" v-model="form.name" placeholder="请输入学校姓名"></el-input>
         </el-form-item>
         </el-form-item>
         <el-form-item label="">
         <el-form-item label="">
           <el-button type="primary" size="mini" @click="onsearch()"> 查询</el-button>
           <el-button type="primary" size="mini" @click="onsearch()"> 查询</el-button>
@@ -48,11 +41,10 @@ export default {
         { label: '性别', prop: 'gender' },
         { label: '性别', prop: 'gender' },
         { label: '民族', prop: 'nation' },
         { label: '民族', prop: 'nation' },
         { label: '身份证号', prop: 'id_number' },
         { label: '身份证号', prop: 'id_number' },
-        { label: '学校', prop: 'school_name' },
         { label: '手机号', prop: 'phone' },
         { label: '手机号', prop: 'phone' },
         { label: 'QQ号', prop: 'qq' },
         { label: 'QQ号', prop: 'qq' },
         { label: '邮箱', prop: 'email' },
         { label: '邮箱', prop: 'email' },
-        { label: '职务', prop: 'job' },
+        { label: '培训期间职务', prop: 'job' },
         // { label: '期', prop: 'termname' },
         // { label: '期', prop: 'termname' },
         // { label: '批次', prop: 'batchname' },
         // { label: '批次', prop: 'batchname' },
         // { label: '班级', prop: 'classname' },
         // { label: '班级', prop: 'classname' },
@@ -64,7 +56,9 @@ export default {
       options: undefined,
       options: undefined,
     };
     };
   },
   },
-  created() {},
+  created() {
+    this.onsearch();
+  },
   methods: {
   methods: {
     ...trainplan({ schPlanquery: 'query', planFetch: 'fetch' }),
     ...trainplan({ schPlanquery: 'query', planFetch: 'fetch' }),
     ...classes({ classesquery: 'query' }),
     ...classes({ classesquery: 'query' }),
@@ -80,7 +74,7 @@ export default {
       if (this.$checkRes(res)) this.$set(this, `classList`, res.data);
       if (this.$checkRes(res)) this.$set(this, `classList`, res.data);
     },
     },
     async onsearch({ skip = 0, limit = 10, ...info } = {}) {
     async onsearch({ skip = 0, limit = 10, ...info } = {}) {
-      const res = await this.stuquery({ skip, limit, classid: this.form.classid, ...info });
+      const res = await this.stuquery({ skip, limit, ...info, schid: this.user.code });
       if (this.$checkRes(res)) this.$set(this, `list`, res.data);
       if (this.$checkRes(res)) this.$set(this, `list`, res.data);
       this.$set(this, `total`, res.total);
       this.$set(this, `total`, res.total);
     },
     },