06/12 10:36

111

dist/static/css/chunk-1da71d87.5a120381.css → dist/static/css/chunk-dd8f178c.4a0449f2.css

@@ -1 +1 @@
-.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-b452bb0e]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-b452bb0e]{display:inline-block}
+.pagination-container[data-v-31cb099a]{background:#fff;padding:32px 16px;width:100%;display:-webkit-box;display:-ms-flexbox;display:flex;-webkit-box-orient:horizontal;-webkit-box-direction:normal;-ms-flex-direction:row;flex-direction:row;-webkit-box-pack:center;-ms-flex-pack:center;justify-content:center}.pagination-container.hidden[data-v-31cb099a]{display:none}.m-container[data-v-f66e4124]{-webkit-box-sizing:border-box;box-sizing:border-box;background-color:#fff}.newBand[data-v-f66e4124]{display:inline-block}

src/views/categroyManager/vipActiveList.vue

@@ -5,56 +5,64 @@
     </h2>
 
     <div class="m-core">
-      <div class="newBand" v-permission="'/vipNewActive'" @click="gotoNewActive">新建</div>
-      <el-form :inline="true" class="searchForm" v-model.trim="searchForm">
+      <div class="newBand"
+           v-permission="'/vipNewActive'"
+           @click="gotoNewActive">新建</div>
+      <el-form :inline="true"
+               class="searchForm"
+               v-model.trim="searchForm">
         <el-form-item prop="organId">
-          <el-select
-            class="multiple"
-            filterable
-            style="width:180px!important"
-            v-model.trim="searchForm.organId"
-            clearable
-            placeholder="请选择分部"
-          >
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+          <el-select class="multiple"
+                     filterable
+                     style="width:180px!important"
+                     v-model.trim="searchForm.organId"
+                     clearable
+                     placeholder="请选择分部">
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
         </el-form-item>
-                <el-form-item prop="organId">
-          <el-select
-            filterable
-            style="width:180px!important"
-            v-model="searchForm.enable"
-            clearable
-            @clear='resetEnable'
-            placeholder="活动状态"
-          >
-            <el-option
-              label="开启"
-              :value="true"
-            ></el-option>
-            <el-option
-              label="关闭"
-              :value="false"
-            ></el-option>
+        <el-form-item prop="organId">
+          <el-select filterable
+                     style="width:180px!important"
+                     v-model="searchForm.enable"
+                     clearable
+                     @clear='resetEnable'
+                     placeholder="活动状态">
+            <el-option label="开启"
+                       :value="true"></el-option>
+            <el-option label="关闭"
+                       :value="false"></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button @click="search" type="danger">搜索</el-button>
+          <el-button @click="search"
+                     type="danger">搜索</el-button>
         </el-form-item>
       </el-form>
       <div class="tableWrap">
-        <el-table :data="tableList" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column align="center" prop="id" label="活动编号"></el-table-column>
-          <el-table-column align="center" prop="name" label="活动名称"></el-table-column>
-          <el-table-column align="center" prop="vipGroupCategoryNames" label="适用课程形式"></el-table-column>
-          <el-table-column align="center" prop="type" :formatter="fommatterType" label="活动类型"></el-table-column>
-          <el-table-column align="center" label="适用课时类型" :formatter="fommatterCourseType"></el-table-column>
-          <el-table-column align="center" label="结算标准">
+        <el-table :data="tableList"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column align="center"
+                           prop="id"
+                           label="活动编号"></el-table-column>
+          <el-table-column align="center"
+                           prop="name"
+                           label="活动名称"></el-table-column>
+          <el-table-column align="center"
+                           prop="vipGroupCategoryNames"
+                           label="适用课程形式"></el-table-column>
+          <el-table-column align="center"
+                           prop="type"
+                           :formatter="fommatterType"
+                           label="活动类型"></el-table-column>
+          <el-table-column align="center"
+                           label="适用课时类型"
+                           :formatter="fommatterCourseType"></el-table-column>
+          <el-table-column align="center"
+                           label="结算标准">
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.salarySettlementJson | onlinePip }}</p>
@@ -62,7 +70,8 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="结算说明">
+          <el-table-column align="center"
+                           label="结算说明">
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.salarySettlementJson | onlineDesc }}</p>
@@ -70,8 +79,13 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="启用状态" prop="enable" :formatter="fommatterEnable"></el-table-column>
-          <el-table-column align="center" width="130px" label="活动持续时间">
+          <el-table-column align="center"
+                           label="启用状态"
+                           prop="enable"
+                           :formatter="fommatterEnable"></el-table-column>
+          <el-table-column align="center"
+                           width="130px"
+                           label="活动持续时间">
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.startTime | formatTimer }}</p>
@@ -79,115 +93,117 @@
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" width="130px" label="课程安排时间">
+          <el-table-column align="center"
+                           width="130px"
+                           label="课程安排时间">
             <template slot-scope="scope">
               <div>
                 <p>{{ scope.row.coursesStartTime | formatTimer }}</p>
-                <p>{{ scope.row.coursesEndTime | formatTimer }}</p> 
+                <p>{{ scope.row.coursesEndTime | formatTimer }}</p>
               </div>
             </template>
           </el-table-column>
-          <el-table-column align="center" label="操作">
+          <el-table-column align="center"
+                           label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button
-                  type="text"
-                  v-permission="'vipGroupActivity/update'"
-                  @click="reset(scope.row)"
-                >修改</el-button>
+                <el-button type="text"
+                           v-permission="'vipGroupActivity/update'"
+                           @click="reset(scope.row)">修改</el-button>
                 <!-- <el-button type='text'
                 @click="remove(scope.row)">删除</el-button>-->
-                <el-popover
-                  placement="top"
-                  width="160"
-                  v-permission="'vipGroupActivity/delete'"
-                  :ref="scope.$index"
-                >
+                <el-popover placement="top"
+                            width="160"
+                            v-permission="'vipGroupActivity/delete'"
+                            :ref="scope.$index">
                   <p>确定删除?</p>
                   <div style="text-align: right; margin: 0">
-                    <el-button
-                      size="mini"
-                      type="text"
-                      @click="scope._self.$refs[scope.$index].doClose()"
-                    >取消</el-button>
-                    <el-button type="primary" size="mini" @click="remove(scope)">确定</el-button>
+                    <el-button size="mini"
+                               type="text"
+                               @click="scope._self.$refs[scope.$index].doClose()">取消</el-button>
+                    <el-button type="primary"
+                               size="mini"
+                               @click="remove(scope)">确定</el-button>
                   </div>
-                  <el-button type="text" slot="reference">删除</el-button>
+                  <el-button type="text"
+                             slot="reference">删除</el-button>
                 </el-popover>
               </div>
             </template>
           </el-table-column>
         </el-table>
         <!-- 分页器 -->
-        <pagination
-          :total="rules.total"
-          :page.sync="rules.page"
-          :limit.sync="rules.limit"
-          :page-sizes="rules.page_size"
-          @pagination="getList"
-        />
+        <pagination :total="rules.total"
+                    :page.sync="rules.page"
+                    :limit.sync="rules.limit"
+                    :page-sizes="rules.page_size"
+                    @pagination="getList" />
       </div>
     </div>
-    <el-dialog title="提示" width="60%" :before-close="closeVipform" :visible.sync="dialogVisible">
+    <el-dialog title="提示"
+               width="60%"
+               :before-close="closeVipform"
+               :visible.sync="dialogVisible">
       <div>
-        <el-form
-          :label-position="labelPosition"
-          :model="resetForm"
-          ref="vipform"
-          :rules="resetFormRules"
-          class="vipform"
-        >
-          <el-form-item label="活动名称" prop="name">
-            <el-input style="width:400px" v-model.trim="resetForm.name"></el-input>
+        <el-form :label-position="labelPosition"
+                 :model="resetForm"
+                 ref="vipform"
+                 :rules="resetFormRules"
+                 class="vipform">
+          <el-form-item label="活动名称"
+                        prop="name">
+            <el-input style="width:400px"
+                      v-model.trim="resetForm.name"></el-input>
           </el-form-item>
-          <el-form-item label="适用分部" prop="organ">
-            <el-select v-model.trim="resetForm.organ" filterable multiple clearable>
-              <el-option
-                v-for="(item,index) in organList"
-                :key="index"
-                :label="item.name"
-                :value="item.id"
-              ></el-option>
+          <el-form-item label="适用分部"
+                        prop="organ">
+            <el-select v-model.trim="resetForm.organ"
+                       filterable
+                       multiple
+                       clearable>
+              <el-option v-for="(item,index) in organList"
+                         :key="index"
+                         :label="item.name"
+                         :value="item.id"></el-option>
             </el-select>
             <el-button @click="onCheckAllBranch">适用所有分部</el-button>
           </el-form-item>
-          <el-form-item label="活动描述" prop="desc">
-            <el-input
-              type="textarea"
-              v-model.trim="resetForm.desc"
-              style="width:400px"
-              :rows="5"
-              placeholder="请输入活动说明"
-            ></el-input>
+          <el-form-item label="活动描述"
+                        prop="desc">
+            <el-input type="textarea"
+                      v-model.trim="resetForm.desc"
+                      style="width:400px"
+                      :rows="5"
+                      placeholder="请输入活动说明"></el-input>
           </el-form-item>
-          <el-form-item label="活动时间" prop="activeTime">
-            <el-date-picker
-              v-model.trim="resetForm.activeTime"
-              type="daterange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
+          <el-form-item label="活动时间"
+                        prop="activeTime">
+            <el-date-picker v-model.trim="resetForm.activeTime"
+                            type="daterange"
+                            range-separator="至"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
-          <el-form-item label="课程时间" prop="courseTime">
-            <el-date-picker
-              v-model.trim="resetForm.courseTime"
-              type="datetimerange"
-              range-separator="至"
-              value-format="yyyy-MM-dd HH:mm:ss"
-              start-placeholder="开始日期"
-              end-placeholder="结束日期"
-            ></el-date-picker>
+          <el-form-item label="课程时间"
+                        prop="courseTime">
+            <el-date-picker v-model.trim="resetForm.courseTime"
+                            type="datetimerange"
+                            range-separator="至"
+                            value-format="yyyy-MM-dd HH:mm:ss"
+                            start-placeholder="开始日期"
+                            end-placeholder="结束日期"></el-date-picker>
           </el-form-item>
-          <el-form-item label="课程形式" prop="stauts">
-            <el-select v-model.trim="resetForm.stauts" filterable clearable multiple>
-              <el-option
-                v-for="(item,index) in courseStatusList"
-                :key="index"
-                :value="item.id"
-                :label="item.name"
-              ></el-option>
+          <el-form-item label="课程形式"
+                        prop="stauts">
+            <el-select v-model.trim="resetForm.stauts"
+                       filterable
+                       clearable
+                       multiple>
+              <el-option v-for="(item,index) in courseStatusList"
+                         :key="index"
+                         :value="item.id"
+                         :label="item.name"></el-option>
             </el-select>
           </el-form-item>
         </el-form>
@@ -197,51 +213,57 @@
           </div>
           <div class="right">
             <div class="chioseWrap">
-              <el-checkbox label="线上课" v-model.trim="online"></el-checkbox>
-              <el-select v-model.trim="onlineSalary" clearable filterable>
-                <el-option label="老师默认课酬" value="TEACHER_DEFAULT"></el-option>
-                <el-option label="实际课程单价比例折扣" value="RATIO_DISCOUNT"></el-option>
-                <el-option label="固定课酬" value="FIXED_SALARY"></el-option>
+              <el-checkbox label="线上课"
+                           v-model.trim="online"></el-checkbox>
+              <el-select v-model.trim="onlineSalary"
+                         clearable
+                         filterable>
+                <el-option label="老师默认课酬"
+                           value="TEACHER_DEFAULT"></el-option>
+                <el-option label="实际课程单价比例折扣"
+                           value="RATIO_DISCOUNT"></el-option>
+                <el-option label="固定课酬"
+                           value="FIXED_SALARY"></el-option>
               </el-select>
               <!--   v-show='onlineSalary!= "TEACHER_DEFAULT"' -->
-              <el-input
-                placeholder="请输入"
-                style="width:100px"
-                type="number"
-                @mousewheel.native.prevent
-                :class="onlineSalary!= 'TEACHER_DEFAULT'?'':'ishidden'"
-                v-model.trim="onlineprice"
-              ></el-input>
-              <el-checkbox
-                label="是否参加梯度"
-                style="margin-left:20px;"
-                v-model.trim="onlineClassJoinGradientRewards"
-              ></el-checkbox>
+              <el-input placeholder="请输入"
+                        style="width:100px"
+                        type="number"
+                        @mousewheel.native.prevent
+                        :class="onlineSalary!= 'TEACHER_DEFAULT'?'':'ishidden'"
+                        v-model.trim="onlineprice"></el-input>
+              <el-checkbox label="是否参加梯度"
+                           style="margin-left:20px;"
+                           v-model.trim="onlineClassJoinGradientRewards"></el-checkbox>
             </div>
             <div class="chioseWrap">
-              <el-checkbox label="线下课" v-model.trim="unonline"></el-checkbox>
-              <el-select v-model.trim="unonlineSalary" filterable clearable>
-                <el-option label="老师默认课酬" value="TEACHER_DEFAULT"></el-option>
-                <el-option label="实际课程单价比例折扣" value="RATIO_DISCOUNT"></el-option>
-                <el-option label="固定课酬" value="FIXED_SALARY"></el-option>
+              <el-checkbox label="线下课"
+                           v-model.trim="unonline"></el-checkbox>
+              <el-select v-model.trim="unonlineSalary"
+                         filterable
+                         clearable>
+                <el-option label="老师默认课酬"
+                           value="TEACHER_DEFAULT"></el-option>
+                <el-option label="实际课程单价比例折扣"
+                           value="RATIO_DISCOUNT"></el-option>
+                <el-option label="固定课酬"
+                           value="FIXED_SALARY"></el-option>
               </el-select>
-              <el-input
-                placeholder="请输入"
-                style="width:100px"
-                :class="unonlineSalary!= 'TEACHER_DEFAULT'?'':'ishidden'"
-                type="number"
-                @mousewheel.native.prevent
-                v-model.trim="unonlineprice"
-              ></el-input>
-              <el-checkbox
-                label="是否参加梯度"
-                style="margin-left:20px;"
-                v-model.trim="offlineClassJoinGradientRewards"
-              ></el-checkbox>
+              <el-input placeholder="请输入"
+                        style="width:100px"
+                        :class="unonlineSalary!= 'TEACHER_DEFAULT'?'':'ishidden'"
+                        type="number"
+                        @mousewheel.native.prevent
+                        v-model.trim="unonlineprice"></el-input>
+              <el-checkbox label="是否参加梯度"
+                           style="margin-left:20px;"
+                           v-model.trim="offlineClassJoinGradientRewards"></el-checkbox>
             </div>
             <div class="chioseWrap">
-              <el-checkbox v-model.trim="paymentReadonlyFlag" label="可自定义单价"></el-checkbox>
-              <el-checkbox v-model.trim="salaryReadonlyFlag" label="可自定义课酬"></el-checkbox>
+              <el-checkbox v-model.trim="paymentReadonlyFlag"
+                           label="可自定义单价"></el-checkbox>
+              <el-checkbox v-model.trim="salaryReadonlyFlag"
+                           label="可自定义课酬"></el-checkbox>
             </div>
           </div>
         </div>
@@ -251,56 +273,45 @@
           </div>
           <div class="right">
             <div>
-              <div
-                class="head"
-                :class="activeType=='BASE_ACTIVITY'?'active':''"
-                @click="activeType='BASE_ACTIVITY'"
-              >基础活动</div>
-              <p class="title" v-if="activeType=='BASE_ACTIVITY'">课程原价</p>
+              <div class="head"
+                   :class="activeType=='BASE_ACTIVITY'?'active':''"
+                   @click="activeType='BASE_ACTIVITY'">基础活动</div>
+              <p class="title"
+                 v-if="activeType=='BASE_ACTIVITY'">课程原价</p>
             </div>
             <div>
-              <div
-                class="head"
-                :class="activeType=='DISCOUNT'?'active':''"
-                @click="activeType='DISCOUNT'"
-              >折扣</div>
-              <el-input
-                v-if="activeType=='DISCOUNT'"
-                v-model.trim="attribute1"
-                placeholder="请输入折扣数值"
-              ></el-input>
+              <div class="head"
+                   :class="activeType=='DISCOUNT'?'active':''"
+                   @click="activeType='DISCOUNT'">折扣</div>
+              <el-input v-if="activeType=='DISCOUNT'"
+                        v-model.trim="attribute1"
+                        placeholder="请输入折扣数值"></el-input>
             </div>
             <div>
-              <div
-                class="head"
-                :class="activeType=='GIVE_CLASS'?'active':''"
-                @click="activeType='GIVE_CLASS'"
-              >赠送课时</div>
-              <el-input
-                placeholder="多少节开始赠"
-                v-if="activeType=='GIVE_CLASS'"
-                v-model.trim="attribute1"
-                style="margin-right:10px;"
-              ></el-input>
+              <div class="head"
+                   :class="activeType=='GIVE_CLASS'?'active':''"
+                   @click="activeType='GIVE_CLASS'">赠送课时</div>
+              <el-input placeholder="多少节开始赠"
+                        v-if="activeType=='GIVE_CLASS'"
+                        v-model.trim="attribute1"
+                        style="margin-right:10px;"></el-input>
               <span v-if="activeType=='GIVE_CLASS'">赠</span>
-              <el-input
-                v-if="activeType=='GIVE_CLASS'"
-                placeholder="请输入赠送课时数"
-                v-model.trim="attribute2"
-                style="margin:0 10px;"
-              ></el-input>
-              <el-checkbox
-                v-if="activeType=='GIVE_CLASS'"
-                v-model.trim="giveClassPaySalaryFlag"
-                label="赠送课时结算课酬"
-              ></el-checkbox>
+              <el-input v-if="activeType=='GIVE_CLASS'"
+                        placeholder="请输入赠送课时数"
+                        v-model.trim="attribute2"
+                        style="margin:0 10px;"></el-input>
+              <!-- <el-checkbox v-if="activeType=='GIVE_CLASS'"
+                           v-model.trim="giveClassPaySalaryFlag"
+                           label="赠送课时结算课酬"></el-checkbox> -->
             </div>
           </div>
         </div>
       </div>
-      <span slot="footer" class="dialog-footer">
+      <span slot="footer"
+            class="dialog-footer">
         <el-button @click="dialogVisible = false">取 消</el-button>
-        <el-button type="primary" @click="resetRow">确 定</el-button>
+        <el-button type="primary"
+                   @click="resetRow">确 定</el-button>
       </span>
     </el-dialog>
   </div>
@@ -318,7 +329,7 @@ import { getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   name: "vipActiveList",
   components: { pagination },
-  data() {
+  data () {
     return {
       labelPosition: "right",
       tableList: [],
@@ -329,7 +340,7 @@ export default {
         total: 0, // 总条数
         page_size: [10, 20, 40, 50] // 选择限制显示条数
       },
-      searchForm: { organId: null,enable:null },
+      searchForm: { organId: null, enable: null },
       organList: [],
       dialogVisible: false,
       resetForm: {
@@ -381,15 +392,15 @@ export default {
       activeId: ""
     };
   },
-  created() {
+  created () {
     this.init();
   },
-  activated() {
+  activated () {
     this.init();
   },
-  mounted() {},
+  mounted () { },
   filters: {
-    onlinePip(val) {
+    onlinePip (val) {
       let obj = JSON.parse(val);
       // debugger;
       if (
@@ -413,7 +424,7 @@ export default {
         }
       }
     },
-    unonlinePip(val) {
+    unonlinePip (val) {
       let obj = JSON.parse(val);
       if (
         obj &&
@@ -436,7 +447,7 @@ export default {
         }
       }
     },
-    onlineDesc(val) {
+    onlineDesc (val) {
       let obj = JSON.parse(val);
       // debugger;
       if (
@@ -469,7 +480,7 @@ export default {
         }
       }
     },
-    unonlineDesc(val) {
+    unonlineDesc (val) {
       let obj = JSON.parse(val);
       if (
         obj &&
@@ -502,7 +513,7 @@ export default {
     }
   },
   methods: {
-    init() {
+    init () {
       if (this.$route.query.searchForm) {
         this.$route.query.searchForm instanceof Object
           ? (this.searchForm = this.$route.query.searchForm)
@@ -527,18 +538,18 @@ export default {
         }
       });
     },
-    onCheckAllBranch() {
+    onCheckAllBranch () {
       // 适用所有分部
       this.resetForm.organ = [];
       this.organList.forEach(item => {
         this.resetForm.organ.push(item.id);
       });
     },
-    search() {
+    search () {
       this.rules.page = 1;
       this.getList();
     },
-    getList() {
+    getList () {
       let enable = this.searchForm.enable
       vipGroupActivity({
         organId: this.searchForm.organId,
@@ -551,13 +562,13 @@ export default {
           this.rules.total = res.data.total;
         }
       });
-      
+
     },
-    resetEnable(val){
+    resetEnable (val) {
       val = null
     },
     // 格式化活动类型
-    fommatterType(row, column) {
+    fommatterType (row, column) {
       switch (row.type) {
         case "BASE_ACTIVITY": {
           return "基础";
@@ -579,7 +590,7 @@ export default {
       }
     },
     // 格式化课时类型
-    fommatterCourseType(row) {
+    fommatterCourseType (row) {
       let date = JSON.parse(row.salarySettlementJson);
       let str = "";
       if (date && date.onlineSalarySettlement) {
@@ -591,7 +602,7 @@ export default {
       return str;
     },
     // 格式化启用状态
-    fommatterEnable(row) {
+    fommatterEnable (row) {
       switch (row.enable) {
         case 0: {
           return "关闭";
@@ -604,7 +615,7 @@ export default {
       }
     },
     // 点击列表修改同步状态
-    reset(row) {
+    reset (row) {
       this.activeId = row.id;
       this.dialogVisible = true;
       this.resetForm.name = row.name;
@@ -672,7 +683,7 @@ export default {
         row.giveClassPaySalaryFlag == 1 ? true : false;
     },
     // 点击确认按钮发送修改请求
-    resetRow() {
+    resetRow () {
       this.$refs["vipform"].validate(valid => {
         if (valid) {
           // 验证通过
@@ -720,7 +731,7 @@ export default {
           }
           let salaryReadonlyFlag = this.salaryReadonlyFlag * 1;
           let paymentReadonlyFlag = this.paymentReadonlyFlag * 1;
-          let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
+          // let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
           let vipGroupSalarySettlement = {
             onlineSalarySettlement,
             offlineSalarySettlement
@@ -740,7 +751,7 @@ export default {
             vipGroupCategoryIdList,
             vipGroupSalarySettlement,
             salaryReadonlyFlag,
-            giveClassPaySalaryFlag,
+            giveClassPaySalaryFlag: 1,
             attribute1: this.attribute1,
             attribute2: this.attribute2,
             attribute3: this.attribute3,
@@ -760,7 +771,7 @@ export default {
         }
       });
     },
-    remove(scope) {
+    remove (scope) {
       let id = scope.row.id;
       removeVipActive({ id }).then(res => {
         if (res.code == 200) {
@@ -770,7 +781,7 @@ export default {
         scope._self.$refs[scope.$index].doClose();
       });
     },
-    gotoNewActive() {
+    gotoNewActive () {
       // 带参数 searchForm: { organId: null } 搜索条件
       let rules = JSON.stringify(this.rules);
       let searchForm = JSON.stringify(this.searchForm);
@@ -779,7 +790,7 @@ export default {
         query: { rules, searchForm }
       });
     },
-    closeVipform() {
+    closeVipform () {
       console.log(111);
       this.$refs["vipform"].resetFields();
       this.dialogVisible = false;

src/views/categroyManager/vipNewActive.vue

@@ -2,67 +2,69 @@
   <div class="m-container">
     <!-- <h2><div class="squrt"></div>VIP活动方案新增 </h2> -->
     <h2>
-      <el-page-header @back="onCancel" :content="'VIP活动方案' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
+      <el-page-header @back="onCancel"
+                      :content="'VIP活动方案' + (pageType == 'create' ? '新增' : '修改')"></el-page-header>
     </h2>
     <div class="m-core">
-      <el-form
-        :label-position="labelPosition"
-        :model="vipform"
-        ref="vipform"
-        :rules="vipformRules"
-        class="vipform"
-      >
-        <el-form-item label="活动名称" prop="name">
-          <el-input style="width:400px" v-model.trim="vipform.name"></el-input>
+      <el-form :label-position="labelPosition"
+               :model="vipform"
+               ref="vipform"
+               :rules="vipformRules"
+               class="vipform">
+        <el-form-item label="活动名称"
+                      prop="name">
+          <el-input style="width:400px"
+                    v-model.trim="vipform.name"></el-input>
         </el-form-item>
-        <el-form-item label="适用分部" prop="organ">
-          <el-select v-model.trim="vipform.organ" multiple filterable clearable>
-            <el-option
-              v-for="(item,index) in organList"
-              :key="index"
-              :label="item.name"
-              :value="item.id"
-            ></el-option>
+        <el-form-item label="适用分部"
+                      prop="organ">
+          <el-select v-model.trim="vipform.organ"
+                     multiple
+                     filterable
+                     clearable>
+            <el-option v-for="(item,index) in organList"
+                       :key="index"
+                       :label="item.name"
+                       :value="item.id"></el-option>
           </el-select>
           <el-button @click="onCheckAllBranch">适用所有分部</el-button>
         </el-form-item>
-        <el-form-item label="活动描述" prop="desc">
-          <el-input
-            type="textarea"
-            v-model.trim="vipform.desc"
-            style="width:400px"
-            :rows="5"
-            placeholder="请输入活动说明"
-          ></el-input>
+        <el-form-item label="活动描述"
+                      prop="desc">
+          <el-input type="textarea"
+                    v-model.trim="vipform.desc"
+                    style="width:400px"
+                    :rows="5"
+                    placeholder="请输入活动说明"></el-input>
         </el-form-item>
-        <el-form-item label="活动时间" prop="activeTime">
-          <el-date-picker
-            v-model.trim="vipform.activeTime"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+        <el-form-item label="活动时间"
+                      prop="activeTime">
+          <el-date-picker v-model.trim="vipform.activeTime"
+                          type="datetimerange"
+                          range-separator="至"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="课程时间" prop="courseTime">
-          <el-date-picker
-            v-model.trim="vipform.courseTime"
-            type="datetimerange"
-            range-separator="至"
-            value-format="yyyy-MM-dd HH:mm:ss"
-            start-placeholder="开始日期"
-            end-placeholder="结束日期"
-          ></el-date-picker>
+        <el-form-item label="课程时间"
+                      prop="courseTime">
+          <el-date-picker v-model.trim="vipform.courseTime"
+                          type="datetimerange"
+                          range-separator="至"
+                          value-format="yyyy-MM-dd HH:mm:ss"
+                          start-placeholder="开始日期"
+                          end-placeholder="结束日期"></el-date-picker>
         </el-form-item>
-        <el-form-item label="课程形式" prop="stauts">
-          <el-select v-model.trim="vipform.stauts" filterable clearable multiple>
-            <el-option
-              v-for="(item,index) in courseStatusList"
-              :key="index"
-              :value="item.id"
-              :label="item.name"
-            ></el-option>
+        <el-form-item label="课程形式"
+                      prop="stauts">
+          <el-select v-model.trim="vipform.stauts"
+                     filterable
+                     clearable
+                     multiple>
+            <el-option v-for="(item,index) in courseStatusList"
+                       :key="index"
+                       :value="item.id"
+                       :label="item.name"></el-option>
           </el-select>
         </el-form-item>
       </el-form>
@@ -72,76 +74,80 @@
         </div>
         <div class="right">
           <div class="chioseWrap">
-            <el-checkbox label="线上课" v-model.trim="online"></el-checkbox>
-            <el-select v-model.trim="onlineSalary" clearable filterable>
-              <el-option label="老师默认课酬" value="TEACHER_DEFAULT"></el-option>
-              <el-option label="实际课程单价比例折扣" value="RATIO_DISCOUNT"></el-option>
-              <el-option label="固定课酬" value="FIXED_SALARY"></el-option>
+            <el-checkbox label="线上课"
+                         v-model.trim="online"></el-checkbox>
+            <el-select v-model.trim="onlineSalary"
+                       clearable
+                       filterable>
+              <el-option label="老师默认课酬"
+                         value="TEACHER_DEFAULT"></el-option>
+              <el-option label="实际课程单价比例折扣"
+                         value="RATIO_DISCOUNT"></el-option>
+              <el-option label="固定课酬"
+                         value="FIXED_SALARY"></el-option>
             </el-select>
-            <el-input
-              placeholder="请输入"
-              v-if="onlineSalary== 'RATIO_DISCOUNT'"
-              style="width:200px;"
-              type="number"
-              @mousewheel.native.prevent
-              v-model.trim="onlineprice"
-            >
+            <el-input placeholder="请输入"
+                      v-if="onlineSalary== 'RATIO_DISCOUNT'"
+                      style="width:200px;"
+                      type="number"
+                      @mousewheel.native.prevent
+                      v-model.trim="onlineprice">
               <template slot="append">%</template>
             </el-input>
-            <el-input
-              placeholder="请输入"
-              v-if="onlineSalary == 'FIXED_SALARY'"
-              style="width:200px;"
-              type="number"
-              @mousewheel.native.prevent
-              v-model.trim="onlineprice"
-            >
+            <el-input placeholder="请输入"
+                      v-if="onlineSalary == 'FIXED_SALARY'"
+                      style="width:200px;"
+                      type="number"
+                      @mousewheel.native.prevent
+                      v-model.trim="onlineprice">
               <template slot="append">元</template>
             </el-input>
-            <div style="width:200px;" v-if="onlineSalary== 'TEACHER_DEFAULT'"></div>
-            <el-checkbox
-              label="是否参加梯度"
-              style="margin-left:20px;"
-              v-model.trim="onlineClassJoinGradientRewards"
-            ></el-checkbox>
+            <div style="width:200px;"
+                 v-if="onlineSalary== 'TEACHER_DEFAULT'"></div>
+            <el-checkbox label="是否参加梯度"
+                         style="margin-left:20px;"
+                         v-model.trim="onlineClassJoinGradientRewards"></el-checkbox>
           </div>
           <div class="chioseWrap">
-            <el-checkbox label="线下课" v-model.trim="unonline"></el-checkbox>
-            <el-select v-model.trim="unonlineSalary" clearable filterable>
-              <el-option label="老师默认课酬" value="TEACHER_DEFAULT"></el-option>
-              <el-option label="实际课程单价比例折扣" value="RATIO_DISCOUNT"></el-option>
-              <el-option label="固定课酬" value="FIXED_SALARY"></el-option>
+            <el-checkbox label="线下课"
+                         v-model.trim="unonline"></el-checkbox>
+            <el-select v-model.trim="unonlineSalary"
+                       clearable
+                       filterable>
+              <el-option label="老师默认课酬"
+                         value="TEACHER_DEFAULT"></el-option>
+              <el-option label="实际课程单价比例折扣"
+                         value="RATIO_DISCOUNT"></el-option>
+              <el-option label="固定课酬"
+                         value="FIXED_SALARY"></el-option>
             </el-select>
-            <el-input
-              placeholder="请输入"
-              v-if="unonlineSalary== 'RATIO_DISCOUNT'"
-              style="width:200px;"
-              type="number"
-              @mousewheel.native.prevent
-              v-model.trim="unonlineprice"
-            >
+            <el-input placeholder="请输入"
+                      v-if="unonlineSalary== 'RATIO_DISCOUNT'"
+                      style="width:200px;"
+                      type="number"
+                      @mousewheel.native.prevent
+                      v-model.trim="unonlineprice">
               <template slot="append">%</template>
             </el-input>
-            <el-input
-              placeholder="请输入"
-              style="width:200px;"
-              v-if="unonlineSalary== 'FIXED_SALARY'"
-              type="number"
-              @mousewheel.native.prevent
-              v-model.trim="unonlineprice"
-            >
+            <el-input placeholder="请输入"
+                      style="width:200px;"
+                      v-if="unonlineSalary== 'FIXED_SALARY'"
+                      type="number"
+                      @mousewheel.native.prevent
+                      v-model.trim="unonlineprice">
               <template slot="append">元</template>
             </el-input>
-            <div style="width:200px;" v-if="unonlineSalary== 'TEACHER_DEFAULT'"></div>
-            <el-checkbox
-              label="是否参加梯度"
-              style="margin-left:20px;"
-              v-model.trim="offlineClassJoinGradientRewards"
-            ></el-checkbox>
+            <div style="width:200px;"
+                 v-if="unonlineSalary== 'TEACHER_DEFAULT'"></div>
+            <el-checkbox label="是否参加梯度"
+                         style="margin-left:20px;"
+                         v-model.trim="offlineClassJoinGradientRewards"></el-checkbox>
           </div>
           <div class="chioseWrap">
-            <el-checkbox v-model.trim="paymentReadonlyFlag" label="可自定义单价"></el-checkbox>
-            <el-checkbox v-model.trim="salaryReadonlyFlag" label="可自定义课酬"></el-checkbox>
+            <el-checkbox v-model.trim="paymentReadonlyFlag"
+                         label="可自定义单价"></el-checkbox>
+            <el-checkbox v-model.trim="salaryReadonlyFlag"
+                         label="可自定义课酬"></el-checkbox>
           </div>
         </div>
       </div>
@@ -151,67 +157,59 @@
         </div>
         <div class="right">
           <div>
-            <div
-              class="head"
-              :class="activeType=='BASE_ACTIVITY'?'active':''"
-              @click="activeType='BASE_ACTIVITY'"
-            >基础活动</div>
-            <p class="title" v-if="activeType=='BASE_ACTIVITY'">课程原价</p>
+            <div class="head"
+                 :class="activeType=='BASE_ACTIVITY'?'active':''"
+                 @click="activeType='BASE_ACTIVITY'">基础活动</div>
+            <p class="title"
+               v-if="activeType=='BASE_ACTIVITY'">课程原价</p>
           </div>
           <div>
-            <div
-              class="head"
-              :class="activeType=='DISCOUNT'?'active':''"
-              @click="activeType='DISCOUNT'"
-            >折扣</div>
-            <el-input
-              v-if="activeType=='DISCOUNT'"
-              v-model.trim="attribute1"
-              style="width:200px!important"
-              placeholder="请输入折扣数值"
-            >
+            <div class="head"
+                 :class="activeType=='DISCOUNT'?'active':''"
+                 @click="activeType='DISCOUNT'">折扣</div>
+            <el-input v-if="activeType=='DISCOUNT'"
+                      v-model.trim="attribute1"
+                      style="width:200px!important"
+                      placeholder="请输入折扣数值">
               <template slot="append">%</template>
             </el-input>
           </div>
           <div>
-            <div
-              class="head"
-              :class="activeType=='GIVE_CLASS'?'active':''"
-              @click="activeType='GIVE_CLASS'"
-            >赠送课时</div>
-            <el-input
-              placeholder="多少节开始赠"
-              v-if="activeType=='GIVE_CLASS'"
-              v-model.trim="attribute1"
-              type="number"
-              @mousewheel.native.prevent
-              style="margin-right:10px;width:200px!important"
-            >
+            <div class="head"
+                 :class="activeType=='GIVE_CLASS'?'active':''"
+                 @click="activeType='GIVE_CLASS'">赠送课时</div>
+            <el-input placeholder="多少节开始赠"
+                      v-if="activeType=='GIVE_CLASS'"
+                      v-model.trim="attribute1"
+                      type="number"
+                      @mousewheel.native.prevent
+                      style="margin-right:10px;width:200px!important">
               <template slot="append">节</template>
             </el-input>
             <span v-if="activeType=='GIVE_CLASS'">赠</span>
-            <el-input
-              v-if="activeType=='GIVE_CLASS'"
-              placeholder="请输入赠送课时数"
-              type="number"
-              @mousewheel.native.prevent
-              v-model.trim="attribute2"
-              style="margin:0 10px;width:200px!important"
-            >
+            <el-input v-if="activeType=='GIVE_CLASS'"
+                      placeholder="请输入赠送课时数"
+                      type="number"
+                      @mousewheel.native.prevent
+                      v-model.trim="attribute2"
+                      style="margin:0 10px;width:200px!important">
               <template slot="append">节</template>
             </el-input>
-            <el-checkbox
+            <!-- <el-checkbox
               v-if="activeType=='GIVE_CLASS'"
               v-model.trim="giveClassPaySalaryFlag"
               label="赠送课时结算课酬"
-            ></el-checkbox>
+            ></el-checkbox> -->
           </div>
         </div>
       </div>
     </div>
-    <div class="btnWrap" style="justify-content:flex-start">
-      <div class="closeBtn" @click="onReSet">重置</div>
-      <div class="okBtn" @click="submitFrom">确定</div>
+    <div class="btnWrap"
+         style="justify-content:flex-start">
+      <div class="closeBtn"
+           @click="onReSet">重置</div>
+      <div class="okBtn"
+           @click="submitFrom">确定</div>
     </div>
   </div>
 </template>
@@ -220,7 +218,7 @@ import { vipGroupCategory, addVipActive } from "@/api/vipSeting";
 import { getEmployeeOrgan } from "@/api/buildTeam";
 export default {
   name: "vipNewActive",
-  data() {
+  data () {
     return {
       pageType: this.$route.query.type,
       labelPosition: "left",
@@ -272,7 +270,7 @@ export default {
       offlineClassJoinGradientRewards: false
     };
   },
-  mounted() {
+  mounted () {
     if (this.$route.query.rules) {
       this.rules = this.$route.query.rules;
     }
@@ -293,7 +291,7 @@ export default {
     });
   },
   methods: {
-    submitFrom() {
+    submitFrom () {
       this.$refs["vipform"].validate(valid => {
         if (valid) {
           // 验证通过
@@ -326,7 +324,7 @@ export default {
           }
           let salaryReadonlyFlag = this.salaryReadonlyFlag * 1;
           let paymentReadonlyFlag = this.paymentReadonlyFlag * 1;
-          let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
+          // let giveClassPaySalaryFlag = this.giveClassPaySalaryFlag * 1;
           let vipGroupSalarySettlement = {
             onlineSalarySettlement,
             offlineSalarySettlement
@@ -345,12 +343,12 @@ export default {
             vipGroupSalarySettlement,
             salaryReadonlyFlag,
             paymentReadonlyFlag,
-            giveClassPaySalaryFlag,
+            giveClassPaySalaryFlag: 1,
             attribute1: this.attribute1,
             attribute2: this.attribute2,
             attribute3: this.attribute3,
-            offlineClassJoinGradientRewards:this.offlineClassJoinGradientRewards*1,
-            onlineClassJoinGradientRewards:this.onlineClassJoinGradientRewards*1
+            offlineClassJoinGradientRewards: this.offlineClassJoinGradientRewards * 1,
+            onlineClassJoinGradientRewards: this.onlineClassJoinGradientRewards * 1
           }).then(res => {
             if (res.code == 200) {
               this.$message.success("恭喜你,活动创建成功");
@@ -369,20 +367,20 @@ export default {
       // 线上线下课 勾选就传不勾选就不传
       // addVipActive().then(res => { })
     },
-    onCheckAllBranch() {
+    onCheckAllBranch () {
       // 选择所有分部
       this.vipform.organ = [];
       this.organList.forEach(item => {
         this.vipform.organ.push(item.id);
       });
     },
-    onCancel() {
+    onCancel () {
       this.$router.push({
         path: "/vipClassSet/vipActiveList",
         query: { rules: this.rules, searchForm: this.searchForm }
       });
     },
-    onReSet() {
+    onReSet () {
       this.vipform = {
         name: "",
         desc: "",
@@ -398,7 +396,7 @@ export default {
       this.onlineprice = "";
       this.unonlineprice = "";
       this.onlineClassJoinGradientRewards = false;
-       this.offlineClassJoinGradientRewards = false;
+      this.offlineClassJoinGradientRewards = false;
       this.$refs.vipform.resetFields();
     }
   }

src/views/teacherManager/teacherOperation/components/salarySet.vue

@@ -3,148 +3,134 @@
     <!-- <h4>单次课次参考时长：30min</h4> -->
     <div class="tableList">
       <div class="left">
-        <el-table :data="teamTable" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data="teamTable"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column label="乐团课课酬课时结算">
             <template slot-scope="scope">{{ scope.row.courseScheduleType | coursesType }}</template>
           </el-table-column>
           <el-table-column label="默认课酬-主教">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.mainTeacher30MinSalary"
-                placeholder="请输入课酬"
-              >
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template
-                  slot="append"
-                  v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
-                >元/40分钟</template>
-                <template slot="append" v-else>元/30分钟</template>
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.mainTeacher30MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="默认课酬-助教">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.assistantTeacher30MinSalary"
-                placeholder="请输入课酬"
-              >
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template
-                  slot="append"
-                  v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
-                >元/40分钟</template>
-                <template slot="append" v-else>元/30分钟</template>
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.assistantTeacher30MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/30分钟</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-主教">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
-                v-model.trim="scope.row.mainTeacher90MinSalary"
-                placeholder="请输入课酬"
-              >
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template
-                  slot="append"
-                  v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
-                >元/40分钟</template>
-                <template slot="append" v-else>元/90分钟</template>
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
+                        v-model.trim="scope.row.mainTeacher90MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/90分钟</template>
                 <!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="3.0课酬-助教">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
-                v-model.trim="scope.row.assistantTeacher90MinSalary"
-                placeholder="请输入课酬"
-              >
-                <template slot="append" v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
-                <template
-                  slot="append"
-                  v-else-if="scope.row.courseScheduleType == 'CLASSROOM'"
-                >元/40分钟</template>
-                <template slot="append" v-else>元/90分钟</template>
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        :disabled="scope.row.courseScheduleType == 'CLASSROOM'"
+                        v-model.trim="scope.row.assistantTeacher90MinSalary"
+                        placeholder="请输入课酬">
+                <template slot="append"
+                          v-if="scope.row.courseScheduleType == 'HIGH'">元/45分钟</template>
+                <template slot="append"
+                          v-else-if="scope.row.courseScheduleType == 'CLASSROOM'">元/40分钟</template>
+                <template slot="append"
+                          v-else>元/90分钟</template>
                 <!-- <template slot="append">元/{{ (scope.row.courseScheduleType == 'HIGH' || scope.row.courseScheduleType == 'CLASSROOM') ? 45 : 90 }}分钟</template> -->
               </el-input>
             </template>
           </el-table-column>
         </el-table>
 
-        <el-table :data="teamSmallTable" style=" margin-top: 15px;" :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+        <el-table :data="teamSmallTable"
+                  style=" margin-top: 15px;"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column label="">
             <template slot-scope="scope">{{ scope.row.courseScheduleType | coursesType }}</template>
           </el-table-column>
           <el-table-column label="1V1">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                :disabled="scope.row.courseScheduleType == 'HIGH_ONLINE'"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.v1"
-                placeholder="请输入课酬"
-              >
+              <el-input type="number"
+                        :disabled="scope.row.courseScheduleType == 'HIGH_ONLINE'"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.v1"
+                        placeholder="请输入课酬">
                 <template slot="append">元/节</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="1V3">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.v3"
-                placeholder="请输入课酬"
-              >
+              <el-input type="number"
+                        :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.v3"
+                        placeholder="请输入课酬">
                 <template slot="append">元/节</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="1V4">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.v4"
-                placeholder="请输入课酬"
-              >
+              <el-input type="number"
+                        :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.v4"
+                        placeholder="请输入课酬">
                 <template slot="append">元/节</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="1V5">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.v5"
-                placeholder="请输入课酬"
-              >
+              <el-input type="number"
+                        :disabled="scope.row.courseScheduleType == 'MUSIC_NETWORK'"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.v5"
+                        placeholder="请输入课酬">
                 <template slot="append">元/节</template>
               </el-input>
             </template>
           </el-table-column>
         </el-table>
 
-
-        <el-table
-          :data="vipTable"
-          style="width: 70%; margin-top: 15px;"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column label="VIP课课酬参考值" prop="vipGroupCategoryName"></el-table-column>
+        <el-table :data="vipTable"
+                  style="width: 70%; margin-top: 15px;"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
+          <el-table-column label="VIP课课酬参考值"
+                           prop="vipGroupCategoryName"></el-table-column>
           <!-- <el-table-column label="线上课">
             <template slot-scope="scope">
               <el-input
@@ -157,32 +143,26 @@
               </el-input>
             </template>
           </el-table-column> -->
-          <el-table-column label="线下课">
+          <el-table-column label="">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.offlineClassesSalary"
-                placeholder="请输入内容"
-              >
+              <el-input type="number"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.offlineClassesSalary"
+                        placeholder="请输入内容">
                 <template slot="append">元/45分钟</template>
               </el-input>
             </template>
           </el-table-column>
         </el-table>
-        <el-table
-          :data="accompanyTable"
-          style="width: 35%; margin-top: 15px;"
-          :header-cell-style="{background:'#EDEEF0',color:'#444'}"
-        >
+        <el-table :data="accompanyTable"
+                  style="width: 35%; margin-top: 15px;"
+                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
           <el-table-column label="网管课">
             <template slot-scope="scope">
-              <el-input
-                type="number"
-                style="width:195px"
-                @mousewheel.native.prevent
-                v-model.trim="scope.row.mainTeacherSalary"
-              >
+              <el-input type="number"
+                        style="width:195px"
+                        @mousewheel.native.prevent
+                        v-model.trim="scope.row.mainTeacherSalary">
                 <template slot="append">元/{{scope.row.minutes}}分钟</template>
               </el-input>
             </template>
@@ -191,22 +171,19 @@
 
         <el-form style="margin-top: 20px;">
           <el-form-item label="生效日期">
-            <el-date-picker
-              v-model.trim="startDate"
-              type="date"
-              value-format="yyyy-MM-dd"
-              placeholder="选择日期"
-            ></el-date-picker>
+            <el-date-picker v-model.trim="startDate"
+                            type="date"
+                            value-format="yyyy-MM-dd"
+                            placeholder="选择日期"></el-date-picker>
             <div style="display: inline; color: red; padding-left: 10px;">说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；</div>
           </el-form-item>
-          
+
         </el-form>
 
-        <div
-          style="padding-top: 10px;"
-          v-permission="pageType == 'create' ? {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherAdd/batchUpset'} : {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherUpdate/batchUpset'}"
-        >
-          <el-button @click="onSave()" type="primary">保存</el-button>
+        <div style="padding-top: 10px;"
+             v-permission="pageType == 'create' ? {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherAdd/batchUpset'} : {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherUpdate/batchUpset'}">
+          <el-button @click="onSave()"
+                     type="primary">保存</el-button>
         </div>
       </div>
     </div>
@@ -233,7 +210,7 @@ let checkTime =
 export default {
   props: ["teacherId"],
   name: "salarySet",
-  data() {
+  data () {
     return {
       pageType: this.$route.query.type, // 页面类型
       // teacherId: this.teacherId ? this.teacherId : this.$route.query.teacherId,
@@ -340,16 +317,16 @@ export default {
       ]
     };
   },
-  created() {},
-  mounted() {
+  created () { },
+  mounted () {
     this.__init();
   },
-  activated() {
+  activated () {
     this.pageType = this.$route.query.type;
     this.__init();
   },
   methods: {
-    __init() {
+    __init () {
       if (this.$route.query.search) {
         this.Fsearch = this.$route.query.search;
       }
@@ -404,7 +381,7 @@ export default {
         }
       );
     },
-    vipListCompare(vipData, rows) {
+    vipListCompare (vipData, rows) {
       // vip 做对比
       if (!rows) {
         // 判断是否有数据
@@ -438,7 +415,7 @@ export default {
       this.vipTable = result;
     },
 
-    teacherSalaryMoney(rows) {
+    teacherSalaryMoney (rows) {
       // 判断是否有数据
       if (!rows || rows.length <= 0) return;
       let teamTable = this.teamTable;
@@ -475,7 +452,7 @@ export default {
         rows.forEach(c => {
           if (item.courseScheduleType == c.courseScheduleType) {
             item.checked = true;
-            let tempJson = c.salaryRuleJson ? JSON.parse(c.salaryRuleJson) : {3:0,4:0,5:0}
+            let tempJson = c.salaryRuleJson ? JSON.parse(c.salaryRuleJson) : { 3: 0, 4: 0, 5: 0 }
             // console.log(tempJson)
             smallResult.push({
               mainTeacher30MinSalary: c.mainTeacher30MinSalary,
@@ -505,7 +482,7 @@ export default {
       }
       this.teamSmallTable = smallResult;
     },
-    onSave() {
+    onSave () {
       this.$confirm("您确定更改老师课酬", "提示", {
         confirmButtonText: "确定",
         cancelButtonText: "取消",
@@ -528,14 +505,14 @@ export default {
           });
           let temps = []
           this.teamSmallTable.forEach(item => {
-            if(item.v1 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
+            if (item.v1 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
               this.$message.error("输入课酬不能为负数");
               checkStatus = false;
               return;
             }
             temps.push({
               courseScheduleType: item.courseScheduleType,
-              salaryRuleJson: JSON.stringify({1: Number(item.v1), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
+              salaryRuleJson: JSON.stringify({ 1: Number(item.v1), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
               assistantTeacher30MinSalary: 0,
               assistantTeacher90MinSalary: 0,
               mainTeacher30MinSalary: 0,
@@ -567,7 +544,7 @@ export default {
             this.$message.error("请填写生效日期");
             return;
           }
-          if(!checkStatus){
+          if (!checkStatus) {
             return
           }
 
@@ -603,7 +580,7 @@ export default {
             }
           });
         })
-        .catch(() => {});
+        .catch(() => { });
     }
   }
 };

src/views/teamDetail/components/courseList.vue

@@ -96,6 +96,9 @@
         <el-table-column type="selection"
                          width="55"
                          :selectable="checkSelectable"></el-table-column>
+        <el-table-column align='center'
+                         prop="courseScheduleId"
+                         label="课程编号"></el-table-column>
         <el-table-column align="center"
                          width="180px"
                          label="时间">
@@ -104,10 +107,8 @@
         <el-table-column align="center"
                          prop="classGroupName"
                          label="班级名称"></el-table-column>
-        <!-- <el-table-column align='center'
-                         prop="mixClassGroupName"
-                         label="合奏班">
-        </el-table-column>-->
+
+        </el-table-column>
         <el-table-column align="center"
                          prop="courseScheduleType"
                          label="课程类型">
@@ -864,7 +865,7 @@ export default {
     }
   }
   .searchForm {
-    margin: 0 30px;
+    // margin: 0 30px;
   }
 }
 .btnWraps {

src/views/vipClass/vipList.vue

@@ -124,8 +124,7 @@
                            label="课程单价">
             <template slot-scope="scope">
               <div>
-                <p>线上:{{scope.row.onlineClassesUnitPrice}}</p>
-                <p>线下:{{scope.row.offlineClassesUnitPrice}}</p>
+                <p>{{scope.row.courseUnitPrice.toFixed(2)+'元'}}</p>
               </div>
             </template>
           </el-table-column>