Merge branch '02/23reviewBUG' into jenkins

src/views/reportForm/index.vue

@@ -797,6 +797,7 @@
               range-separator="至"
               start-placeholder="开始日期"
               end-placeholder="结束日期"
+              :clearable="false"
               :picker-options="{
                 firstDayOfWeek: 1,
               }"
@@ -1107,7 +1108,7 @@ export default {
       operatingMouth: "",
       cloudTimer: [],
       yunOrganId:[],
-      yunTimer:[]
+      yunTimer:[dayjs().set('date', 1).format('YYYY-MM-DD'),dayjs().format('YYYY-MM-DD')]
     };
   },
   mounted() {

src/views/smallCourseConsumption/modals/actualDetail.vue

@@ -41,7 +41,7 @@
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       >
         <el-table-column prop="username" label="学生姓名"></el-table-column>
-        <el-table-column prop="userId" label="学生姓名"></el-table-column>
+        <el-table-column prop="userId" label="学生编号"></el-table-column>
         <el-table-column prop="phone" label="手机号"></el-table-column>
         <el-table-column prop="preConsumerNum" label="应耗课时">
         <template slot-scope="scope">

src/views/smallCourseConsumption/modals/preDetail.vue

@@ -41,7 +41,7 @@
         :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
       >
         <el-table-column prop="username" label="学生姓名"></el-table-column>
-        <el-table-column prop="userId" label="学生姓名"></el-table-column>
+        <el-table-column prop="userId" label="学生编号"></el-table-column>
         <el-table-column prop="phone" label="手机号"></el-table-column>
         <el-table-column prop="preConsumerNum" label="应耗课时">
         <template slot-scope="scope">