修改顺序

src/views/studentManager/studentList.vue

@@ -333,13 +333,6 @@
       :close-on-click-modal="false"
       :visible.sync="studentVisible"
     >
-      <!-- <el-divider>基本信息</el-divider> -->
-      <el-alert
-          title="课程信息"
-          type="info"
-          :closable="false"
-          class="vipMsg"
-        ></el-alert>
       <el-form
         :model="studentForm"
         :inline="true"
@@ -348,38 +341,12 @@
         ref="studentForm"
         :rules="studentRules"
       >
-        <el-form-item
-          label="联系电话"
-          prop="phone"
-          :rules="[
-            { required: true, message: '请输入手机号' },
-            {
-              pattern: /^1\d{10}$/,
-              message: '请输入正确的手机号',
-              trigger: 'blur',
-            },
-          ]"
-        >
-          <!--   @blur="checkPhone(studentForm.phone)" -->
-          <el-input v-model.trim="studentForm.phone"></el-input>
-        </el-form-item>
-        <el-form-item label="所属分部" prop="organId">
-          <el-select
-            class="multiple"
-            v-model.trim="studentForm.organId"
-            filterable
-            clearable
-            placeholder="请选择分部"
-            @change="changeStudentOrgan"
-          >
-            <el-option
-              v-for="(item, index) in selects.branchs"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
-          </el-select>
-        </el-form-item>
+        <el-alert
+          title="课程信息"
+          type="info"
+          :closable="false"
+          style="margin-bottom: 15px;"
+        ></el-alert>
         <el-form-item label="学生姓名" prop="name">
           <el-input v-model.trim="studentForm.name"></el-input>
         </el-form-item>
@@ -395,6 +362,18 @@
             <el-option :value="0" label="女"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="出生日期" prop="date">
+          <el-date-picker
+            v-model.trim="studentForm.date"
+            style="width: 185px"
+            value-format="yyyy-MM-dd"
+            type="date"
+            :picker-options="{
+              firstDayOfWeek: 1,
+            }"
+            placeholder="选择日期"
+          ></el-date-picker>
+        </el-form-item>
         <el-form-item label="学生声部" prop="subjectIdList">
           <el-select
             v-model.trim="studentForm.subjectIdList"
@@ -416,25 +395,39 @@
             </el-option-group>
           </el-select>
         </el-form-item>
-
-        <el-form-item label="是否运营" prop="operatingTag">
-          <el-select
-            class="multiple"
-            v-model.trim="studentForm.operatingTag"
-            clearable
-          >
-            <el-option :value="1" label="是"></el-option>
-            <el-option :value="0" label="否"></el-option>
-          </el-select>
+        <el-form-item label="家长姓名" prop="parseName">
+          <el-input v-model.trim="studentForm.parseName"></el-input>
         </el-form-item>
-        <el-form-item label="是否服务" prop="serviceTag">
+        <el-form-item
+          label="联系电话"
+          prop="phone"
+          :rules="[
+            { required: true, message: '请输入手机号' },
+            {
+              pattern: /^1\d{10}$/,
+              message: '请输入正确的手机号',
+              trigger: 'blur',
+            },
+          ]"
+        >
+          <!--   @blur="checkPhone(studentForm.phone)" -->
+          <el-input v-model.trim="studentForm.phone"></el-input>
+        </el-form-item>
+        <el-form-item label="所属分部" prop="organId">
           <el-select
             class="multiple"
-            v-model.trim="studentForm.serviceTag"
+            v-model.trim="studentForm.organId"
+            filterable
             clearable
+            placeholder="请选择分部"
+            @change="changeStudentOrgan"
           >
-            <el-option :value="1" label="是"></el-option>
-            <el-option :value="0" label="否"></el-option>
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="指导老师" prop="teacherId">
@@ -452,21 +445,31 @@
             ></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="家长姓名" prop="parseName">
-          <el-input v-model.trim="studentForm.parseName"></el-input>
+        <el-alert
+          title="课程信息"
+          type="info"
+          :closable="false"
+          style="margin-bottom: 15px;"
+        ></el-alert>
+        <el-form-item label="是否运营" prop="operatingTag">
+          <el-select
+            class="multiple"
+            v-model.trim="studentForm.operatingTag"
+            clearable
+          >
+            <el-option :value="1" label="是"></el-option>
+            <el-option :value="0" label="否"></el-option>
+          </el-select>
         </el-form-item>
-
-        <el-form-item label="出生日期" prop="date">
-          <el-date-picker
-            v-model.trim="studentForm.date"
-            style="width: 185px"
-            value-format="yyyy-MM-dd"
-            type="date"
-            :picker-options="{
-              firstDayOfWeek: 1,
-            }"
-            placeholder="选择日期"
-          ></el-date-picker>
+        <el-form-item label="是否服务" prop="serviceTag">
+          <el-select
+            class="multiple"
+            v-model.trim="studentForm.serviceTag"
+            clearable
+          >
+            <el-option :value="1" label="是"></el-option>
+            <el-option :value="0" label="否"></el-option>
+          </el-select>
         </el-form-item>
         <el-form-item label="是否是新用户" prop="isNewUser">
           <template #label>
@@ -492,6 +495,30 @@
             <el-option :value="0" label="否"></el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="关心包" prop="hasCourse">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.serviceTag"
+            clearable
+            placeholder="请选择关心包"
+          >
+            <el-option label="可用" :value="1"></el-option>
+            <el-option label="不可用" :value="2"></el-option>
+            <el-option label="已使用" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="加油包" prop="hasCourse">
+          <el-select
+            class="multiple"
+            v-model.trim="searchForm.serviceTag"
+            clearable
+            placeholder="请选择加油包"
+          >
+            <el-option label="可用" :value="1"></el-option>
+            <el-option label="不可用" :value="2"></el-option>
+            <el-option label="已使用" :value="0"></el-option>
+          </el-select>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="studentVisible = false">取 消</el-button>