提交一下

1

src/constant/index.js

@@ -287,7 +287,7 @@ export const conclusion = {
   2:'异常'
 }
 export const vipResetType = {
-  1: '不限制',
+1: '不限制',
 0: '线上不可调为线下',
 2: '线下不可调为线上',
 3: '线上线下不可互调'

src/views/accompanyManager/accompanyList.vue

@@ -6,6 +6,14 @@
     <div class="topWrap">
       <div
         class="newBand"
+        v-permission="'/newPractice'"
+        @click="newPractice"
+        style="width: 120px"
+      >
+        新建网管课
+      </div>
+      <div
+        class="newBand"
         v-permission="'export/practiceGroup'"
         @click="onStudentExport"
         style="width: 150px; max-width: 150px"
@@ -20,14 +28,6 @@
       >
         网管课导出
       </div>
-      <div
-        class="newBand"
-        v-permission="'/newPractice'"
-        @click="newPractice"
-        style="width: 120px"
-      >
-        新建网管课
-      </div>
     </div>
     <div class="m-core">
       <save-form

src/views/categroyManager/modals/baseInfo.vue

@@ -107,7 +107,7 @@
           ></el-date-picker>
           <el-tooltip placement="top" popper-class="mTooltip">
             <div slot="content">
-              通过该方案购买的课程排课时间不可超过该时间范围，不填则不限制
+             通过该方案购买的课程排课时，课程时间不可超过该时间范围，不填则不限制
             </div>
             <i
               class="el-icon-question micon el-tooltip"
@@ -177,7 +177,7 @@
           </el-select>
           <el-tooltip placement="top" popper-class="mTooltip">
             <div slot="content">
-              课程余额：学员缴费金额进入课程余额，排课时扣减课程余额；若课程余额不足则不可排课
+              课程余额：学员缴费金额进入课程余额，排课时扣减课程余额；若课程余额不足则不可排课<br/>
               资格限制：学员缴费金额不进入课程余额，学员购买后增加可排课次数，排课后扣减可排课次数
               会员活动默认为资格限制，不可修改
             </div>

src/views/categroyManager/modals/payInfo.vue

@@ -129,12 +129,12 @@
         </el-row>
         <el-row>
           <el-form-item
-            label="是否限制课时"
+            label="是否限制课时数"
             prop="isLimitNum"
             :rules="[
               {
                 required: false,
-                message: '请选择是否限制课时',
+                message: '请选择是否限制课时数',
                 trigger: 'blur',
               },
             ]"
@@ -351,7 +351,7 @@
                 :label="item.label"
                 :value="item.value"
                 v-for="item in vipResetTypeList"
-                :key="item.value"
+                :key="item.label"
               ></el-option>
             </el-select>
           </el-form-item>
@@ -499,6 +499,7 @@ export default {
     };
   },
   async mounted() {
+    console.log(this.vipResetTypeList)
     await this.$store.dispatch("setVipGroupCategory");
   },
   methods: {

src/views/categroyManager/modals/salaryInfo.vue

@@ -6,11 +6,16 @@
       :closable="false"
       class="baseMsg"
     ></el-alert>
-    <div v-if="(activeType&&payForm.giveCourseType=='MEMBER')||(activeType&&!payForm.giveCourseType)">
-          <empty desc="该活动方案未设置课程，无需设置课酬信息"  />
+    <div
+      v-if="
+        (activeType && payForm.giveCourseType == 'MEMBER') ||
+        (activeType && !payForm.giveCourseType)
+      "
+    >
+      <empty desc="该活动方案未设置课程，无需设置课酬信息" />
     </div>
     <el-form
-    v-else
+      v-else
       :model="salaryForm"
       label-width="150px"
       label-position="right"
@@ -63,37 +68,34 @@
       <!--    v-if="courseTeachModeOffline" -->
       <el-row v-if="payForm.courseType == 'VIP'">
         <el-form-item
-
           label="付费VIP课课酬"
-          prop="vipOfflineSalarySettlement.salarySettlementType"
-           :rules="[{required: true, message: '请选择付费VIP课课酬'}]"
+          prop="offlineSalarySettlement.salarySettlementType"
+          :rules="[{ required: true, message: '请选择付费VIP课课酬' }]"
         >
           <el-select
             style="width: 240px !important"
             v-model.trim="
-              salaryForm.vipOfflineSalarySettlement.salarySettlementType
+              salaryForm.offlineSalarySettlement.salarySettlementType
             "
             placeholder="请选择付费VIP课课酬"
             clearable
             :disabled="isDisabled"
           >
-            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
             <el-option label="标准课酬" value="TEACHER_DEFAULT"></el-option>
+            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
           label="自定义课时课酬"
-           :rules="[{required: true, message: '请输入自定义课时课酬'}]"
-          prop="vipOfflineSalarySettlement.settlementValue"
+          :rules="[{ required: true, message: '请输入自定义课时课酬' }]"
+          prop="offlineSalarySettlement.settlementValue"
           v-if="
-            salaryForm.vipOfflineSalarySettlement.salarySettlementType ==
-            'FIXED_SALARY'&&courseTeachModeOffline
+            salaryForm.offlineSalarySettlement.salarySettlementType ==
+              'FIXED_SALARY' && courseTeachModeOffline
           "
         >
           <el-input
-            v-model.number="
-              salaryForm.vipOfflineSalarySettlement.settlementValue
-            "
+            v-model.number="salaryForm.offlineSalarySettlement.settlementValue"
             type="number"
             style="width: 240px"
             placeholder="自定义课时课酬"
@@ -108,7 +110,7 @@
           label="付费网管课课酬"
           prop="practiceSalarySettlement.salarySettlementType"
           v-if="payForm.courseType == 'PRACTICE'"
-           :rules="[{required: true, message: '请选择付费网管课课酬'}]"
+          :rules="[{ required: true, message: '请选择付费网管课课酬' }]"
         >
           <el-select
             style="width: 240px !important"
@@ -119,17 +121,17 @@
             clearable
             :disabled="isDisabled"
           >
-            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
             <el-option label="标准课酬" value="TEACHER_DEFAULT"></el-option>
+            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
-         :rules="[{required: true, message: '请输入自定义课时课酬'}]"
+          :rules="[{ required: true, message: '请输入自定义课时课酬' }]"
           label="自定义课时课酬"
           prop="practiceSalarySettlement.settlementValue"
           v-if="
             salaryForm.practiceSalarySettlement.salarySettlementType ==
-            'FIXED_SALARY'&&payForm.courseType == 'PRACTICE'
+              'FIXED_SALARY' && payForm.courseType == 'PRACTICE'
           "
         >
           <el-input
@@ -185,37 +187,37 @@
           </el-input>
         </el-form-item>
       </el-row> -->
-      <el-row   v-if="giveCourseTeachModeOffline">
+      <el-row v-if="giveCourseTeachModeOffline">
         <el-form-item
           label="赠送VIP课课酬"
-          prop="giveVipOfflineSalarySettlement.salarySettlementType"
-           :rules="[{required: true, message: '请选择赠送VIP课课酬'}]"
+          prop="giveofflineSalarySettlement.salarySettlementType"
+          :rules="[{ required: true, message: '请选择赠送VIP课课酬' }]"
         >
           <el-select
             style="width: 240px !important"
             v-model.trim="
-              salaryForm.giveVipOfflineSalarySettlement.salarySettlementType
+              salaryForm.giveofflineSalarySettlement.salarySettlementType
             "
             placeholder="请选择赠送VIP课课酬"
             clearable
             :disabled="isDisabled"
           >
-            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
             <el-option label="标准课酬" value="TEACHER_DEFAULT"></el-option>
+            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
           label="自定义课时课酬"
-           :rules="[{required: true, message: '请输入自定义课时课酬'}]"
-          prop="giveVipOfflineSalarySettlement.settlementValue"
+          :rules="[{ required: true, message: '请输入自定义课时课酬' }]"
+          prop="giveofflineSalarySettlement.settlementValue"
           v-if="
-            salaryForm.giveVipOfflineSalarySettlement.salarySettlementType ==
-            'FIXED_SALARY'&&giveCourseTeachModeOffline
+            salaryForm.giveofflineSalarySettlement.salarySettlementType ==
+              'FIXED_SALARY' && giveCourseTeachModeOffline
           "
         >
           <el-input
             v-model.number="
-              salaryForm.giveVipOfflineSalarySettlement.settlementValue
+              salaryForm.giveofflineSalarySettlement.settlementValue
             "
             type="number"
             style="width: 240px"
@@ -226,11 +228,13 @@
           </el-input>
         </el-form-item>
       </el-row>
-      <el-row v-if="payForm.giveCourseType=='PRACTICE'&&payForm.giveCourseNum>0">
+      <el-row
+        v-if="payForm.giveCourseType == 'PRACTICE' && payForm.giveCourseNum > 0"
+      >
         <el-form-item
           label="赠送网管课课酬"
           prop="givePracticeSalarySettlement.salarySettlementType"
-          :rules="[{required: true, message: '请选择赠送网管课课酬'}]"
+          :rules="[{ required: true, message: '请选择赠送网管课课酬' }]"
         >
           <el-select
             style="width: 240px !important"
@@ -241,8 +245,8 @@
             clearable
             :disabled="isDisabled"
           >
-            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
             <el-option label="标准课酬" value="TEACHER_DEFAULT"></el-option>
+            <el-option label="自定义课酬" value="FIXED_SALARY"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item
@@ -250,7 +254,9 @@
           prop="givePracticeSalarySettlement.settlementValue"
           v-if="
             salaryForm.givePracticeSalarySettlement.salarySettlementType ==
-            'FIXED_SALARY'&&payForm.giveCourseType=='PRACTICE'&&payForm.giveCourseNum>0
+              'FIXED_SALARY' &&
+            payForm.giveCourseType == 'PRACTICE' &&
+            payForm.giveCourseNum > 0
           "
         >
           <el-input
@@ -271,7 +277,7 @@
 </template>
 <script>
 export default {
-  props: ["salaryForm", "payForm",'activeType','isDisabled'],
+  props: ["salaryForm", "payForm", "activeType", "isDisabled"],
   data() {
     return {};
   },
@@ -279,16 +285,37 @@ export default {
   methods: {},
   computed: {
     courseTeachModeOnline() {
-      return (this.payForm?.teachMode == -1 ||  this.payForm?.teachMode == 0)&&this.payForm?.courseType=='VIP';
+      return (
+        (this.payForm?.teachMode == -1 || this.payForm?.teachMode == 0) &&
+        this.payForm?.courseType == "VIP"
+      );
     },
     courseTeachModeOffline() {
-       return (this.payForm?.teachMode == -1 ||  this.payForm?.teachMode == 1 || this.payForm?.teachMode == 0)&&this.payForm?.courseType=='VIP';
+      return (
+        (this.payForm?.teachMode == -1 ||
+          this.payForm?.teachMode == 1 ||
+          this.payForm?.teachMode == 0) &&
+        this.payForm?.courseType == "VIP"
+      );
     },
     giveCourseTeachModeOnline() {
-       return (this.payForm?.giveTeachMode == -1 ||  this.payForm?.giveTeachMode == 0)&&this.payForm?.fullMinusCourseTimes>0&&this.payForm?.giveCourseType=='VIP'&&this.payForm?.giveCourseNum>0;
+      return (
+        (this.payForm?.giveTeachMode == -1 ||
+          this.payForm?.giveTeachMode == 0) &&
+        this.payForm?.fullMinusCourseTimes > 0 &&
+        this.payForm?.giveCourseType == "VIP" &&
+        this.payForm?.giveCourseNum > 0
+      );
     },
     giveCourseTeachModeOffline() {
-     return (this.payForm?.giveTeachMode == -1 ||  this.payForm?.giveTeachMode == 1 || this.payForm?.giveTeachMode == 0)&&this.payForm?.fullMinusCourseTimes>0&&this.payForm?.giveCourseType=='VIP'&&this.payForm?.giveCourseNum>0;
+      return (
+        (this.payForm?.giveTeachMode == -1 ||
+          this.payForm?.giveTeachMode == 1 ||
+          this.payForm?.giveTeachMode == 0) &&
+        this.payForm?.fullMinusCourseTimes > 0 &&
+        this.payForm?.giveCourseType == "VIP" &&
+        this.payForm?.giveCourseNum > 0
+      );
     },
   },
 };

src/views/categroyManager/vipNewActive.vue

@@ -126,7 +126,7 @@ const baseSalaryForm = {
     salarySettlementType: null,
     settlementValue: null,
   },
-  vipOfflineSalarySettlement: {
+  offlineSalarySettlement: {
     salarySettlementType: null,
     settlementValue: null,
   },
@@ -134,7 +134,7 @@ const baseSalaryForm = {
     salarySettlementType: null,
     settlementValue: null,
   },
-  giveVipOfflineSalarySettlement: {
+  giveofflineSalarySettlement: {
     salarySettlementType: null,
     settlementValue: null,
   },
@@ -480,7 +480,6 @@ export default {
          giveAllowOnlineToOffline:data.giveAllowOnlineToOffline+''
       };
       // 格式化缴费金额
-      console.log(data.salarySettlementJson);
       if (data.salarySettlementJson && data.salarySettlementJson != "null") {
         this.salaryForm = JSON.parse(JSON.stringify({ ...baseSalaryForm }));
         let result = JSON.parse(data.salarySettlementJson);