合并代码

src/components/Upload/index.vue

@@ -116,7 +116,7 @@ export default {
 
       }
       if (!isLt2M) {
-        this.$message.error(`上传图片大小不能超过 ${isLt2M}MB!`);
+        this.$message.error(`上传图片大小不能超过 ${this.imageSizeM}MB!`);
       }
       if (isImage && isLt2M && isSize) {
         this.uploadImgLoading = true

src/views/main/constant.js

@@ -47,7 +47,7 @@ export const descs = {
   NO_CLASS_MUSIC_GROUP_STUDENT_INFO: '进行中乐团不在班级中的在读学员提醒',
   COURSE_TIME_ERROR: '上课时间在00:00~06:00时间段内为时间安排异常',
   TOTAL_AMOUNT:'总收入：现金收入 + 余额收入',
-  STUDENT_ERROR_LEAVE: '一个月内请假2次及以上',
+  STUDENT_ERROR_LEAVE: '近两个月单月请假2次及以上',
   STUDENT_ARREARAGE: '缴费项目中的学员未缴费'
 }
 

src/views/main/modals/studentLeaveDetail.vue

@@ -15,7 +15,7 @@
           <el-option label="否" value="0"></el-option>
         </el-select>
       </el-form-item>
-      <el-form-item>
+      <el-form-item prop="courseType">
           <el-select
             v-model.trim="searchForm.courseType"
             clearable
@@ -97,7 +97,8 @@
             label="上课时间"
         >
             <template slot-scope="scope">
-                {{ scope.row.classDate + ' ' + scope.row.startClassTime.substr(0, 5) + '-' + scope.row.endClassTime.substr(0, 5) }}
+                <p>{{ scope.row.classDate  }}</p>
+                <p>{{ scope.row.startClassTime.substr(0, 5) + '-' + scope.row.endClassTime.substr(0, 5) }}</p>
             </template>
         </el-table-column>
         <el-table-column
@@ -131,6 +132,7 @@ export default {
     return {
         courseType,
         searchForm: {
+            search: null,
             leaveVisitFlag: null,
             courseType: null,
             userId: null

src/views/main/studentLeaveList.vue

@@ -21,10 +21,10 @@
                         placeholder="学员编号/姓名/手机号"
                     ></el-input>
                 </el-form-item>
-                <el-form-item prop="organIds">
+                <el-form-item prop="organId">
                     <el-select
                         placeholder="请选择分部"
-                        v-model="searchForm.organIds"
+                        v-model="searchForm.organId"
                         clearable
                     >
                         <el-option
@@ -127,7 +127,7 @@ export default {
             searchForm: {
                 search: null,
                 studentSearch: null,
-                organIds: null,
+                organId: null,
             },
             visitVisible: false,
             detail: null,
@@ -147,7 +147,7 @@ export default {
     mounted() {
         const { query } = this.$route
         if (query.organId) {
-            this.searchForm.organIds = Number(query.organId)
+            this.searchForm.organId = Number(query.organId)
         }
         this.$store.dispatch("setBranchs");