|
|
@@ -145,6 +145,30 @@
|
|
|
<el-option label="否" value="false"></el-option>
|
|
|
</el-select>
|
|
|
</el-form-item>
|
|
|
+ <el-form-item prop="carePackage">
|
|
|
+ <el-select
|
|
|
+ class="multiple"
|
|
|
+ v-model.trim="searchForm.carePackage"
|
|
|
+ clearable
|
|
|
+ placeholder="关心包"
|
|
|
+ >
|
|
|
+ <el-option label="不可用" :value="0"></el-option>
|
|
|
+ <el-option label="可用" :value="1"></el-option>
|
|
|
+ <el-option label="已使用" :value="2"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
+ <el-form-item prop="comeOnPackage">
|
|
|
+ <el-select
|
|
|
+ class="multiple"
|
|
|
+ v-model.trim="searchForm.comeOnPackage"
|
|
|
+ clearable
|
|
|
+ placeholder="加油包"
|
|
|
+ >
|
|
|
+ <el-option label="不可用" :value="0"></el-option>
|
|
|
+ <el-option label="可用" :value="1"></el-option>
|
|
|
+ <el-option label="已使用" :value="2"></el-option>
|
|
|
+ </el-select>
|
|
|
+ </el-form-item>
|
|
|
<el-form-item>
|
|
|
<el-button native-type="submit" type="danger">搜索</el-button>
|
|
|
<el-button type="primary" native-type="reset">重置</el-button>
|
|
|
@@ -246,6 +270,18 @@
|
|
|
<div>{{ scope.row.hasCourse ? "是" : "否" }}</div>
|
|
|
</template>
|
|
|
</el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="关心包"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">{{ scope.row.carePackage | studentPackage }}</template>
|
|
|
+ </el-table-column>
|
|
|
+ <el-table-column
|
|
|
+ align="center"
|
|
|
+ label="加油包"
|
|
|
+ >
|
|
|
+ <template slot-scope="scope">{{ scope.row.comeOnPackage | studentPackage }}</template>
|
|
|
+ </el-table-column>
|
|
|
<el-table-column align="center" label="欠费金额(元)">
|
|
|
<template slot-scope="scope">
|
|
|
<div :class="[scope.row.noPaymentAmount > 0 ? 'error' : null]">{{ scope.row.noPaymentAmount | moneyFormat }}
|
|
|
@@ -732,7 +768,9 @@ export default {
|
|
|
search: "",
|
|
|
isActive: "",
|
|
|
classGroupId: null,
|
|
|
- hasCourse: null
|
|
|
+ hasCourse: null,
|
|
|
+ carePackage: null,
|
|
|
+ comeOnPackage: null
|
|
|
},
|
|
|
organizationCourseUnitPriceSettings: [],
|
|
|
quitForm: {
|
|
|
@@ -1019,7 +1057,9 @@ export default {
|
|
|
search: this.searchForm.search || null,
|
|
|
isActive: this.searchForm.isActive || null,
|
|
|
classGroupId: this.searchForm.classGroupId || null,
|
|
|
- hasCourse: this.searchForm.hasCourse || null
|
|
|
+ hasCourse: this.searchForm.hasCourse || null,
|
|
|
+ comeOnPackage: this.searchForm.comeOnPackage || null,
|
|
|
+ carePackage: this.searchForm.carePackage || null,
|
|
|
};
|
|
|
const options = {
|
|
|
method: "get",
|
|
|
@@ -1094,7 +1134,9 @@ export default {
|
|
|
search: this.searchForm.search || null,
|
|
|
isActive: this.searchForm.isActive || null,
|
|
|
classGroupId: this.searchForm.classGroupId || null,
|
|
|
- hasCourse: this.searchForm.hasCourse || null
|
|
|
+ hasCourse: this.searchForm.hasCourse || null,
|
|
|
+ comeOnPackage: this.searchForm.comeOnPackage || null,
|
|
|
+ carePackage: this.searchForm.carePackage || null,
|
|
|
};
|
|
|
getTeamStudentList(obj).then((res) => {
|
|
|
if (res.code == 200) {
|
