Merge branch '0601Action' into 11/24SAAS

src/views/studentManager/studentList.vue

@@ -735,7 +735,60 @@
           </el-select>
         </el-form-item>
         <el-form-item label="学员班级" prop="currentClass">
-          <el-input v-model.trim="studentForm.currentClass"></el-input>
+
+          <el-select
+            placeholder="班级"
+            filterable
+            clearable
+            v-model.trim="studentForm.currentClass"
+            style="width: 185px !important"
+          >
+            <el-option label="1班" value="1班"></el-option>
+            <el-option label="2班" value="2班"></el-option>
+            <el-option label="3班" value="3班"></el-option>
+            <el-option label="4班" value="4班"></el-option>
+            <el-option label="5班" value="5班"></el-option>
+            <el-option label="6班" value="6班"></el-option>
+            <el-option label="7班" value="7班"></el-option>
+            <el-option label="8班" value="8班"></el-option>
+            <el-option label="9班" value="9班"></el-option>
+            <el-option label="10班" value="10班"></el-option>
+            <el-option label="11班" value="11班"></el-option>
+            <el-option label="12班" value="12班"></el-option>
+            <el-option label="13班" value="13班"></el-option>
+            <el-option label="14班" value="14班"></el-option>
+            <el-option label="15班" value="15班"></el-option>
+            <el-option label="16班" value="16班"></el-option>
+            <el-option label="17班" value="17班"></el-option>
+            <el-option label="18班" value="18班"></el-option>
+            <el-option label="19班" value="19班"></el-option>
+            <el-option label="20班" value="20班"></el-option>
+            <el-option label="21班" value="21班"></el-option>
+            <el-option label="22班" value="22班"></el-option>
+            <el-option label="23班" value="23班"></el-option>
+            <el-option label="24班" value="24班"></el-option>
+            <el-option label="25班" value="25班"></el-option>
+            <el-option label="26班" value="26班"></el-option>
+            <el-option label="27班" value="27班"></el-option>
+            <el-option label="28班" value="28班"></el-option>
+            <el-option label="29班" value="29班"></el-option>
+            <el-option label="30班" value="30班"></el-option>
+            <el-option label="31班" value="31班"></el-option>
+            <el-option label="32班" value="32班"></el-option>
+            <el-option label="33班" value="33班"></el-option>
+            <el-option label="34班" value="34班"></el-option>
+            <el-option label="35班" value="35班"></el-option>
+            <el-option label="36班" value="36班"></el-option>
+            <el-option label="37班" value="37班"></el-option>
+            <el-option label="38班" value="38班"></el-option>
+            <el-option label="39班" value="39班"></el-option>
+            <el-option label="40班" value="40班"></el-option>
+
+          </el-select>
+          <!-- <el-input
+            v-model.trim="maskForm.course"
+            placeholder="班级"
+          ></el-input> -->
         </el-form-item>
 
 

src/views/teamDetail/components/studentList.vue

@@ -708,6 +708,27 @@
             <el-option label="18班" value="18班"></el-option>
             <el-option label="19班" value="19班"></el-option>
             <el-option label="20班" value="20班"></el-option>
+            <el-option label="21班" value="21班"></el-option>
+            <el-option label="22班" value="22班"></el-option>
+            <el-option label="23班" value="23班"></el-option>
+            <el-option label="24班" value="24班"></el-option>
+            <el-option label="25班" value="25班"></el-option>
+            <el-option label="26班" value="26班"></el-option>
+            <el-option label="27班" value="27班"></el-option>
+            <el-option label="28班" value="28班"></el-option>
+            <el-option label="29班" value="29班"></el-option>
+            <el-option label="30班" value="30班"></el-option>
+            <el-option label="31班" value="31班"></el-option>
+            <el-option label="32班" value="32班"></el-option>
+            <el-option label="33班" value="33班"></el-option>
+            <el-option label="34班" value="34班"></el-option>
+            <el-option label="35班" value="35班"></el-option>
+            <el-option label="36班" value="36班"></el-option>
+            <el-option label="37班" value="37班"></el-option>
+            <el-option label="38班" value="38班"></el-option>
+            <el-option label="39班" value="39班"></el-option>
+            <el-option label="40班" value="40班"></el-option>
+
           </el-select>
           <!-- <el-input
             v-model.trim="maskForm.course"