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

src/components/course/mateitem.vue

@@ -19,7 +19,7 @@
           <div class="plan_LeftTitle">上课时间：</div>
           <div class="plan_RightInner">{{subItem.StartTime}}-{{subItem.EndTime}}</div>
         </div>
-        <div class="plan_Inner" v-if="subItem.ClassName">
+        <div class="plan_Inner" v-if="subItem.ClassName&&subItem.ClassType!==3">
           <div class="plan_LeftTitle">班级：</div>
           <div class="plan_RightInner">{{subItem.ClassName}}</div>
         </div>

src/pages/course/classPlan.vue

@@ -25,12 +25,17 @@
       </div>
       <div class="col-2">
         <el-select v-model="msg.ClassType" style="width:100%;" placeholder="类型" size="small" @change="getPlanList()">
-          <el-option :key="0" label="全部" :value="0">
-          </el-option>
-          <el-option :key="1" label="正常" :value="1">
-          </el-option>
-          <el-option :key="2" label="试听课" :value="2">
-          </el-option>
+          <el-option :key="0" label="全部" :value="0"> </el-option>
+          <el-option :key="1" label="跟班课" :value="1"> </el-option>
+          <el-option :key="2" label="试听课" :value="2"> </el-option>
+          <el-option :key="2" label="预约课" :value="3"> </el-option>
+        </el-select>
+      </div>
+      <div class="col-2" v-if="msg.ClassType==3">
+        <el-select v-model="msg.AppointState" style="width:100%;" placeholder="预约状态" size="small" @change="getPlanList()">
+          <el-option :key="0" label="不限" :value="0"> </el-option>
+          <el-option :key="0" label="待确认" :value="1"> </el-option>
+          <el-option :key="1" label="已确认" :value="2"> </el-option>
         </el-select>
       </div>
     </div>
@@ -70,6 +75,7 @@
           TeacherId: 0,
           ClassRoomId: 0,
           ClassType: 0,
+          AppointState:0,
         }
       };
     },

src/pages/stuMan/classPlan.vue

@@ -32,10 +32,21 @@
       <div class="col-1" style="width: 10%">
         <el-select v-model="msg.ClassType" style="width: 100%" placeholder="类型" size="small" @change="getTypeWay()">
           <el-option :key="0" label="全部" :value="0"> </el-option>
-          <el-option :key="1" label="正常" :value="1"> </el-option>
+          <el-option :key="1" label="跟班课" :value="1"> </el-option>
           <el-option :key="2" label="试听课" :value="2"> </el-option>
+          <el-option :key="2" label="预约课" :value="3"> </el-option>
           <div slot="prefix" class="full-height flex items-center" style="color: #000; padding-right: 10px">
-            状态:
+            类型:
+          </div>
+        </el-select>
+      </div>
+      <div class="col-2 yuyuezhuangtai" style="width: 10%" v-if="msg.ClassType==3">
+        <el-select v-model="msg.AppointState" style="width: 100%;" placeholder="预约状态" size="small" @change="getTypeWay()">
+          <el-option :key="0" label="不限" :value="0"> </el-option>
+          <el-option :key="0" label="待确认" :value="1"> </el-option>
+          <el-option :key="1" label="已确认" :value="2"> </el-option>
+          <div slot="prefix" class="full-height flex items-center" style="color: #000;margin-right:61px; white-space:nowrap;">
+            预约状态:
           </div>
         </el-select>
       </div>
@@ -95,6 +106,7 @@
           TeacherId: 0,
           ClassRoomId: 0,
           ClassType: 0,
+          AppointState:0,
         },
         commonType: 1, //1日历模式 2列表模式
         typeName: "列表模式",
@@ -246,4 +258,7 @@
   .xg .el-input--prefix .el-input__inner {
     padding-left: 50px;
   }
+  .yuyuezhuangtai .el-input--prefix .el-input__inner {
+    padding-left: 60px;
+  }
 </style>
\ No newline at end of file