学生管理添加：关心包和加油包

src/constant/index.js

@@ -218,3 +218,9 @@ export const complaintsStatus = {
   2: '待处理',
   3: '撤销'
 }
+
+export const packageStatus = {
+  0: '不可用',
+  1: '可用',
+  2: '已使用',
+}

src/utils/vueFilter.js

@@ -719,3 +719,8 @@ Vue.filter('journalTypeFormat', value => {
 Vue.filter('inspectionItemFormat', value => {
   return constant.inspectionItem[value]
 })
+
+// 学员列表关心包，加油包
+Vue.filter('studentPackage', value => {
+  return constant.packageStatus[value]
+})

src/views/studentManager/components/studentInfo.vue

@@ -83,6 +83,16 @@
             <el-input :value="studentForm.isNewUser ? '是' : '否'" disabled></el-input>
           </el-form-item>
         </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="关心包">
+            <el-input :value="studentForm.carePackage | studentPackage" disabled></el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :xl="6" :lg="8" :md="8" :xs="12">
+          <el-form-item label="加油包">
+            <el-input :value="studentForm.comeOnPackage | studentPackage" disabled></el-input>
+          </el-form-item>
+        </el-col>
       </el-row>
     </el-form>
 

src/views/studentManager/studentList.vue

@@ -102,9 +102,9 @@
             clearable
             placeholder="关心包"
           >
+            <el-option label="不可用" :value="0"></el-option>
             <el-option label="可用" :value="1"></el-option>
-            <el-option label="不可用" :value="2"></el-option>
-            <el-option label="已使用" :value="0"></el-option>
+            <el-option label="已使用" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item prop="hasCourse">
@@ -114,9 +114,9 @@
             clearable
             placeholder="加油包"
           >
+            <el-option label="不可用" :value="0"></el-option>
             <el-option label="可用" :value="1"></el-option>
-            <el-option label="不可用" :value="2"></el-option>
-            <el-option label="已使用" :value="0"></el-option>
+            <el-option label="已使用" :value="2"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
@@ -267,14 +267,18 @@
           </el-table-column>
           <el-table-column
             align="center"
-            prop="courseBalance"
+            prop="carePackage"
             label="关心包"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">{{ scope.row.carePackage | studentPackage }}</template>
+          </el-table-column>
           <el-table-column
             align="center"
-            prop="courseBalance"
+            prop="comeOnPackage"
             label="加油包"
-          ></el-table-column>
+          >
+            <template slot-scope="scope">{{ scope.row.comeOnPackage | studentPackage }}</template>
+          </el-table-column>
           <el-table-column
             align="center"
             fixed="right"
@@ -411,7 +415,7 @@
           ]"
         >
           <!--   @blur="checkPhone(studentForm.phone)" -->
-          <el-input v-model.trim="studentForm.phone"></el-input>
+          <el-input :maxlength="11" v-model.trim="studentForm.phone"></el-input>
         </el-form-item>
         <el-form-item label="所属分部" prop="organId">
           <el-select
@@ -495,28 +499,30 @@
             <el-option :value="0" label="否"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="关心包" prop="hasCourse">
+        <el-form-item label="关心包" prop="carePackage">
           <el-select
             class="multiple"
-            v-model.trim="searchForm.serviceTag"
+            v-model.trim="studentForm.carePackage"
             clearable
+            :disabled="!isNew && studentUpdatePackage.carePackage == 2"
             placeholder="请选择关心包"
           >
+            <el-option label="不可用" :value="0"></el-option>
             <el-option label="可用" :value="1"></el-option>
-            <el-option label="不可用" :value="2"></el-option>
-            <el-option label="已使用" :value="0"></el-option>
+            <el-option disabled label="已使用" :value="2"></el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="加油包" prop="hasCourse">
+        <el-form-item label="加油包" prop="comeOnPackage">
           <el-select
             class="multiple"
-            v-model.trim="searchForm.serviceTag"
+            v-model.trim="studentForm.comeOnPackage"
             clearable
+            :disabled="!isNew && studentUpdatePackage.comeOnPackage == 2"
             placeholder="请选择加油包"
           >
+            <el-option label="不可用" :value="0"></el-option>
             <el-option label="可用" :value="1"></el-option>
-            <el-option label="不可用" :value="2"></el-option>
-            <el-option label="已使用" :value="0"></el-option>
+            <el-option disabled label="已使用" :value="2"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -617,6 +623,7 @@ import QRCode from "qrcodejs2";
 import store from "@/store";
 import axios from "axios";
 import qs from "qs";
+import { packageStatus } from '@/constant/index'
 import { getToken } from "@/utils/auth";
 import load from "@/utils/loading";
 import { permission } from "@/utils/directivePage";
@@ -637,6 +644,8 @@ export default {
         operatingTag: null,
         serviceTag: null,
         teacherId: null,
+        carePackage: null,
+        comeOnPackage: null,
       },
       searchList: [],
       tableList: [],
@@ -663,6 +672,12 @@ export default {
         teacherId: null,
         subjectIdList: null,
         isNewUser: null,
+        carePackage: 0,
+        comeOnPackage: 0,
+      },
+      studentUpdatePackage: {
+        carePackage: 0,
+        comeOnPackage: 0
       },
       studentRules: {
         name: [{ required: true, message: "请输入学生姓名" }],
@@ -859,6 +874,8 @@ export default {
             teacherId: studentForm.teacherId,
             isNewUser: studentForm.isNewUser,
             subjectIdList: studentForm.subjectIdList,
+            carePackage: studentForm.carePackage,
+            comeOnPackage: studentForm.comeOnPackage
           };
           registerStudent(obj).then((res) => {
             if (res.code == 200) {
@@ -888,6 +905,8 @@ export default {
             teacherId: studentForm.teacherId,
             isNewUser: studentForm.isNewUser,
             subjectIdList: studentForm.subjectIdList,
+            carePackage: studentForm.carePackage,
+            comeOnPackage: studentForm.comeOnPackage
           };
           updateStudent(obj).then((res) => {
             if (res.code == 200) {
@@ -953,7 +972,13 @@ export default {
           teacherId: row.teacherId || null,
           isNewUser: row.isNewUser,
           subjectIdList: Number(row.subjectIdList) || null,
+          carePackage: row.carePackage,
+          comeOnPackage: row.comeOnPackage
         };
+        this.studentUpdatePackage = {
+          carePackage: row.carePackage,
+          comeOnPackage: row.comeOnPackage
+        }
       });
     },
     onMaskClose(formName) {