Merge branch '03/03GRADE' into test

src/views/categroyManager/modals/payInfo.vue

@@ -251,7 +251,10 @@
           label="折扣值"
           :rules="[
             { required: true, message: '请输入折扣值', trigger: 'blur' },
-            { pattern:/^100$|^(\d|[1-9]\d)(\.\d{1,8})*$/, message: '请输入正确的折扣' }
+            {
+              pattern: /^100$|^(\d|[1-9]\d)(\.\d{1,8})*$/,
+              message: '请输入正确的折扣',
+            },
           ]"
         >
           <el-input
@@ -324,6 +327,37 @@
         </el-form-item>
         <el-col>
           <el-form-item
+            label="赠课调整方式"
+            prop="giveAllowOnlineToOffline"
+            v-if="
+              payForm.giveCourseType == 'VIP' && payForm.fullMinusCourseTimes
+            "
+            :rules="[
+              {
+                required: true,
+                message: '请选择赠课调整方式',
+                trigger: 'change',
+              },
+            ]"
+          >
+            <el-select
+              style="width: 400px !important"
+              v-model.trim="payForm.giveAllowOnlineToOffline"
+              placeholder="请选择赠课调整方式"
+              clearable
+              :disabled="isDisabled"
+            >
+              <el-option
+                :label="item.label"
+                :value="item.value"
+                v-for="item in vipResetTypeList"
+                :key="item.value"
+              ></el-option>
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col>
+          <el-form-item
             label="赠课形式"
             prop="giveCategoryId"
             v-if="
@@ -404,7 +438,11 @@
           label="赠送会员名称"
           prop="giveMemberRankId"
           :rules="[
-            { required: true, message: '请选择赠送会员名称', trigger: 'change' },
+            {
+              required: true,
+              message: '请选择赠送会员名称',
+              trigger: 'change',
+            },
           ]"
         >
           <el-select

src/views/categroyManager/vipNewActive.vue

@@ -119,6 +119,7 @@ const payBaseForm = {
   giveCourseNum: null,
   giveMemberRankId: null,
   giveMemberTime: null,
+  giveAllowOnlineToOffline:null
 };
 const baseSalaryForm = {
   vipOnlineSalarySettlement: {
@@ -269,6 +270,8 @@ export default {
       this.$set(this.payForm, "giveMemberRankId", null);
       this.$set(this.payForm, "givePeriod", null);
       this.$set(this.payForm, "giveTeachMode", "");
+      this.$set(this.payForm, "giveAllowOnlineToOffline", "");
+
     },
     chageSalary() {
       this.salaryForm = null;