Merge branch 'ol_12_30' into online

src/views/businessManager/resetList/index.vue

@@ -148,16 +148,13 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            prop="studentId"
-            label="原教辅"
-            :formatter="
-              (row) => {
-                return accessoriesFormatter(row.originalAccessoriesGoods);
-              }
-            "
-          >
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="原教辅">
+                           <!-- :formatter="(row)=>{return accessoriesFormatter(row.originalAccessoriesGoods)}" -->
+            <template slot-scope="scope">
+              <overflow-text width="100%" :text="accessoriesFormatter(scope.row.originalAccessoriesGoods)"></overflow-text>
+            </template>
           </el-table-column>
           <el-table-column
             align="center"
@@ -177,16 +174,16 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column
-            align="center"
-            label="更换教辅"
-            :formatter="
-              (row) => {
-                return accessoriesFormatter(row.changeAccessoriesGoods);
-              }
-            "
-          ></el-table-column>
-          <el-table-column align="center" prop="studentId" label="差价(元)">
+          <el-table-column align="center"
+                           label="更换教辅">
+            <!-- :formatter="(row)=>{return accessoriesFormatter(row.changeAccessoriesGoods)}" -->
+            <template slot-scope="scope">
+              <overflow-text width="100%" :text="accessoriesFormatter(scope.row.changeAccessoriesGoods)"></overflow-text>
+            </template>
+          </el-table-column>
+          <el-table-column align="center"
+                           prop="studentId"
+                           label="差价(元)">
             <template slot-scope="scope">
               <div>
                 {{

src/views/editionManager/editionList.vue

@@ -57,7 +57,11 @@
           </el-table-column>
           <el-table-column align="center"
                            prop="description"
-                           label="描述"></el-table-column>
+                           label="描述">
+            <template slot-scope="scope">
+              <overflow-text :text="scope.row.description"></overflow-text>
+            </template>
+          </el-table-column>
           <el-table-column align="center"
                            prop="downloadUrl"
                            width="120"
@@ -243,8 +247,6 @@ export default {
     createEdition () {
       this.$refs.sectionForm.validate(v => {
         if (v) {
-          console.log(this.sectionForm)
-          return
           addAppVersionInfo(this.sectionForm).then(res => {
             if (res.code == 200) {
               this.$message.success('新增成功')

src/views/stuRecodeManager/index.vue

@@ -130,7 +130,12 @@
             prop="courseSchedule.organization.name"
             label="分部"
           ></el-table-column>
-          <el-table-column align="center" prop="username" label="学生姓名">
+          <el-table-column
+            align="center"
+            prop="username"
+            label="学生姓名"
+            width="110px"
+          >
             <template slot-scope="scope">
               <div>
                 {{ scope.row.username }}
@@ -144,6 +149,7 @@
           <el-table-column
             align="center"
             prop="courseSchedule.teacherName"
+            width="120px"
             label="老师姓名"
           >
             <template slot-scope="scope">
@@ -178,24 +184,26 @@
             prop="courseSchedule.name"
             label="课程名称"
           ></el-table-column>
-          <el-table-column
+          <!-- <el-table-column
             align="center"
             prop="courseSchedule.classDate"
             label="上课日期"
           >
             <template slot-scope="scope">
               <div>
-                {{ scope.row.courseSchedule.classDate | dayjsFormat }}
+
               </div>
             </template>
-          </el-table-column>
+          </el-table-column> -->
           <el-table-column
+          width="180px"
             align="center"
             prop="startClassTime"
             label="上课时间"
           >
             <template slot-scope="scope">
               <div>
+                   {{ scope.row.courseSchedule.classDate | dayjsFormat }}
                 {{
                   scope.row.courseSchedule.startClassTime | dayjsFormatMinute
                 }}-{{
@@ -319,6 +327,9 @@ export default {
   created() {},
   //生命周期 - 挂载完成（可以访问DOM元素）
   mounted() {
+    if (this.searchForm.dates?.length < 1) {
+        this.searchForm.dates = [new Date(),new Date()]
+    }
     this.init();
   },
 
@@ -328,12 +339,13 @@ export default {
       this.getList();
     },
     getList() {
-      let { dates, ...rest } = this.searchForm;
-      let params = {
+      const { dates, ...rest } = this.searchForm;
+      let obj =  {
         ...rest,
         page: this.rules.page,
         rows: this.rules.limit,
-        ...getTimes(dates, ["startDateOfCourse", "endDateOfCourse"]),
+        ...getTimes(dates, ["startDateOfCourse", "endDateOfCourse"],  "YYYY-MM-DD"),
+
       };
 
       // let obj = {