修改

src/components/course/class-form.vue

@@ -276,11 +276,11 @@
             </thead>
             <tbody v-for="(nItem,nIndex) in DefaultPlanTimeList" :key="nIndex+10000">
               <tr v-for="(sItem,sIndex) in nItem.TimeList">
-                <td :rowspan="nItem.TimeList.length" v-if="sIndex==0">
+                <td :rowspan="nItem.TimeList.length" v-if="sIndex==0" style="position:relative;">
                   <q-select filled style="width:220px;" stack-label multiple v-model="nItem.DateList" ref="DateList" :options="checkedDays"
                     :label="objOption.ClassStyle==1?'选择周几':'选择日期'" :dense="false" class="col-6" emit-value map-options clearable>
                   </q-select>
-                  <a @click="deletePlan(nIndex)" style="color:blue;cursor:pointer;">删除</a>
+                  <a @click="deletePlan(nIndex)" style="color:blue;cursor:pointer;position:absolute;">删除</a>
                 </td>
                 <td>
                   <q-input filled stack-label maxlength="20" v-model="sItem.StartTime" placeholder="08:30"

src/components/sale/editOrder-form.vue

@@ -3,7 +3,7 @@
   <q-dialog v-model="IsShowEditOrder" maximized full-height seamless position="right">
     <q-card style="margin-top:61px;width:500px" class="no-border-radius classinfo_Dialog">
       <div class="drawerTop">
-        <div style="display:flex;align-items:center;margin-left:10px;">
+        <div style="display:flex;align-items:center;margin:20px 0 0 10px;">
           <span class="drawer_Span">{{OrderMsg.OrderId>0?"修改订单":"立即下单"}}</span>
         </div>
       </div>

src/pages/course/classManage.vue

+<style>
+  .OtherCourseNum{
+    display:inline-block;
+    width:25px;
+    height:25px;
+    text-align: center;
+    line-height: 25px;
+    border:1px solid #2961FE;
+    border-radius: 50%;
+    cursor: pointer;
+  }
+  .OCourseTable{
+    width:400px;
+    text-align: center;
+  }
+  .OCourseTable tr td{
+    height:40px;
+  }
+  .OCourseTable tr th{
+    height:40px;
+    background-color: rgb(238, 238, 239);
+  }
+</style>
 <template>
   <div class="page-body">
     <div class="page-search row items-center">
@@ -25,7 +48,7 @@
       </div>
     </div>
     <div class="page-content">
-      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table"
+      <q-table :pagination="msg" :loading="loading" no-data-label="暂无相关数据" flat class="sticky-column-table sticky-right-column-table"
         separator="none" :data="data" :columns="columns" row-key="name">
         <template v-slot:top="props">
           <div class="col-2 q-table__title">班级信息</div>
@@ -42,6 +65,27 @@
               title="点击查看详情">{{props.row.ClassName}}</span>
           </q-td>
         </template>
+        <template v-slot:body-cell-OtherCourseName="props">
+          <q-td auto-width :props="props">
+            课程名称：<span class="OtherCourseNum">
+                        8
+                        <q-popup-proxy>
+                          <q-banner>
+                            <table class="OCourseTable" style="border-collapse:collapse;">
+                              <tr>
+                                <th>课程名称</th>
+                                <th>课时数</th>
+                              </tr>
+                              <tr>
+                                <td>日语N10</td>
+                                <td>12</td>
+                              </tr>
+                            </table>
+                          </q-banner>
+                        </q-popup-proxy>
+                     </span>  
+          </q-td>
+        </template>
         <template v-slot:body-cell-TeacherName="props">
           <q-td auto-width :props="props">
             <span style="color:#3FC4FF;">{{props.row.TeacherName}}</span>
@@ -120,6 +164,11 @@
                     <q-item-label>恢复</q-item-label>
                   </q-item-section>
                 </q-item>
+                <q-item clickable v-close-popup @click="getOtherCourse(props.row)">
+                  <q-item-section>
+                    <q-item-label>关联其他课程</q-item-label>
+                  </q-item-section>
+                </q-item>
               </q-list>
             </q-btn-dropdown>
           </q-td>
@@ -129,6 +178,8 @@
       </class-form>
       <classinfo-form v-if="isShowClassInfo" :seting-obj="classObjOption" @close="closeClass" @success="refreshClass">
       </classinfo-form>
+      <othercourseForm v-if="IsShowOtherCourse" @close="closeOtherCourse" @success="refreshOtherCourse">
+      </othercourseForm>
     </div>
   </div>
 </template>
@@ -146,13 +197,15 @@
 
   import classForm from '../../components/course/class-form';
   import classinfoForm from '../../components/course/classinfo-form';
+  import othercourseForm from '../../components/course/othercourse-form';
   export default {
     meta: {
       title: "班级管理"
     },
     components: {
       classForm,
-      classinfoForm
+      classinfoForm,
+      othercourseForm
     },
     data() {
       return {
@@ -174,6 +227,12 @@
             field: 'CourseName',
             align: 'left'
           },
+          {
+            name: 'OtherCourseName',
+            label: '关联其他课程',
+            field: 'OtherCourseName',
+            align: 'left'
+          },
           {
             name: 'TeacherName',
             label: '带班老师',
@@ -235,6 +294,7 @@
           ClassId: 0,
           ClassStatus: 0
         },
+        IsShowOtherCourse:false,
       }
     },
     created() {
@@ -416,6 +476,20 @@
       refreshClass() {
 
       },
+
+      getOtherCourse(){
+        this.IsShowOtherCourse=true;
+      },
+      //关闭关联其他课程弹窗
+      closeOtherCourse(){
+
+      },
+      
+      //关联其他课程保存成功刷新
+      refreshOtherCourse(){
+
+      },
+
       //点击班级名称
       getClassInfo(obj) {
         this.classObjOption = null;

src/pages/sale/japaneseTrain.vue

@@ -232,11 +232,13 @@
                 <div v-if="item.IsCanApply==0">
                   <img src="../../assets/images/administration/bmym.png" alt=""
                     style="width: 64px;height: 62px;margin:20px 15px 0 0" v-if="item.SurplusNum==0">
-                  <img src="../../assets/images/administration/guoqi.png" alt="" style="width: 64px;height: 62px"
-                    v-if="getEXPDate(item.EndOrderTime)==true">
+                  <!-- <img src="../../assets/images/administration/guoqi.png" alt="" style="width: 64px;height: 62px"
+                    v-if="getEXPDate(item.EndOrderTime)==true"> -->
                 </div>
                 <div>
                   <q-btn style="margin-top:10px;" size="sm" color="primary" label="订单中心" @click="goclassorder(item)" />
+
+                  <q-btn style="margin-top:10px;" size="sm" color="primary" label="插班报名" @click="" />
                 </div>
               </div>
             </div>