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">

src/components/stuMan/subscribe/detail.vue

@@ -16,15 +16,15 @@
           <div>{{ saveObj.CourseName }}</div>
         </template>
       </q-field>
-      <q-field
-        filled
-        label="班级"
-        stack-label
-        class="col-6"
-        v-if="saveObj.ClassType !== 3"
-      >
+      <q-field filled label="班级" stack-label class="col-6" v-if="saveObj.ClassType !== 3">
         <template v-slot:control>
-          <div>{{ saveObj.ClassName }}</div>
+          <div>
+            {{ saveObj.ClassName }}
+            <span v-if="saveObj.ClassType === 2">
+              <span v-if="saveObj.ReserveType === 0">(正常试听)</span>
+              <span v-if="saveObj.ReserveType === 1">(跟班试听)</span>
+            </span>
+          </div>
         </template>
       </q-field>
       <!-- <q-field
@@ -41,9 +41,8 @@
       <q-field filled label="类型" stack-label class="col-6">
         <template v-slot:control>
           <div>
-            <span v-if="saveObj.ClassType == 1">跟班</span
-            ><span v-if="saveObj.ClassType == 2">试听课</span
-            ><span v-if="saveObj.ClassType == 3">约课</span>
+            <span v-if="saveObj.ClassType == 1">跟班</span><span v-if="saveObj.ClassType == 2">试听课</span><span
+              v-if="saveObj.ClassType == 3">约课</span>
           </div>
         </template>
       </q-field>
@@ -56,59 +55,28 @@
         <template v-slot:control>
           <div>
             {{ saveObj.Ranks }}/{{ saveObj.TotalPlanNum }}
-            <span class="q-ml-sm" v-if="saveObj.ClassType == 3"
-              >({{ saveObj.CourseGradeName }})</span
-            >
+            <span class="q-ml-sm" v-if="saveObj.ClassType == 3">({{ saveObj.CourseGradeName }})</span>
           </div>
         </template>
       </q-field>
-      <q-field
-        filled
-        label="预约状态："
-        stack-label
-        class="col-6"
-        v-if="saveObj.ClassType == 3"
-      >
+      <q-field filled label="预约状态：" stack-label class="col-6" v-if="saveObj.ClassType == 3">
         <template v-slot:control>
           <div>
-            <span v-if="saveObj.AppointState == 1" style="color:#ef5350"
-              >待确认</span
-            ><span v-if="saveObj.AppointState == 2" style="color:#21ba45"
-              >已确认</span
-            >
+            <span v-if="saveObj.AppointState == 1" style="color:#ef5350">待确认</span><span
+              v-if="saveObj.AppointState == 2" style="color:#21ba45">已确认</span>
           </div>
-          <q-btn
-            color="accent"
-            size="xs"
-            label="确认"
-            v-if="
+          <q-btn color="accent" size="xs" label="确认" v-if="
               saveObj.AppointState == 1 &&
                 saveObj.GuestList.length >= saveObj.ScrollMinNum &&
                 auth.IsEdit
-            "
-            @click="confirmSub"
-            class="q-ml-md"
-          />
-          <q-badge
-            rounded
-            color="red"
-            label="未成班"
-            style="position:absolute;top:0;right:0"
-            class="q-ml-sm"
-            v-if="
+            " @click="confirmSub" class="q-ml-md" />
+          <q-badge rounded color="red" label="未成班" style="position:absolute;top:0;right:0" class="q-ml-sm" v-if="
               saveObj.AppointState == 1 &&
                 isShowTag(saveObj.GuestList, saveObj.ScrollMinNum)
-            "
-          />
+            " />
         </template>
       </q-field>
-      <q-field
-        filled
-        label="最小成班人数："
-        stack-label
-        class="col-6"
-        v-if="saveObj.ClassType == 3"
-      >
+      <q-field filled label="最小成班人数：" stack-label class="col-6" v-if="saveObj.ClassType == 3">
         <template v-slot:control>
           <div>{{ saveObj.ScrollMinNum }}</div>
         </template>
@@ -124,55 +92,20 @@
           <div>{{ saveObj.ScrollMaxNum }}</div>
         </template>
       </q-field> -->
-      <q-field
-        filled
-        label="已约学员："
-        stack-label
-        class="col-12"
-        v-if="saveObj.ClassType == 3"
-      >
+      <q-field filled label="已约学员：" stack-label class="col-12" v-if="saveObj.ClassType == 3">
         <template v-slot:control>
           <div v-if="saveObj.AppointState == 1 && auth.IsEdit">
             <div class="q-mt-sm flex justify-start">
-              <q-btn
-                color="accent"
-                size="xs"
-                label="调课"
-                @click="showChangeCourse"
-                :disable="checkStuType2.length == 0"
-                class="q-mr-sm"
-              />
-              <q-btn
-                color="accent"
-                size="xs"
-                label="取消预约"
-                @click="cancelSub()"
-                :disable="checkStuType2.length == 0"
-                class="q-mr-sm"
-              />
-              <q-btn
-                color="accent"
-                size="xs"
-                label="补课"
-                @click="showRelenishDig = true"
-                style="margin-left:440px"
-              />
-              <q-btn
-                color="accent"
-                size="xs"
-                label="重学"
-                @click="showReStudyDig = true"
-                class="q-ml-sm"
-              />
+              <q-btn color="accent" size="xs" label="调课" @click="showChangeCourse" :disable="checkStuType2.length == 0"
+                class="q-mr-sm" />
+              <q-btn color="accent" size="xs" label="取消预约" @click="cancelSub()" :disable="checkStuType2.length == 0"
+                class="q-mr-sm" />
+              <q-btn color="accent" size="xs" label="补课" @click="showRelenishDig = true" style="margin-left:440px" />
+              <q-btn color="accent" size="xs" label="重学" @click="showReStudyDig = true" class="q-ml-sm" />
             </div>
 
             <div class="row">
-              <q-checkbox
-                v-model="checkStuType2"
-                v-for="(x, y) in saveObj.GuestList"
-                :key="y"
-                :val="x.AppointmentId"
-              >
+              <q-checkbox v-model="checkStuType2" v-for="(x, y) in saveObj.GuestList" :key="y" :val="x.AppointmentId">
                 {{ x.GuestName }}
                 <span v-if="x.AppointType == 2">(补)</span>
                 <span v-if="x.AppointType == 3">(重)</span>
@@ -188,13 +121,7 @@
           </div>
         </template>
       </q-field>
-      <q-field
-        filled
-        label="学员名单："
-        stack-label
-        class="col-12"
-        v-if="saveObj.ClassType !== 3"
-      >
+      <q-field filled label="学员名单：" stack-label class="col-12" v-if="saveObj.ClassType !== 3">
         <template v-slot:control>
           <div>
             <span v-for="(x, y) in saveObj.GuestList" :key="y">
@@ -206,34 +133,20 @@
         </template>
       </q-field>
     </div>
-    <ChangeCourse
-      v-model="showChangeDig"
-      :saveObj="CourseObj"
-      @success="ChangeCourseSuccessHandle"
-    />
-    <ReStudy
-      v-model="showReStudyDig"
-      :saveObj="saveObj"
-      :date="dateObj.date"
-      @success="ReStudyHandle"
-    ></ReStudy>
-    <Relenish
-      v-model="showRelenishDig"
-      :saveObj="saveObj"
-      :date="dateObj.date"
-      @success="RelenishHandle"
-    ></Relenish>
+    <ChangeCourse v-model="showChangeDig" :saveObj="CourseObj" @success="ChangeCourseSuccessHandle" />
+    <ReStudy v-model="showReStudyDig" :saveObj="saveObj" :date="dateObj.date" @success="ReStudyHandle"></ReStudy>
+    <Relenish v-model="showRelenishDig" :saveObj="saveObj" :date="dateObj.date" @success="RelenishHandle"></Relenish>
   </div>
 </template>
 <script>
-import {
+  import {
     CancelAppointment,
     SetSureAppointment
-} from "../../../api/studyabroad/subscribe.js";
-import ChangeCourse from "./changeCourse";
-import ReStudy from "./reStudy";
-import Relenish from "./replenish.vue";
-export default {
+  } from "../../../api/studyabroad/subscribe.js";
+  import ChangeCourse from "./changeCourse";
+  import ReStudy from "./reStudy";
+  import Relenish from "./replenish.vue";
+  export default {
     components: {
       ChangeCourse,
       ReStudy,
@@ -369,5 +282,6 @@ export default {
         }
       }
     }
-};
+  };
+
 </script>

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>