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