فهرست منبع

学生管理:删除批次查询条件;
打印证书:打印日期为班级的结束日期

lrf402788946 5 سال پیش
والد
کامیت
6fc870a757
3فایلهای تغییر یافته به همراه14 افزوده شده و 32 حذف شده
  1. 3 11
      src/views/new-plan/arrange/school-arrange.vue
  2. 5 17
      src/views/student/index.vue
  3. 6 4
      src/views/train-plan/print.vue

+ 3 - 11
src/views/new-plan/arrange/school-arrange.vue

@@ -14,17 +14,9 @@
             <el-button type="primary" size="mini" plain @click="dialog = true">查看汇总</el-button>
           </el-col>
         </el-row>
-        <el-table
-          :data="list"
-          border
-          stripe
-          size="mini"
-          max-height="650px"
-          @cell-click="cellClick"
-          :cell-style="cellStyle"
-          :cell-class-name="cellClass"
-          v-if="already"
-        >
+        <el-table :data="list" border stripe size="mini" max-height="650px" @cell-click="cellClick" :show-summary="true" v-if="already">
+          <!-- :cell-style="cellStyle"
+          :cell-class-name="cellClass" -->
           <el-table-column label="学校" fixed align="center" prop="name" width="180">
             <template v-slot="{ row }">
               <el-row>

+ 5 - 17
src/views/student/index.vue

@@ -3,15 +3,10 @@
     <list-frame title="学生管理" @query="search" :total="total" :needFilter="false" @add="$router.push({ path: '/student/detail' })">
       <el-form :inline="true" size="mini">
         <el-form-item label="期">
-          <el-select v-model="form.termid" placeholder="请选择期数" @change="getBatch">
+          <el-select v-model="form.termid" placeholder="请选择期数" @change="getClasses">
             <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.batchid" placeholder="请先选择期数" @change="getClasses">
-            <el-option v-for="(i, index) in batchList" :key="index" :label="i.name" :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>
@@ -130,18 +125,11 @@ export default {
       this.$set(this, `termList`, terms);
       if (this.defaultOption.termid) {
         this.form.termid = this.defaultOption.termid;
-        this.getBatch(this.form.termid);
-      }
-    },
-    getBatch(termid) {
-      let batchs = this.termList.filter(f => f._id === termid);
-      if (batchs.length > 0) {
-        let { batchnum } = batchs[0];
-        this.$set(this, `batchList`, batchnum);
+        this.getClasses(this.form.termid);
       }
     },
-    async getClasses(batchid) {
-      const res = await this.classesquery({ batchid });
+    async getClasses(termid) {
+      const res = await this.classesquery({ termid });
       this.$set(this, `classList`, res.data);
     },
     async toTurnClass({ data }) {
@@ -169,7 +157,7 @@ export default {
     defaultOption: {
       handler(val) {
         this.form.termid = this.defaultOption.termid;
-        this.getBatch(this.form.termid);
+        this.getClasses(this.form.termid);
       },
       deep: true,
     },

+ 6 - 4
src/views/train-plan/print.vue

@@ -38,7 +38,7 @@
       <name-card v-loading="loading" :list="studList"></name-card>
     </detail-frame>
     <detail-frame title="打印证书" v-if="view == 'certList'" :returns="toReturns">
-      <cert-card :list="studList" :startdate="startdate"></cert-card>
+      <cert-card :list="studList" :startdate="startdate" :enddate="enddate"></cert-card>
     </detail-frame>
     <detail-frame title="学生报道表" v-if="view == 'signList'" :returns="toReturns">
       <sign-list v-loading="loading" :list="studList"></sign-list>
@@ -107,6 +107,7 @@ export default {
       //打印数据
       studList: [],
       startdate: '',
+      enddate: '',
       classInfo: {},
       lth: [], //table表头
       ltr: [], //table y轴
@@ -118,7 +119,7 @@ export default {
   },
   methods: {
     ...trainplan({ planfetch: 'fetch' }),
-    ...classes({ classesquery: 'query' }),
+    ...classes({ classesquery: 'query', classFetch: 'fetch' }),
     ...student({ getStudentList: 'query' }),
     ...util({ modelFetch: 'fetch' }),
     ...location({ getLocation: 'fetch' }),
@@ -183,11 +184,12 @@ export default {
       this.loading = false;
     },
     async certList({ data }) {
-      let { _id: classid } = data;
+      let { _id: classid, enddate, startdate } = data;
       let res = await this.getStudentList({ classid });
       if (this.$checkRes(res)) {
         this.$set(this, `studList`, res.data);
-        this.$set(this, `startdate`, data.startdate);
+        this.$set(this, `startdate`, startdate);
+        this.$set(this, `enddate`, enddate);
       }
       this.view = 'certList';
     },