提交一下 VIP活动改版

1

src/views/categroyManager/vipActiveList.vue

@@ -260,7 +260,30 @@
               ></el-option>
             </select-all>
           </el-form-item>
+<<<<<<< Updated upstream
           <el-form-item label="适用学员" label-width="120px" prop="applyToStudentType">
+=======
+          <el-form-item
+            label="课程调整方式"
+            label-width="120px"
+            prop="allowOnlineToOffline"
+          >
+            <el-select
+              style="width: 100% !important"
+              v-model.trim="resetForm.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
+            label="使用学员"
+            label-width="120px"
+            prop="applyToStudentType"
+          >
+>>>>>>> Stashed changes
             <el-select
               v-model.trim="resetForm.applyToStudentType"
               style="width: 100% !important"
@@ -583,7 +606,12 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50], // 选择限制显示条数
       },
-      searchForm: { organId: null, enable: null, search: "", applyToStudentType: null },
+      searchForm: {
+        organId: null,
+        enable: null,
+        search: "",
+        applyToStudentType: null,
+      },
       dialogVisible: false,
       resetForm: {
         name: "",
@@ -626,6 +654,9 @@ export default {
         applyToStudentType: [
           { required: true, message: "请选择是否新生专享", trigger: "change" },
         ],
+        allowOnlineToOffline: [
+          { required: true, message: "请选择课程调整方式" },
+        ],
       },
       courseStatusList: [],
       activeType: "",
@@ -900,17 +931,17 @@ export default {
       return str;
     },
     formatStudentType(row) {
-      let str = null
-      if(row.applyToStudentType == -1) {
-        str = '所有学员'
+      let str = null;
+      if (row.applyToStudentType == -1) {
+        str = "所有学员";
       }
-      if(row.applyToStudentType == 0) {
-        str = '老学员'
+      if (row.applyToStudentType == 0) {
+        str = "老学员";
       }
-      if(row.applyToStudentType == 1) {
-        str = '新学员'
+      if (row.applyToStudentType == 1) {
+        str = "新学员";
       }
-      return str
+      return str;
     },
     // 格式化启用状态
     fommatterEnable(row) {
@@ -999,14 +1030,11 @@ export default {
       this.attribute1 = row.attribute1;
       this.attribute2 = row.attribute2;
 
-      let studentMaxUsedTimes = row.studentMaxUsedTimes == -1?null:row.studentMaxUsedTimes
-      let minCourseNum = row.minCourseNum == -1?null:row.minCourseNum
-      let maxCourseNum = row.maxCourseNum == -1?null:row.maxCourseNum
-      this.$set(
-        this.courseNumForm,
-        "studentMaxUsedTimes",
-        studentMaxUsedTimes
-      );
+      let studentMaxUsedTimes =
+        row.studentMaxUsedTimes == -1 ? null : row.studentMaxUsedTimes;
+      let minCourseNum = row.minCourseNum == -1 ? null : row.minCourseNum;
+      let maxCourseNum = row.maxCourseNum == -1 ? null : row.maxCourseNum;
+      this.$set(this.courseNumForm, "studentMaxUsedTimes", studentMaxUsedTimes);
       this.$set(this.courseNumForm, "minCourseNum", minCourseNum);
       this.$set(this.courseNumForm, "maxCourseNum", maxCourseNum);
       this.giveClassPaySalaryFlag =
@@ -1129,6 +1157,7 @@ export default {
                 name: this.resetForm.name,
                 description: this.resetForm.desc,
                 applyToStudentType: this.resetForm.applyToStudentType,
+                allowOnlineToOffline: resetForm.allowOnlineToOffline,
                 organId,
                 type,
                 vipGroupCategoryIdList,
@@ -1139,7 +1168,9 @@ export default {
                 attribute2: this.attribute2,
                 minCourseNum: this.courseNumForm.minCourseNum,
                 maxCourseNum: this.courseNumForm.maxCourseNum,
-                studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes?this.courseNumForm.studentMaxUsedTimes:-1,
+                studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes
+                  ? this.courseNumForm.studentMaxUsedTimes
+                  : -1,
                 onlineClassJoinGradientRewards:
                   this.onlineClassJoinGradientRewards * 1,
                 offlineClassJoinGradientRewards:

src/views/categroyManager/vipNewActive.vue

@@ -56,7 +56,21 @@
             ></el-option>
           </select-all>
         </el-form-item>
+<<<<<<< Updated upstream
         <el-form-item label="适用学员" prop="applyToStudentType">
+=======
+        <el-form-item label="课程调整方式" prop="allowOnlineToOffline">
+          <el-select
+            v-model.trim="vipform.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 label="使用学员" prop="applyToStudentType">
+>>>>>>> Stashed changes
           <el-select
             v-model.trim="vipform.applyToStudentType"
             placeholder="请选择适用学员"
@@ -236,14 +250,13 @@
                 () => {
                   this.$refs['form'].resetFields();
                   activeType = 'BASE_ACTIVITY';
-                    courseNumForm = {
-                      minCourseNum: '',
-                      maxCourseNum: '',
-                      studentMaxUsedTimes: '',
-                    };
-                    attribute1 = '';
-                    attribute2 = '';
-
+                  courseNumForm = {
+                    minCourseNum: '',
+                    maxCourseNum: '',
+                    studentMaxUsedTimes: '',
+                  };
+                  attribute1 = '';
+                  attribute2 = '';
                 }
               "
             >
@@ -282,7 +295,6 @@
                   style="margin-left: 10px; width: 120px !important"
                   placeholder="最小课时数"
                 >
-
                 </el-input>
               </el-form-item>
               <el-form-item prop="maxCourseNum">
@@ -293,19 +305,17 @@
                   style="margin-left: 10px; width: 120px !important"
                   placeholder="最大课时数"
                 >
-
                 </el-input>
               </el-form-item>
-               <el-form-item>
-                  <el-input
-                    v-model.number="courseNumForm.studentMaxUsedTimes"
-                    type="number"
-                    style="margin-left: 10px; width: 120px !important"
-                    placeholder="学员购买次数"
-                  >
-
-                  </el-input>
-                </el-form-item>
+              <el-form-item>
+                <el-input
+                  v-model.number="courseNumForm.studentMaxUsedTimes"
+                  type="number"
+                  style="margin-left: 10px; width: 120px !important"
+                  placeholder="学员购买次数"
+                >
+                </el-input>
+              </el-form-item>
             </el-form>
           </div>
           <div>
@@ -316,11 +326,10 @@
                 () => {
                   this.$refs['form'].resetFields();
                   activeType = 'GIVE_CLASS';
-                 courseNumForm.minCourseNum = '';
-                    courseNumForm.maxCourseNum = '';
-                    attribute1 = '';
-                    attribute2 = '';
-
+                  courseNumForm.minCourseNum = '';
+                  courseNumForm.maxCourseNum = '';
+                  attribute1 = '';
+                  attribute2 = '';
                 }
               "
             >
@@ -334,7 +343,7 @@
               @mousewheel.native.prevent
               style="margin-right: 10px; width: 200px !important"
             >
-             <template slot="append">节</template>
+              <template slot="append">节</template>
             </el-input>
             <span v-if="activeType == 'GIVE_CLASS'">赠</span>
             <el-input
@@ -345,17 +354,16 @@
               v-model.trim="attribute2"
               style="margin: 0 10px; width: 200px !important"
             >
-             <template slot="append">节</template>
+              <template slot="append">节</template>
+            </el-input>
+            <el-input
+              v-show="activeType == 'GIVE_CLASS'"
+              v-model.number="courseNumForm.studentMaxUsedTimes"
+              type="number"
+              style="margin-left: 10px; width: 120px !important"
+              placeholder="学员购买次数"
+            >
             </el-input>
-                 <el-input
-                v-show="activeType == 'GIVE_CLASS'"
-                v-model.number="courseNumForm.studentMaxUsedTimes"
-                type="number"
-                style="margin-left: 10px; width: 120px !important"
-                placeholder="学员购买次数"
-              >
-
-              </el-input>
             <!-- <el-checkbox
               v-if="activeType=='GIVE_CLASS'"
               v-model.trim="giveClassPaySalaryFlag"
@@ -424,7 +432,10 @@ export default {
         stauts: [
           { required: true, message: "请选择活动形式", trigger: "blur" },
         ],
-        applyToStudentType: [{ required: true, message: '请选择是否新生专享' }]
+        applyToStudentType: [{ required: true, message: "请选择是否新生专享" }],
+        allowOnlineToOffline: [
+          { required: true, message: "请选择课程调整方式" },
+        ],
       },
       courseStatusList: [], // 获取所有课程形式
       activeType: "",
@@ -441,7 +452,7 @@ export default {
       courseNumForm: {
         minCourseNum: "",
         maxCourseNum: "",
-         studentMaxUsedTimes: "",
+        studentMaxUsedTimes: "",
       },
       giveClassPaySalaryFlag: true,
       organList: [],
@@ -574,7 +585,7 @@ export default {
                 this.$message.error("请选择活动类型");
                 return;
               }
-                if (!this.online && !this.unonline) {
+              if (!this.online && !this.unonline) {
                 this.$message.error("请选择活动适用范围");
                 return;
               }
@@ -637,7 +648,7 @@ export default {
                 onlineSalarySettlement,
                 offlineSalarySettlement,
               };
-                    if (type == "BASE_ACTIVITY") {
+              if (type == "BASE_ACTIVITY") {
                 this.courseNumForm.studentMaxUsedTimes = -1;
                 this.courseNumForm.minCourseNum = -1;
                 this.courseNumForm.maxCourseNum = -1;
@@ -655,6 +666,7 @@ export default {
                   name: this.vipform.name,
                   description: this.vipform.desc,
                   applyToStudentType: this.vipform.applyToStudentType,
+                  allowOnlineToOffline: this.vipform.allowOnlineToOffline,
                   organId,
                   type,
                   vipGroupCategoryIdList,
@@ -666,7 +678,9 @@ export default {
                   attribute2: this.attribute2,
                   minCourseNum: this.courseNumForm.minCourseNum,
                   maxCourseNum: this.courseNumForm.maxCourseNum,
-                 studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes?this.courseNumForm.studentMaxUsedTimes:-1,
+                  studentMaxUsedTimes: this.courseNumForm.studentMaxUsedTimes
+                    ? this.courseNumForm.studentMaxUsedTimes
+                    : -1,
                   offlineClassJoinGradientRewards:
                     this.offlineClassJoinGradientRewards * 1,
                   onlineClassJoinGradientRewards: