1

src/components/course/mateitem.vue

@@ -12,6 +12,8 @@
               style="margin-left:5px;font-size:10px" />
             <q-badge rounded color="cyan-7" label="预约课" v-if="subItem.ClassType == 3"
               style="margin-left:5px;font-size:10px" />
+            <q-badge rounded color="orange" label="跟班" v-if="subItem.ClassType == 2&&subItem.ReserveType==1"
+              style="margin-left:5px;font-size:10px" />
             <span style="color:red;margin:0 5px;">{{
               subItem.TeacherName
             }}</span>
@@ -51,7 +53,7 @@
             </span>
           </div>
         </div>
-        <template v-if="subItem.ClassType == 3">
+        <template v-if="subItem.ClassType == 3||subItem.ClassType == 2">
           <div class="plan_Inner" style="align-items:center;">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
@@ -121,4 +123,4 @@
     }
   };
 
-</script>
+</script>
\ No newline at end of file

src/pages/classroom/components/mateitem.vue

@@ -10,7 +10,13 @@
             <span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
             <span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
             <span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
-            <span v-if="subItem.Type===0&&subItem.ClassType==2">试听课</span>
+            <!-- <span v-if="subItem.Type===0&&subItem.ClassType==2">试听课</span> -->
+            <q-badge rounded color="orange" label="试听课" v-if="subItem.ClassType==2"
+              style="margin-left:5px;font-size:10px" />
+            <q-badge rounded color="cyan-7" label="预约课" v-if="subItem.ClassType==3"
+              style="margin-left:5px;font-size:10px" />
+            <q-badge rounded color="orange" label="跟班" v-if="subItem.ClassType == 2&&subItem.ReserveType===1"
+              style="margin-left:5px;font-size:10px" />
             <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
             <span>[{{subItem.RoomName}}]</span>
           </div>
@@ -34,12 +40,37 @@
               <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
             </div>
           </div>
-          <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
+          <div class="plan_Inner" style="align-items:center;" v-if="subItem.ClassType===1&&subItem.CompleteProgress>=0">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
               <el-progress :percentage="subItem.CompleteProgress"></el-progress>
             </div>
           </div>
+          <div class="plan_Inner" style="align-items:center;" v-if="subItem.ClassType!==1&&subItem.Ranks&&subItem.TotalPlanNum">
+            <div class="plan_LeftTitle">课程进度：</div>
+            <div class="plan_RightInner">
+              {{subItem.Ranks}}/{{subItem.TotalPlanNum}}
+            </div>
+          </div>
+          <template v-if="subItem.ClassType == 3">
+            <div class="plan_Inner">
+              <div class="plan_LeftTitle">课程状态：</div>
+              <div class="plan_RightInner" style="color: rgb(239, 83, 80);" v-if="subItem.AppointState == 1">
+                待确认
+              </div>
+              <div class="plan_RightInner" style="color: rgb(33, 186, 69);" v-if="subItem.AppointState == 2">
+                已确认
+              </div>
+            </div>
+            <div class="plan_Inner" v-if="subItem.ScrollMinNum">
+              <div class="plan_LeftTitle">最小成班：</div>
+              <div class="plan_RightInner">
+                <span style="color: rgb(33, 186, 69);">{{
+                subItem.ScrollMinNum
+              }}</span>人
+              </div>
+            </div>
+          </template>
         </div>
 
       </el-collapse-item>

src/pages/studyAbroad/subscribe.vue

@@ -101,7 +101,13 @@
                           <div class="detailValue">{{ __item.CourseName }}</div>
                         </div>
                         <div class="flex no-wrap">
-                          <span class="detailLabel">班级：</span><span>{{ __item.ClassName }}</span>
+                          <span class="detailLabel">班级：</span>
+                          <span>{{ __item.ClassName }}
+                            <span v-if="__item.ClassType===2">
+                              <span v-if="__item.ReserveType===0">(正常试听)</span>
+                              <span v-if="__item.ReserveType===1">(跟班试听)</span>
+                            </span>
+                          </span>
                         </div>
                         <div class="flex no-wrap">
                           <span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
@@ -170,7 +176,13 @@
                         <span class="detailLabel">课程：</span><span>{{ __item.CourseName }}</span>
                       </div>
                       <div class="flex no-wrap">
-                        <span class="detailLabel">班级：</span><span>{{ __item.ClassName }}</span>
+                        <span class="detailLabel">班级：</span>
+                        <span>{{ __item.ClassName }}
+                          <span v-if="__item.ClassType===2">
+                              <span v-if="__item.ReserveType===0">(正常试听)</span>
+                              <span v-if="__item.ReserveType===1">(跟班试听)</span>
+                          </span>
+                        </span>
                       </div>
                       <div class="flex no-wrap">
                         <span class="detailLabel">时间：</span><span>{{ __item.StartTime }}-{{ __item.EndTime }}</span>
@@ -296,7 +308,7 @@
             Id: 0
           },
           {
-            label: "跟班",
+            label: "跟班课",
             Id: 1
           },
           {
@@ -304,7 +316,7 @@
             Id: 2
           },
           {
-            label: "约课",
+            label: "预约课",
             Id: 3
           }
         ],

src/pages/teacher/components/mateitem.vue

@@ -10,8 +10,12 @@
             <span v-if="subItem.TimeStr==='早上'" class="commonTimeStr greenTime">{{subItem.TimeStr}}</span>
             <span v-if="subItem.TimeStr==='下午'" class="commonTimeStr blueTime">{{subItem.TimeStr}}</span>
             <span v-if="subItem.TimeStr==='晚上'" class="commonTimeStr orangeTime">{{subItem.TimeStr}}</span>
-            <q-badge rounded color="orange" label="试听课" v-if="subItem.ClassType==2" style="margin-left:5px;font-size:10px"/>
-            <q-badge rounded color="cyan-7" label="预约课" v-if="subItem.ClassType==3" style="margin-left:5px;font-size:10px"/>
+            <q-badge rounded color="orange" label="试听课" v-if="subItem.ClassType==2"
+              style="margin-left:5px;font-size:10px" />
+            <q-badge rounded color="cyan-7" label="预约课" v-if="subItem.ClassType==3"
+              style="margin-left:5px;font-size:10px" />
+            <q-badge rounded color="orange" label="跟班" v-if="subItem.ClassType == 2&&subItem.ReserveType==1"
+              style="margin-left:5px;font-size:10px" />
             <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
             <span>[{{subItem.RoomName}}]</span>
             <template v-if="
@@ -41,15 +45,37 @@
           <div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0">
             <div class="plan_LeftTitle">学生名称：</div>
             <div class="plan_RightInner">
-              <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}</span>
+              <span style="margin-right:10px;" v-for="tItem in subItem.GuestList">{{tItem.GuestName}}
+                <span v-if="tItem.AppointType == 2">(补)</span>
+                <span v-if="tItem.AppointType == 3">(重)</span>
+              </span>
             </div>
           </div>
-          <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
+          <div class="plan_Inner" style="align-items:center;">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
               {{subItem.Ranks}}/{{subItem.TotalPlanNum}}
             </div>
           </div>
+          <template v-if="subItem.ClassType == 3">
+            <div class="plan_Inner">
+              <div class="plan_LeftTitle">课程状态：</div>
+              <div class="plan_RightInner" style="color: rgb(239, 83, 80);" v-if="subItem.AppointState == 1">
+                待确认
+              </div>
+              <div class="plan_RightInner" style="color: rgb(33, 186, 69);" v-if="subItem.AppointState == 2">
+                已确认
+              </div>
+            </div>
+            <div class="plan_Inner" v-if="subItem.ScrollMinNum">
+              <div class="plan_LeftTitle">最小成班：</div>
+              <div class="plan_RightInner">
+                <span style="color: rgb(33, 186, 69);">{{
+                subItem.ScrollMinNum
+              }}</span>人
+              </div>
+            </div>
+          </template>
         </div>
       </el-collapse-item>
     </el-collapse>

src/pages/teacher/components/teachTable.vue

@@ -15,6 +15,14 @@
             {{ props.row.StartTime }}-{{ props.row.EndTime }}
           </q-td>
         </template>
+        <template v-slot:body-cell-ClassName="props">
+          <q-td auto-width :props="props">
+            {{ props.row.ClassName }}
+            <span v-if="props.row.ClassType==2">
+              <span v-if="props.row.ReserveType==0">(正常试听)</span><span v-if="props.row.ReserveType==1">(跟班试听)</span>
+            </span>
+          </q-td>
+        </template>
         <template v-slot:body-cell-TotalPlanNum="props">
           <q-td> {{ props.row.Ranks }}/{{ props.row.TotalPlanNum }} </q-td>
         </template>