lrf402788946 5 years ago
parent
commit
a180a8f3cb
2 changed files with 10 additions and 4 deletions
  1. 4 3
      src/views/new-plan/classInfo.vue
  2. 6 1
      src/views/new-plan/studentCheck.vue

+ 4 - 3
src/views/new-plan/classInfo.vue

@@ -60,11 +60,12 @@ export default {
     async search({ skip = 0, limit = 10, ...info } = {}) {
       let termid = _.get(this.defaultOption, 'termid');
       let classid = _.get(this.defaultOption, 'classid');
-      const res = await this.query({ termid: termid, classid: classid, ...info });
+      const res = await this.query({ termid: termid, classid: classid, ...info, skip, limit });
       if (this.$checkRes(res)) {
-        var arr = res.data.filter(item => item.status == '0');
+        var arr = res.data;
+        //.filter(item => item.status == '0');
         this.$set(this, `list`, arr);
-        this.$set(this, `total`, arr.length);
+        this.$set(this, `total`, res.total);
       }
     },
     // 确定

+ 6 - 1
src/views/new-plan/studentCheck.vue

@@ -12,6 +12,11 @@
             <el-radio label="男">男</el-radio>
             <el-radio label="女">女</el-radio>
           </template>
+          <template v-else-if="item.model === 'job'">
+            <el-radio label="班长">班长</el-radio>
+            <el-radio label="学委">学委</el-radio>
+            <el-radio label="普通学生">普通学生</el-radio>
+          </template>
           <template v-else>
             <el-radio label="1">是</el-radio>
             <el-radio label="0">否</el-radio>
@@ -59,7 +64,7 @@ export default {
       { label: '家庭所在地', required: true, model: 'family_place' },
       { label: '家庭是否困难', required: true, model: 'family_is_hard', type: 'radio' },
       { label: '是否获得过助学金', required: true, model: 'have_grant', type: 'radio' },
-      { label: '职务', model: 'job' },
+      { label: '职务', model: 'job', type: 'radio' },
       { label: '期', model: 'termid', type: 'select', filterReturn: true },
       { label: '批次', model: 'batchid', type: 'select', filterReturn: true },
       { label: '班级', model: 'classid', type: 'select', filterReturn: true },