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

src/components/course/mateitem.vue

@@ -10,10 +10,17 @@
             <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" />
             <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)">
+              <q-badge color="red" rounded style="margin-left:5px;">
+                未
+              </q-badge>
+            </template>
           </div>
         </template>
         <div class="plan_Inner">
@@ -35,12 +42,35 @@
               :key="tIndex">{{tItem.GuestName}}</span>
           </div>
         </div>
-        <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>
+        <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}}
+            </div>
           </div>
-        </div>
+        </template>
+        <template v-else>
+          <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">
+          <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>
       </el-collapse-item>
     </el-collapse>
   </div>
@@ -66,7 +96,7 @@
 
     },
     methods: {
-
     }
   }
-</script>
\ No newline at end of file
+
+</script>