update

src/views/student/detail.vue

@@ -67,22 +67,22 @@ export default {
     classList: [],
     info: {},
     fields: [
-      { label: '姓名', required: true, model: 'name' },
-      { label: '性别', required: true, model: 'gender', type: 'radio' },
-      { label: '民族', required: true, model: 'nation', type: 'select' },
-      { label: '身份证号', required: true, model: 'id_number', options: { maxlength: 18 } },
-      { label: '学校', required: true, model: 'school_name', type: 'select' },
-      { label: '院系', required: true, model: 'faculty' },
-      { label: '专业', required: true, model: 'major' },
-      { label: '入学年份', required: true, model: 'entry_year', type: 'year' },
-      { label: '毕业年份', required: true, model: 'finish_year', type: 'year' },
+      { label: '姓名', required: false, model: 'name' },
+      { label: '性别', required: false, model: 'gender', type: 'radio' },
+      { label: '民族', required: false, model: 'nation', type: 'select' },
+      { label: '身份证号', required: false, model: 'id_number', options: { maxlength: 18 } },
+      { label: '学校', required: false, model: 'school_name', type: 'select' },
+      { label: '院系', required: false, model: 'faculty' },
+      { label: '专业', required: false, model: 'major' },
+      { label: '入学年份', required: false, model: 'entry_year', type: 'year' },
+      { label: '毕业年份', required: false, model: 'finish_year', type: 'year' },
       { label: '在校曾担任何种职务', model: 'school_job' },
-      { label: '手机号', required: true, model: 'phone', options: { maxlength: 11, minlength: 11 } },
-      { label: 'QQ号', required: true, model: 'qq' },
-      { label: '邮箱', required: true, model: 'email' },
-      { label: '家庭所在地', required: true, model: 'family_place' },
-      { label: '家庭是否困难', required: true, model: 'family_is_hard', type: 'radio' },
-      { label: '是否获得过助学金', required: true, model: 'have_grant', type: 'radio' },
+      { label: '手机号', required: false, model: 'phone', options: { maxlength: 11, minlength: 11 } },
+      { label: 'QQ号', required: false, model: 'qq' },
+      { label: '邮箱', required: false, model: 'email' },
+      { 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: 'termid', type: 'select', filterReturn: true },
       { label: '批次', model: 'batchid', type: 'select', filterReturn: true },
@@ -90,31 +90,31 @@ export default {
       { label: '是否优秀', model: 'is_fine', type: 'radio' },
     ],
     rules: {
-      name: [{ required: true, message: '请输入姓名' }],
-      gender: [{ required: true, message: '请选择性别' }],
-      // nation: [{ required: true, message: '请选择民族' }],
+      name: [{ required: false, message: '请输入姓名' }],
+      gender: [{ required: false, message: '请选择性别' }],
+      // nation: [{ required: false, message: '请选择民族' }],
       id_number: [
-        { required: true, message: '请输入身份证号' },
+        { required: false, message: '请输入身份证号' },
         { min: 18, max: 18, message: '请输入18位身份证号码', trigger: 'blur' },
       ],
-      // school_name: [{ required: true, message: '请选择学校' }],
-      // yard: [{ required: true, message: '请选择院系' }],
-      // major: [{ required: true, message: '请选择专业' }],
-      entry_year: [{ required: true, message: '请选择入学年份' }],
-      finish_year: [{ required: true, message: '请选择毕业年份' }],
+      // school_name: [{ required: false, message: '请选择学校' }],
+      // yard: [{ required: false, message: '请选择院系' }],
+      // major: [{ required: false, message: '请选择专业' }],
+      entry_year: [{ required: false, message: '请选择入学年份' }],
+      finish_year: [{ required: false, message: '请选择毕业年份' }],
       phone: [
-        { required: true, message: '请输入手机号' },
+        { required: false, message: '请输入手机号' },
         { min: 11, max: 11, message: '请输入11位手机号码', trigger: 'blur' },
       ],
-      qq: [{ required: true, message: '请输入QQ号' }],
-      email: [{ required: true, message: '请输入邮箱' }],
-      family_place: [{ required: true, message: '请输入家庭所在地' }],
-      family_is_hard: [{ required: true, message: '请选择家庭是否困难' }],
-      have_grant: [{ required: true, message: '请选择是否获得过助学金' }],
-      // term: [{ required: true, message: '请输入期号' }],
-      // batch: [{ required: true, message: '请输入批次' }],
-      // class: [{ required: true, message: '请输入班级' }],
-      is_fine: [{ required: true, message: '请选择是否优秀' }],
+      qq: [{ required: false, message: '请输入QQ号' }],
+      email: [{ required: false, message: '请输入邮箱' }],
+      family_place: [{ required: false, message: '请输入家庭所在地' }],
+      family_is_hard: [{ required: false, message: '请选择家庭是否困难' }],
+      have_grant: [{ required: false, message: '请选择是否获得过助学金' }],
+      // term: [{ required: false, message: '请输入期号' }],
+      // batch: [{ required: false, message: '请输入批次' }],
+      // class: [{ required: false, message: '请输入班级' }],
+      is_fine: [{ required: false, message: '请选择是否优秀' }],
     },
   }),
   created() {

src/views/train-plan/class-lesson.vue

@@ -93,7 +93,7 @@ export default {
         if (this.$checkRes(res)) this.$set(this, `locationList`, res.data);
       }
       if (this.lyTeacherList.length <= 0) {
-        res = await this.getTeacherList({ islyteacher: '1', status: '4' });
+        res = await this.getTeacherList(); //islyteacher: '1',
         if (this.$checkRes(res)) this.$set(this, `lyTeacherList`, res.data);
       }
       if (this.headTeacherList.length <= 0) {
@@ -118,7 +118,7 @@ export default {
           });
           this.$set(this, `headTeacherList`, arr);
           //班主任筛选可以当礼仪老师列表,和 礼仪教师列表合并
-          duplicate = duplicate.filter(f => f.islyteacher == '1');
+          // duplicate = duplicate.filter(f => f.islyteacher == '1');
           this.$set(this, `lyTeacherList`, [...this.lyTeacherList, ...duplicate]);
         }
       }

src/views/train-plan/parts/class-table.vue

@@ -152,6 +152,7 @@ export default {
     ...teacher({ getTeacher: 'query', lessonteafetch: 'lessonteafetch' }),
     ...school({ getSchool: 'query' }),
     async search() {
+      await this.getNoticeList();
       let res = await this.fetch({ model: 'lesson', classid: _.get(this.classInfo, '_id') });
       if (this.$checkRes(res)) {
         if (!_.get(res.data, 'lessons') || res.data.lessons.length <= 0) {
@@ -361,9 +362,9 @@ export default {
     async getOtherList() {
       let res = await this.getSubject();
       if (this.$checkRes(res)) this.$set(this, `subjectList`, res.data);
-      // res = await this.getTeacher({ status: '4' });
-      // if (this.$checkRes(res)) this.$set(this, `teacherList`, res.data);
-      res = await this.fetch({ model: 'notice', classid: this.classInfo.id, type: '4', planid: this.classInfo.planid, termid: this.classInfo.termid });
+    },
+    async getNoticeList() {
+      let res = await this.fetch({ model: 'notice', classid: this.classInfo.id, type: '4', planid: this.classInfo.planid, termid: this.classInfo.termid });
       if (this.$checkRes(res)) this.$set(this, `noticeList`, res.data);
     },
     // 教师列表