Merge branch 'master' of http://git.cc-lotus.info/new_train/train-center

src/views/student/detail.vue

@@ -27,6 +27,14 @@
             <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>
+            <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>
@@ -83,7 +91,7 @@ export default {
       { label: '家庭所在地', required: false, model: 'family_place' },
       { label: '家庭是否困难', required: false, model: 'family_is_hard', type: 'radio' },
       { label: '是否获得过助学金', required: false, 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 },
@@ -116,6 +124,7 @@ export default {
       // class: [{ required: false, message: '请输入班级' }],
       is_fine: [{ required: false, message: '请选择是否优秀' }],
     },
+    jobList: [{ name: '' }],
   }),
   created() {
     this.otherList();