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

src/pages/course/classManage.vue

@@ -63,6 +63,12 @@
             <q-btn color="accent" size="sm" class="q-mr-md" icon="add" label="新增班级" @click="EditCourse(null)" />
           </div>
         </template>
+        <template v-slot:body-cell-CourseId="props">
+          <q-td auto-width :props="props">
+            <span style="color:blue;cursor:pointer;" @click="goChapter(props.row.CouseId)">详情</span>
+          </q-td>
+        </template>
+
         <template v-slot:body-cell-ClassName="props">
           <q-td auto-width :props="props">
             <div style="display: flex;align-items: center;">
@@ -262,6 +268,12 @@
             field: 'OtherCourseName',
             align: 'left'
           },
+          {
+            name: 'CourseId',
+            label: '课程大纲',
+            field: 'CourseId',
+            align: 'left'
+          },
           {
             name: 'TeacherName',
             label: '带班老师',
@@ -280,6 +292,12 @@
             field: 'OpenTime',
             align: 'left'
           },
+          {
+            name: 'FinishTimeStr',
+            label: '预计结束时间',
+            field: 'FinishTimeStr',
+            align: 'left'
+          },
           {
             name: 'CompleteProgress',
             label: '课程进度',
@@ -522,6 +540,12 @@
           ClassId: row.ClassId,
           ClassName: ClassName,
         });
+      },
+      //跳转到课程大纲
+      goChapter(CouseId){
+        this.OpenNewUrl('/course/chapter' , {
+          CourseId: CouseId
+        });
       }
     }
   }

src/pages/sale/japaneseTrain.vue

@@ -223,6 +223,9 @@
                     </q-banner>
                   </q-popup-proxy>
                 </div>
+                <div>
+                  <span style="color:blue;cursor:pointer;" @click="goChapter(item.CouseId)">课程大纲</span>
+                </div>
               </div>
               <div class="d3">
                 <div style="margin: 0">招生信息</div>
@@ -526,6 +529,12 @@
         this.orderObj.Unit_Price = item.SellPrice;
         this.isShowEditOrderForm = true;
       },
+      //跳转到课程大纲
+      goChapter(CouseId){
+        this.OpenNewUrl('/course/chapter' , {
+          CourseId: CouseId
+        });
+      }
     }
   }
 

src/pages/teacher/myClass.vue

@@ -68,7 +68,6 @@
     
                 </div>
             </div>
-         
           </q-td>
         </template>
         <template v-slot:body-cell-OtherCourseName="props">
@@ -108,6 +107,11 @@
             <span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-CourseId="props">
+          <q-td auto-width :props="props">
+            <span style="color:blue;cursor:pointer;" @click="goChapter(props.row.CouseId)">详情</span>
+          </q-td>
+        </template>
         <template v-slot:body-cell-CompleteProgress="props">
           <q-td auto-width :props="props">
             {{props.row.UsePlanNum}}/{{props.row.TotalPlanNum}}
@@ -233,6 +237,12 @@
             field: 'OtherCourseName',
             align: 'left'
           },
+          {
+            name: 'CourseId',
+            label: '课程大纲',
+            field: 'CourseId',
+            align: 'left'
+          },
           {
             name: 'TeacherName',
             label: '带班老师',
@@ -245,6 +255,12 @@
             field: 'OpenTime',
             align: 'left'
           },
+          {
+            name: 'FinishTimeStr',
+            label: '预计结束时间',
+            field: 'FinishTimeStr',
+            align: 'left'
+          },
           {
             name: 'CompleteProgress',
             label: '课程进度',
@@ -490,6 +506,12 @@
           ClassId: row.ClassId,
           ClassName: ClassName,
         });
+      },
+      //跳转到课程大纲
+      goChapter(CouseId){
+        this.OpenNewUrl('/course/chapter' , {
+          CourseId: CouseId
+        });
       }
     }
   }