Merge branch '03/03GRADE' into test

src/views/categroyManager/modals/salaryInfo.vue

@@ -17,7 +17,7 @@
       :inline="true"
       ref="salaryForm"
     >
-      <el-row v-if="payForm.courseType == 'VIP'">
+      <!-- <el-row v-if="payForm.courseType == 'VIP'">
         <el-form-item
           v-if="courseTeachModeOnline"
           label="付费VIP线上课课酬"
@@ -59,20 +59,21 @@
             <template slot="append">课时/元</template>
           </el-input>
         </el-form-item>
-      </el-row>
+      </el-row> -->
+      <!--    v-if="courseTeachModeOffline" -->
       <el-row v-if="payForm.courseType == 'VIP'">
         <el-form-item
-         v-if="courseTeachModeOffline"
-          label="付费VIP线下课课酬"
+
+          label="付费VIP课课酬"
           prop="vipOfflineSalarySettlement.salarySettlementType"
-           :rules="[{required: true, message: '请选择付费VIP线下课课酬'}]"
+           :rules="[{required: true, message: '请选择付费VIP课课酬'}]"
         >
           <el-select
             style="width: 240px !important"
             v-model.trim="
               salaryForm.vipOfflineSalarySettlement.salarySettlementType
             "
-            placeholder="请选择付费VIP线下课课酬"
+            placeholder="请选择付费VIP课课酬"
             clearable
             :disabled="isDisabled"
           >
@@ -142,7 +143,7 @@
           </el-input>
         </el-form-item>
       </el-row>
-      <el-row>
+      <!-- <el-row>
         <el-form-item
        v-if="giveCourseTeachModeOnline"
           label="赠送VIP线上课课酬"
@@ -183,19 +184,19 @@
             <template slot="append">课时/元</template>
           </el-input>
         </el-form-item>
-      </el-row>
+      </el-row> -->
       <el-row   v-if="giveCourseTeachModeOffline">
         <el-form-item
-          label="赠送VIP线下课课酬"
+          label="赠送VIP课课酬"
           prop="giveVipOfflineSalarySettlement.salarySettlementType"
-           :rules="[{required: true, message: '请选择赠送VIP线下课课酬'}]"
+           :rules="[{required: true, message: '请选择赠送VIP课课酬'}]"
         >
           <el-select
             style="width: 240px !important"
             v-model.trim="
               salaryForm.giveVipOfflineSalarySettlement.salarySettlementType
             "
-            placeholder="请选择赠送VIP线下课课酬"
+            placeholder="请选择赠送VIP课课酬"
             clearable
             :disabled="isDisabled"
           >
@@ -281,13 +282,13 @@ export default {
       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?.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;
     },
     giveCourseTeachModeOffline() {
-     return (this.payForm?.giveTeachMode == -1 ||  this.payForm?.giveTeachMode == 1)&&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;
     },
   },
 };