|
@@ -65,6 +65,16 @@
|
|
<el-option label="关闭" :value="false"></el-option>
|
|
<el-option label="关闭" :value="false"></el-option>
|
|
</el-select>
|
|
</el-select>
|
|
</el-form-item>
|
|
</el-form-item>
|
|
|
|
+ <el-form-item prop="allowOnlineToOffline">
|
|
|
|
+ <el-select
|
|
|
|
+ v-model.trim="searchForm.allowOnlineToOffline"
|
|
|
|
+ placeholder="请选择课程调整方式"
|
|
|
|
+ clearable
|
|
|
|
+ >
|
|
|
|
+ <el-option label="无限制" :value="1"></el-option>
|
|
|
|
+ <el-option label="线上不可转线下" :value="0"></el-option>
|
|
|
|
+ </el-select>
|
|
|
|
+ </el-form-item>
|
|
<el-form-item prop="applyToStudentType">
|
|
<el-form-item prop="applyToStudentType">
|
|
<el-select
|
|
<el-select
|
|
filterable
|
|
filterable
|
|
@@ -118,7 +128,11 @@
|
|
label="适用课时类型"
|
|
label="适用课时类型"
|
|
:formatter="fommatterCourseType"
|
|
:formatter="fommatterCourseType"
|
|
></el-table-column>
|
|
></el-table-column>
|
|
-
|
|
|
|
|
|
+ <el-table-column
|
|
|
|
+ align="center"
|
|
|
|
+ label="课程调整方式"
|
|
|
|
+ :formatter="fommatterResetType"
|
|
|
|
+ ></el-table-column>
|
|
<el-table-column
|
|
<el-table-column
|
|
align="center"
|
|
align="center"
|
|
label="使用学员"
|
|
label="使用学员"
|
|
@@ -607,6 +621,7 @@ export default {
|
|
enable: null,
|
|
enable: null,
|
|
search: "",
|
|
search: "",
|
|
applyToStudentType: null,
|
|
applyToStudentType: null,
|
|
|
|
+ allowOnlineToOffline:null,
|
|
},
|
|
},
|
|
dialogVisible: false,
|
|
dialogVisible: false,
|
|
resetForm: {
|
|
resetForm: {
|
|
@@ -616,6 +631,7 @@ export default {
|
|
courseTime: [],
|
|
courseTime: [],
|
|
stauts: [],
|
|
stauts: [],
|
|
applyToStudentType: null,
|
|
applyToStudentType: null,
|
|
|
|
+ allowOnlineToOffline: null,
|
|
organ: [],
|
|
organ: [],
|
|
}, // 修改信息
|
|
}, // 修改信息
|
|
resetFormRules: {
|
|
resetFormRules: {
|
|
@@ -878,6 +894,7 @@ export default {
|
|
vipGroupActivity({
|
|
vipGroupActivity({
|
|
organId: this.searchForm.organId,
|
|
organId: this.searchForm.organId,
|
|
applyToStudentType: this.searchForm.applyToStudentType,
|
|
applyToStudentType: this.searchForm.applyToStudentType,
|
|
|
|
+ allowOnlineToOffline:this.searchForm.allowOnlineToOffline,
|
|
rows: this.rules.limit,
|
|
rows: this.rules.limit,
|
|
page: this.rules.page,
|
|
page: this.rules.page,
|
|
enable,
|
|
enable,
|
|
@@ -926,6 +943,16 @@ export default {
|
|
}
|
|
}
|
|
return str;
|
|
return str;
|
|
},
|
|
},
|
|
|
|
+ fommatterResetType(row) {
|
|
|
|
+ let str = null;
|
|
|
|
+ if (row.allowOnlineToOffline == 1) {
|
|
|
|
+ str = "无限制";
|
|
|
|
+ }
|
|
|
|
+ if (row.allowOnlineToOffline == 0) {
|
|
|
|
+ str = "线上不可转线下";
|
|
|
|
+ }
|
|
|
|
+ return str;
|
|
|
|
+ },
|
|
formatStudentType(row) {
|
|
formatStudentType(row) {
|
|
let str = null;
|
|
let str = null;
|
|
if (row.applyToStudentType == -1) {
|
|
if (row.applyToStudentType == -1) {
|
|
@@ -959,6 +986,7 @@ export default {
|
|
this.dialogVisible = true;
|
|
this.dialogVisible = true;
|
|
this.resetForm.name = row.name;
|
|
this.resetForm.name = row.name;
|
|
this.resetForm.applyToStudentType = row.applyToStudentType;
|
|
this.resetForm.applyToStudentType = row.applyToStudentType;
|
|
|
|
+ this.resetForm.allowOnlineToOffline = row.allowOnlineToOffline;
|
|
this.resetForm.desc = row.description;
|
|
this.resetForm.desc = row.description;
|
|
|
|
|
|
if (row.organId) {
|
|
if (row.organId) {
|
|
@@ -1153,7 +1181,7 @@ export default {
|
|
name: this.resetForm.name,
|
|
name: this.resetForm.name,
|
|
description: this.resetForm.desc,
|
|
description: this.resetForm.desc,
|
|
applyToStudentType: this.resetForm.applyToStudentType,
|
|
applyToStudentType: this.resetForm.applyToStudentType,
|
|
- allowOnlineToOffline: resetForm.allowOnlineToOffline,
|
|
|
|
|
|
+ allowOnlineToOffline: this.resetForm.allowOnlineToOffline,
|
|
organId,
|
|
organId,
|
|
type,
|
|
type,
|
|
vipGroupCategoryIdList,
|
|
vipGroupCategoryIdList,
|