2

src/components/course/mateitem.vue

-<style>
-
-</style>
+<style></style>
 <template>
   <div>
-    <el-collapse v-if="dayData&&dayData.SubList&&dayData.SubList.length>0">
-      <el-collapse-item v-for="(subItem,subIndex) in dayData.SubList" :key="subIndex" :name="subIndex">
+    <el-collapse
+      v-if="dayData && dayData.SubList && dayData.SubList.length > 0"
+    >
+      <el-collapse-item
+        v-for="(subItem, subIndex) in dayData.SubList"
+        :key="subIndex"
+        :name="subIndex"
+      >
         <template slot="title">
           <div class="plan_Tdiv">
-            <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" />
-            <span style="color:red;margin:0 5px;">{{subItem.TeacherName}}</span>
-            <span>[{{subItem.RoomName}}]</span>
-            <template v-if="(subItem.ClassType==3)&&(subItem.GuestList.length<subItem.ScrollMinNum)&&(subItem.AppointState==1)">
+            <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"
+            />
+            <span style="color:red;margin:0 5px;">{{
+              subItem.TeacherName
+            }}</span>
+            <span>[{{ subItem.RoomName }}]</span>
+            <template
+              v-if="
+                subItem.ClassType == 3 &&
+                  subItem.AppointState == 1 &&
+                  isShowTag(subItem.GuestList, subItem.ScrollMinNum)
+              "
+            >
               <q-badge color="red" rounded style="margin-left:5px;">
                 未
               </q-badge>
@@ -25,49 +59,82 @@
         </template>
         <div class="plan_Inner">
           <div class="plan_LeftTitle">上课时间：</div>
-          <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
+          <div class="plan_RightInner">
+            {{ subItem.StartTime }}-{{ subItem.EndTime }}
+          </div>
         </div>
-        <div class="plan_Inner" v-if="subItem.ClassName&&subItem.ClassType!==3">
+        <div
+          class="plan_Inner"
+          v-if="subItem.ClassName && subItem.ClassType !== 3"
+        >
           <div class="plan_LeftTitle">班级：</div>
-          <div class="plan_RightInner">{{subItem.ClassName}}</div>
+          <div class="plan_RightInner">{{ subItem.ClassName }}</div>
         </div>
         <div class="plan_Inner">
           <div class="plan_LeftTitle">课程名称：</div>
-          <div class="plan_RightInner">{{subItem.CourseName}}</div>
+          <div class="plan_RightInner">{{ subItem.CourseName }}</div>
         </div>
-        <div class="plan_Inner" v-if="subItem.GuestList&&subItem.GuestList.length>0">
+        <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,tIndex) in subItem.GuestList"
-              :key="tIndex">{{tItem.GuestName}}</span>
+            <span
+              style="margin-right:10px;"
+              v-for="(tItem, tIndex) in subItem.GuestList"
+              :key="tIndex"
+              >{{ tItem.GuestName }}
+              <span v-if="tItem.AppointType == 2">(补)</span>
+              <span v-if="tItem.AppointType == 3">(重)</span>
+            </span>
           </div>
         </div>
-        <template v-if="subItem.ClassType==3">
+        <template v-if="subItem.ClassType == 3">
           <div class="plan_Inner" style="align-items:center;">
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
-              {{subItem.Ranks}}/{{subItem.TotalPlanNum}}
+              {{ subItem.Ranks }}/{{ subItem.TotalPlanNum }}
             </div>
           </div>
         </template>
         <template v-else>
-          <div class="plan_Inner" style="align-items:center;" v-if="subItem.CompleteProgress>=0">
+          <div
+            class="plan_Inner"
+            style="align-items:center;"
+            v-if="subItem.CompleteProgress >= 0"
+          >
             <div class="plan_LeftTitle">课程进度：</div>
             <div class="plan_RightInner">
               <el-progress :percentage="subItem.CompleteProgress"></el-progress>
             </div>
           </div>
         </template>
-        <template v-if="subItem.ClassType==3">
+        <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
+              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>人
+              <span style="color: rgb(33, 186, 69);">{{
+                subItem.ScrollMinNum
+              }}</span
+              >人
             </div>
           </div>
         </template>
@@ -76,27 +143,33 @@
   </div>
 </template>
 <script>
-  export default {
-    props: {
-      dayData: {
-        type: Object,
-        default: null
-      }
-    },
-    components: {
-
-    },
-    data() {
-      return {
-
+export default {
+  props: {
+    dayData: {
+      type: Object,
+      default: null
+    }
+  },
+  components: {},
+  data() {
+    return {};
+  },
+  created() {},
+  mounted() {},
+  methods: {
+    isShowTag(arr, min) {
+      let n = 0;
+      arr.map(e => {
+        if (e.AppointType !== 3) {
+          n += 1;
+        }
+      });
+      if (n < min) {
+        return true;
+      } else {
+        return false;
       }
-    },
-    created() {},
-    mounted() {
-
-    },
-    methods: {
     }
   }
-
+};
 </script>

src/components/stuMan/subscribe/detail.vue

@@ -96,8 +96,7 @@
             style="position:absolute;top:0;right:0"
             class="q-ml-sm"
             v-if="
-              saveObj.AppointState == 1 &&
-                saveObj.GuestList.length < saveObj.ScrollMinNum
+              saveObj.AppointState == 1 &&isShowTag(saveObj.GuestList,saveObj.ScrollMinNum)
             "
           />
         </template>
@@ -342,7 +341,20 @@ export default {
       arr.push(val);
       this.$set(this.saveObj, "GuestList", arr);
       this.$emit("success");
-    }
+    },
+    isShowTag(arr, min) {
+      let n=0
+      arr.map((e)=>{
+        if(e.AppointType!==3){
+          n+=1
+        }
+      })
+      if (n < min) {
+        return true;
+      } else {
+        return false;
+      }
+    },
   }
 };
 </script>

src/pages/studyAbroad/subscribe.vue

@@ -188,7 +188,7 @@
                         v-if="
                           viewType == 'day' &&
                             isShowTag(
-                              __item.GuestList.length,
+                              __item.GuestList,
                               __item.ScrollMinNum
                             )
                         "
@@ -200,7 +200,7 @@
                         v-if="
                           viewType == 'week' &&
                             isShowTag(
-                              __item.GuestList.length,
+                              __item.GuestList,
                               __item.ScrollMinNum
                             )
                         "
@@ -321,7 +321,7 @@
                         style="position:absolute;top:0;right:0"
                         v-if="
                           isShowTag(
-                            __item.GuestList.length,
+                            __item.GuestList,
                             __item.ScrollMinNum
                           )
                         "
@@ -748,7 +748,13 @@ export default {
     successHandle() {
       this.getData();
     },
-    isShowTag(n, min) {
+    isShowTag(arr, min) {
+      let n=0
+      arr.map((e)=>{
+        if(e.AppointType!==3){
+          n+=1
+        }
+      })
       if (n < min) {
         return true;
       } else {