Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius into master

src/pages/course/makeup.vue

@@ -172,7 +172,7 @@
           pageIndex: 1,
           pageSize: 12,
           rowsPerPage: 12,
-          MakeUpStatus: "", //(2-已处理，3-未处理)
+          MakeUpStatus: 3, //(2-已处理，3-未处理)
           GuestName: "", //学员名称
           ClassName: "", //班级名称
           CourseName: "", //课程名称
@@ -184,6 +184,9 @@
         pageCount: 0,
         isShowEdit: false, //是否显示修改
         statusList: [{
+            Id: -1,
+            Name: '全部'
+          },{
             Id: 2,
             Name: '已处理'
           },