优化

1

src/constant/guide.js

@@ -14,7 +14,7 @@ export const guideList = {
   teamPayType: {
     name: '乐团类型',
     desc: '乐团类型用于区分乐团运营模式，不同类型的乐团可设置不同的课程定价',
-    path: '/baseRulesClassSetting?tabrouter=6',
+    path: '/baseRulesClassSetting?tabrouter=3',
     permission: '/globalConfig/chargesList'
   },
   cooperationOrgan: {

src/constant/index.js

@@ -221,7 +221,9 @@ if (tenantId == 1) {
     SNAP: "临时班",
   }
 }
-export {musicClassType}
+export {
+  musicClassType
+}
 
 export const inspectionItem = {
   INSPECT: '下校巡查',
@@ -399,6 +401,7 @@ export const chargingStatus = {
 }
 
 export const coupontypeDetail = {
+  FULLCOUPON: '全类券',
   OTHER: '其他',
   MUSICAL: '乐器',
   ACCESSORIES: '辅件',
@@ -408,7 +411,7 @@ export const coupontypeDetail = {
   SINGLE: '声部课',
   MIX: '合奏课',
   VIP: 'VIP',
-  FULLCOUPON: '全类券',
+
   MEMBER: '团练宝'
 }
 

src/store/modules/selects.js

@@ -1,9 +1,23 @@
 /* eslint-disable no-empty */
 // import { branchQueryPage } from '@/api/specialSetting'
-import { getSubject, getTeacher,findEducationUsers,getEmployeeOrgan, getOrganRole } from '@/api/buildTeam'
-import { getSchool,queryEmployByOrganId } from '@/api/systemManage'
-import { vipGroupCategory } from "@/api/vipSeting"
-import { findTechnician } from '@/api/repairManager'
+import {
+  getSubject,
+  getTeacher,
+  findEducationUsers,
+  getEmployeeOrgan,
+  getOrganRole
+} from '@/api/buildTeam'
+import {
+  getSchool,
+  queryEmployByOrganId
+} from '@/api/systemManage'
+import {
+  vipGroupCategory,
+  getOnlineMun
+} from "@/api/vipSeting"
+import {
+  findTechnician
+} from '@/api/repairManager'
 
 const loadings = {}
 
@@ -25,9 +39,9 @@ export default {
     teachers: [],
     schools: [],
     vipGroupCategory: [],
-    educations:[],
+    educations: [],
     technician: [],
-    employs:[],
+    employs: [],
     roles: []
   },
   mutations: {
@@ -38,13 +52,13 @@ export default {
       state.subjects = subjects
     },
     commit_teachers: (state, teachers) => {
-      state.teachers = teachers.map(teacher=>{
+      state.teachers = teachers.map(teacher => {
         return {
           ...teacher,
-          id:teacher.id,
-          userId:teacher.id,
-          userName:teacher.realName,
-          realName:teacher.realName
+          id: teacher.id,
+          userId: teacher.id,
+          userName: teacher.realName,
+          realName: teacher.realName
         }
       })
     },
@@ -54,7 +68,7 @@ export default {
     commit_vip_group_category: (state, vipGroupCategory) => {
       state.vipGroupCategory = vipGroupCategory
     },
-    commit_educations: (state, educations)=>{
+    commit_educations: (state, educations) => {
       state.educations = educations
     },
     commit_technician: (state, technician) => {
@@ -63,81 +77,119 @@ export default {
     commit_roles: (state, roles) => {
       state.roles = roles
     },
-    commit_employs:(state,employs)=>{
-      state.employs = employs.map(emloys=>{
+    commit_employs: (state, employs) => {
+      state.employs = employs.map(emloys => {
         return {
           ...emloys,
-          id:emloys.id,
-          userId:emloys.id,
-          userName:emloys.realName,
-          realName:emloys.realName
+          id: emloys.id,
+          userId: emloys.id,
+          userName: emloys.realName,
+          realName: emloys.realName
         }
       })
     }
   },
   actions: {
-    async setBranchs ({ commit, state }, force) {
+    async setBranchs({
+      commit,
+      state
+    }, force) {
       if ((!state.branchs.length || force === true) && !loadings.commit_branchs) {
         loadings.commit_branchs = getEmployeeOrgan()
         try {
           const res = await loadings.commit_branchs
           commit('commit_branchs', res.data)
-        } catch (error) { }
+        } catch (error) {}
         loadings.commit_branchs = false
       }
     },
-    async setSubjects ({ commit, state }, force) {
+    async setSubjects({
+      commit,
+      state
+    }, force) {
       if ((!state.subjects.length || force === true) && !loadings.commit_subjects) {
-        loadings.commit_subjects = getSubject({rows: 9999, tenantId: '1'})
+        loadings.commit_subjects = getSubject({
+          rows: 9999,
+          tenantId: '1'
+        })
         try {
           const res = await loadings.commit_subjects
           commit('commit_subjects', res.data)
-        } catch (error) { }
+        } catch (error) {}
         loadings.commit_subjects = false
       }
     },
-    async setTeachers ({ commit, state }, force) {
+    async setTeachers({
+      commit,
+      state
+    }, force) {
       if ((!state.teachers.length || force === true) && !loadings.commit_teachers) {
         loadings.commit_teachers = getTeacher()
         try {
           const res = await loadings.commit_teachers
           commit('commit_teachers', res.data)
-        } catch (error) { }
+        } catch (error) {}
         loadings.commit_teachers = false
       }
     },
-    async setSchools ({ commit, state }, force) {
+    async setSchools({
+      commit,
+      state
+    }, force) {
       if ((!state.schools.length || force === true) && !loadings.commit_schools) {
         loadings.commit_schools = getSchool()
         try {
           const res = await loadings.commit_schools
           commit('commit_schools', res.data)
-        } catch (error) { }
+        } catch (error) {}
         loadings.commit_schools = false
       }
       return loadings.commit_schools
     },
-    async setVipGroupCategory ({ commit, state }, force) {
+    async setVipGroupCategory({
+      commit,
+      state
+    }, force) {
+
       if ((!state.vipGroupCategory.length || force === true) && !loadings.commit_vip_group_category) {
+
         loadings.commit_vip_group_category = vipGroupCategory()
         try {
           const res = await loadings.commit_vip_group_category
-          commit('commit_vip_group_category', res.data)
-        } catch (error) { }
+
+          const res1 = await getOnlineMun();
+
+          let tempObj = JSON.parse(res1.data.config);
+          let studentRuleNum = tempObj.cloud_room_rule.cloud_room_up_limit - 1;
+          let arr = []
+          res.data.map(item=>{
+            if(item.studentNum <= studentRuleNum) {
+              arr.push(item)
+            }
+          });
+
+          commit('commit_vip_group_category', arr)
+        } catch (error) {console.log(error)}
         loadings.commit_vip_group_category = false
       }
     },
-    async setEducations({commit,state},force){
+    async setEducations({
+      commit,
+      state
+    }, force) {
       if ((!state.educations.length || force === true) && !loadings.commit_educations) {
         loadings.commit_educations = findEducationUsers()
         try {
           const res = await loadings.commit_educations
           commit('commit_educations', res.data)
-        } catch (error) { }
+        } catch (error) {}
         loadings.commit_educations = false
       }
     },
-    async setOrganRole({commit,state},force) {
+    async setOrganRole({
+      commit,
+      state
+    }, force) {
       if ((!state.educations.length || force === true) && !loadings.commit_roles) {
         loadings.commit_roles = getOrganRole()
         try {
@@ -145,10 +197,10 @@ export default {
           const tempArr = []
           const tempData = res.data
           // 初始化数据
-          for(let i in tempData) {
+          for (let i in tempData) {
             tempArr[i] = []
-            if(tempData[i]) {
-              for(let t in tempData[i]) {
+            if (tempData[i]) {
+              for (let t in tempData[i]) {
                 tempArr[i].push({
                   value: tempData[i][t].userId,
                   label: tempData[i][t].realName,
@@ -159,12 +211,15 @@ export default {
           }
           console.log(tempArr, 'tempArr')
           commit('commit_roles', tempArr)
-        } catch (error) { }
+        } catch (error) {}
         loadings.commit_roles = false
       }
       getOrganRole
     },
-    async setTechnician({commit,state},force){
+    async setTechnician({
+      commit,
+      state
+    }, force) {
       if ((!state.technician.length || force === true) && !loadings.commit_technician) {
         loadings.commit_technician = findTechnician()
         try {
@@ -175,9 +230,14 @@ export default {
       }
 
     },
-    async setEmploys({commit,state},force){
+    async setEmploys({
+      commit,
+      state
+    }, force) {
       if ((!state.employs.length || force === true) && !loadings.commit_employs) {
-        loadings.commit_employs = queryEmployByOrganId({rows:99999})
+        loadings.commit_employs = queryEmployByOrganId({
+          rows: 99999
+        })
         try {
           const res = await loadings.commit_employs
           commit('commit_employs', res.data.rows)

src/views/categroyManager/productSystem/memberFeeSet.vue

@@ -88,10 +88,10 @@
                   | hasMoneyFormat
               }}
             </p>
-            <p>
+            <!-- <p>
               零售:
               {{ scope.row.memberFeeSetting.currentMonthFee | hasMoneyFormat }}
-            </p>
+            </p> -->
             <p>
               原价:
               {{ scope.row.memberFeeSetting.originalMonthFee | hasMoneyFormat }}
@@ -109,12 +109,12 @@
                   | hasMoneyFormat
               }}
             </p>
-            <p>
+            <!-- <p>
               零售:
               {{
                 scope.row.memberFeeSetting.currentQuarterlyFee | hasMoneyFormat
               }}
-            </p>
+            </p> -->
             <p>
               原价:
               {{
@@ -137,12 +137,12 @@
                   | hasMoneyFormat
               }}
             </p>
-            <p>
+            <!-- <p>
               零售:
               {{
                 scope.row.memberFeeSetting.currentHalfYearFee | hasMoneyFormat
               }}
-            </p>
+            </p> -->
             <p>
               原价:
               {{
@@ -161,10 +161,10 @@
                 scope.row.memberFeeSetting.groupPurchaseYearFee | hasMoneyFormat
               }}
             </p>
-            <p>
+            <!-- <p>
               零售:
               {{ scope.row.memberFeeSetting.currentYearFee | hasMoneyFormat }}
-            </p>
+            </p> -->
             <p>
               原价:
               {{ scope.row.memberFeeSetting.originalYearFee | hasMoneyFormat }}
@@ -217,7 +217,7 @@
       v-if="branchStatus"
       default-expand-all
       @close="onFormClose('ruleForm')"
-      width="1065px"
+      width="730px"
     >
       <el-form :model="form" :inline="true" ref="ruleForm">
         <el-form-item
@@ -230,7 +230,7 @@
             :disabled="addDisabled"
             class="multiple"
             filterable
-            style="width: 890px !important"
+            style="width: 545px !important"
             v-model.trim="form.organId"
             clearable
             placeholder="请选择分部"
@@ -253,7 +253,7 @@
             :disabled="addDisabled"
             class="multiple"
             filterable
-            style="width: 890px !important"
+            style="width: 545px !important"
             v-model.trim="form.memberRankSettingId"
             clearable
             placeholder="请选择会员"
@@ -355,7 +355,7 @@
             <template slot="append">元/月</template>
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           prop="currentMonthFee"
           label="月收费零售价"
           :rules="[
@@ -375,7 +375,7 @@
           >
             <template slot="append">元/月</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           prop="originalMonthFee"
           label="月收费原价"
@@ -418,7 +418,7 @@
             <template slot="append">元/季度</template>
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           prop="currentQuarterlyFee"
           label="季度收费零售价"
           :rules="[
@@ -438,7 +438,7 @@
           >
             <template slot="append">元/季度</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           prop="originalQuarterlyFee"
           label="季度收费原价"
@@ -482,7 +482,7 @@
             <template slot="append">元/半年</template>
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           prop="currentHalfYearFee"
           label="半年收费零售价"
           :rules="[
@@ -502,7 +502,7 @@
           >
             <template slot="append">元/半年</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           prop="originalHalfYearFee"
           label="半年收费原价"
@@ -545,7 +545,7 @@
             <template slot="append">元/年</template>
           </el-input>
         </el-form-item>
-        <el-form-item
+        <!-- <el-form-item
           prop="currentYearFee"
           label="年收费零售价"
           :rules="[
@@ -565,7 +565,7 @@
           >
             <template slot="append">元/年</template>
           </el-input>
-        </el-form-item>
+        </el-form-item> -->
         <el-form-item
           prop="originalYearFee"
           label="年收费原价"

src/views/categroyManager/vipChargeSeting.vue

@@ -4,56 +4,69 @@
       <div class="squrt"></div>课程收费设置
     </h2> -->
     <div>
-      <save-form :inline="true"
-               ref="searchForm"
-               class="searchForm"
-               @submit="search"
-               :model.sync="searchForm">
-        <el-form-item prop='organId'>
-          <el-select class='multiple'
-                     style="width:180px!important"
-                     v-model.trim="searchForm.organId"
-                     filterable
-                     placeholder="请选择分部">
-            <el-option v-for="(item,index) in selects.branchs"
-                       :key="index"
-                       :label="item.name"
-                       :value="item.id"></el-option>
+      <save-form
+        :inline="true"
+        ref="searchForm"
+        class="searchForm"
+        @submit="search"
+        :model.sync="searchForm"
+      >
+        <el-form-item prop="organId">
+          <el-select
+            class="multiple"
+            style="width: 180px !important"
+            v-model.trim="searchForm.organId"
+            filterable
+            placeholder="请选择分部"
+          >
+            <el-option
+              v-for="(item, index) in selects.branchs"
+              :key="index"
+              :label="item.name"
+              :value="item.id"
+            ></el-option>
           </el-select>
         </el-form-item>
         <el-form-item>
-          <el-button native-type="submit"
-                     type="primary">搜索</el-button>
+          <el-button native-type="submit" type="primary">搜索</el-button>
         </el-form-item>
       </save-form>
       <div class="tableWrap">
-        <el-table :data="dataList"
-                  style="width:100% !important;"
-                  :header-cell-style="{background:'#EDEEF0',color:'#444'}">
-          <el-table-column prop="name"
-                           label="课程形式">
-          </el-table-column>
-          <el-table-column prop="onlineClassesUnitPrice"
-                           label="线上课单价">
+        <el-table
+          :data="dataList"
+          style="width: 100% !important"
+          :header-cell-style="{ background: '#EDEEF0', color: '#444' }"
+        >
+          <el-table-column prop="name" label="课程形式"> </el-table-column>
+          <el-table-column prop="onlineClassesUnitPrice" label="线上课单价">
             <template slot-scope="scope">
               <div>
-                <el-input v-model.trim="scope.row.onlineClassesUnitPrice"></el-input>
+                <el-input
+                  v-model.trim="scope.row.onlineClassesUnitPrice"
+                ></el-input>
               </div>
             </template>
           </el-table-column>
-          <el-table-column prop="offlineClassesUnitPrice"
-                           label="线下课单价">
+          <el-table-column prop="offlineClassesUnitPrice" label="线下课单价">
             <template slot-scope="scope">
               <div>
-                <el-input v-model.trim="scope.row.offlineClassesUnitPrice"></el-input>
+                <el-input
+                  v-model.trim="scope.row.offlineClassesUnitPrice"
+                ></el-input>
               </div>
             </template>
           </el-table-column>
           <el-table-column label="操作">
             <template slot-scope="scope">
               <div>
-                <el-button type="text" v-if="$helpers.permission('vipGroupDefaultClassesUnitPrice/add')"
-                           @click="saveSeting(scope.row)">保存</el-button>
+                <el-button
+                  type="text"
+                  v-if="
+                    $helpers.permission('vipGroupDefaultClassesUnitPrice/add')
+                  "
+                  @click="saveSeting(scope.row)"
+                  >保存</el-button
+                >
               </div>
             </template>
           </el-table-column>
@@ -63,63 +76,76 @@
   </div>
 </template>
 <script>
-import { vipGroupCategory, defaultClassesUnitPrice } from '@/api/vipSeting'
-import { getEmployeeOrgan } from '@/api/buildTeam'
-import { Searchs } from '@/helpers'
+import { vipGroupCategory, defaultClassesUnitPrice ,getOnlineMun} from "@/api/vipSeting";
+import { getEmployeeOrgan } from "@/api/buildTeam";
+import { Searchs } from "@/helpers";
 export default {
-  name: 'vipChargeSeting',
-  data () {
+  name: "vipChargeSeting",
+  data() {
     return {
       dataList: [],
       organList: [],
       searchForm: {
-        organId: null
-      }
-    }
+        organId: null,
+      },
+      studentRuleNum:0
+    };
   },
-  async mounted () {
+  async mounted() {
     // 获取课程形态 设置vip课酬
     // 获取分部
-    await this.$store.dispatch('setBranchs')
+    await this.$store.dispatch("setBranchs");
     // 获取缓存的分部编号
-    const searchs = new Searchs(this.$route.fullPath)
-    const branchId = searchs.searchs[searchs.key]?.form.organId
-    this.searchForm.organId = branchId ? branchId : this.selects?.branchs[0]['id']
-    this.search()
-
+    const searchs = new Searchs(this.$route.fullPath);
+    const branchId = searchs.searchs[searchs.key]?.form.organId;
+    this.searchForm.organId = branchId
+      ? branchId
+      : this.selects?.branchs[0]["id"];
+    try {
+      const res = await getOnlineMun();
+      let tempObj = JSON.parse(res.data.config);
+      this.studentRuleNum = tempObj.cloud_room_rule.cloud_room_up_limit - 1;
+    } catch (e) {
+      console.log(e);
+    }
+    this.search();
   },
   methods: {
-    search () {
-      this.$refs.searchForm.validate(valid => {
-        this.getList()
-      })
+    search() {
+      this.$refs.searchForm.validate((valid) => {
+        this.getList();
+      });
     },
-    getList () {
-      vipGroupCategory({ organId: this.searchForm.organId }).then(res => {
+    getList() {
+      vipGroupCategory({ organId: this.searchForm.organId }).then((res) => {
         if (res.code == 200) {
-          this.dataList = res.data;
+          this.dataList = []
+          res.data.map(item=>{
+            if(item.studentNum <= this.studentRuleNum) {
+                this.dataList.push(item)
+            }
+          });
         }
-
-      })
+      });
     },
-    saveSeting (row) {
+    saveSeting(row) {
       defaultClassesUnitPrice({
         offlineClassesUnitPrice: row.offlineClassesUnitPrice,
         onlineClassesUnitPrice: row.onlineClassesUnitPrice,
         organId: this.searchForm.organId,
-        vipGroupCategoryId: row.id
-      }).then(res => {
+        vipGroupCategoryId: row.id,
+      }).then((res) => {
         if (res.code == 200) {
           // 保存成功提示=> 刷新列表
-          this.$message.success('保存成功')
+          this.$message.success("保存成功");
         } else {
           // 保存失败
-          this.$message.error('保存失败,请重试');
+          this.$message.error("保存失败,请重试");
         }
-      })
-    }
+      });
+    },
   },
-}
+};
 </script>
 <style lang="scss">
 </style>

src/views/couponManager/couponUpdate.vue

@@ -245,9 +245,10 @@
             prop="warningStockNum"
             :rules="[{ required: true, message: '请输入预警值' }]"
           >
-            <el-input v-model="form.warningStockNum" placeholder="请输入预警值">
+            <el-input :disabled='form.warningStockNum ==-1' v-model="warningStockNum" placeholder="请输入预警值">
               <template slot="append">张</template>
             </el-input>
+             <el-checkbox v-model="form.warningStockNum" @change="(val)=>{checkNo(val,'warningStockNum')}">不限制</el-checkbox>
           </el-form-item>
         </el-col>
         <el-col style="width: 395px">
@@ -331,6 +332,7 @@ export default {
       activeRow: null,
       isDisabled: false,
       title: "新增优惠券",
+      warningStockNum:false,
     };
   },
   mounted() {
@@ -454,6 +456,13 @@ export default {
         }
       });
     },
+    checkNo(val,type){
+      if(val){
+        form[type] = -1
+      }else{
+         form[type] = null
+      }
+    }
   },
 };
 </script>

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

@@ -3,10 +3,14 @@
     <!-- <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>
+            <template slot-scope="scope">{{
+              scope.row.courseScheduleType | coursesType
+            }}</template>
           </el-table-column>
           <!-- <el-table-column label="自定义课酬-主教">
             <template slot-scope="scope">
@@ -40,103 +44,134 @@
           </el-table-column> -->
           <el-table-column label="标准课酬-主教">
             <template slot-scope="scope">
-              <el-input type="number"
-                        @mousewheel.native.prevent
-
-                        v-model.trim="scope.row.mainTeacher90MinSalary"
-                        placeholder="请输入课酬">
-                <template slot="append"
-                          v-if="scope.row.courseScheduleType == 'HIGH'">元/人</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
+                v-model.trim="scope.row.mainTeacher90MinSalary"
+                placeholder="请输入课酬"
+              >
+                <template
+                  slot="append"
+                  v-if="scope.row.courseScheduleType == 'HIGH'"
+                  >元/人</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="标准课酬-助教">
             <template slot-scope="scope">
-              <el-input type="number"
-                        @mousewheel.native.prevent
-
-                        v-model.trim="scope.row.assistantTeacher90MinSalary"
-                        placeholder="请输入课酬">
-                <template slot="append"
-                          v-if="scope.row.courseScheduleType == 'HIGH'">元/人</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
+                v-model.trim="scope.row.assistantTeacher90MinSalary"
+                placeholder="请输入课酬"
+              >
+                <template
+                  slot="append"
+                  v-if="scope.row.courseScheduleType == 'HIGH'"
+                  >元/人</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' }"
+          v-if="tenantId == 1"
+        >
           <el-table-column label="">
-            <template slot-scope="scope">{{ scope.row.courseScheduleType | coursesType }}</template>
+            <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"
-                        @mousewheel.native.prevent
-                        v-model.trim="scope.row.v1"
-                        placeholder="请输入课酬">
+              <el-input
+                type="number"
+                @mousewheel.native.prevent
+                v-model.trim="scope.row.v1"
+                placeholder="请输入课酬"
+              >
                 <template slot="append">元/节</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="1V2">
             <template slot-scope="scope">
-              <el-input type="number"
-                        @mousewheel.native.prevent
-                        v-model.trim="scope.row.v2"
-                        placeholder="请输入课酬">
+              <el-input
+                type="number"
+                @mousewheel.native.prevent
+                v-model.trim="scope.row.v2"
+                placeholder="请输入课酬"
+              >
                 <template slot="append">元/节</template>
               </el-input>
             </template>
           </el-table-column>
           <el-table-column label="1V3">
             <template slot-scope="scope">
-              <el-input type="number"
-                        @mousewheel.native.prevent
-                        v-model.trim="scope.row.v3"
-                        placeholder="请输入课酬">
+              <el-input
+                type="number"
+                @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"
-                        @mousewheel.native.prevent
-                        v-model.trim="scope.row.v4"
-                        placeholder="请输入课酬">
+              <el-input
+                type="number"
+                @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"
-                        @mousewheel.native.prevent
-                        v-model.trim="scope.row.v5"
-                        placeholder="请输入课酬">
+              <el-input
+                type="number"
+                @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
@@ -152,55 +187,100 @@
           <el-table-column label="">
             <template slot-scope="scope">
               <div>
-                <el-input type="number"
-                        @mousewheel.native.prevent
-                        v-model.trim="scope.row.offlineClassesSalary"
-                        placeholder="请输入内容">
-                <template slot="append"> 元/节</template>
-                <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
-              </el-input>
+                <el-input
+                  type="number"
+                  @mousewheel.native.prevent
+                  v-model.trim="scope.row.offlineClassesSalary"
+                  placeholder="请输入内容"
+                >
+                  <template slot="append"> 元/节</template>
+                  <!-- <template slot="append" v-else>节/人</template>  v-if="scope.row.musicTheory" -->
+                </el-input>
               </div>
-
             </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">
-                <template slot="append">元/{{scope.row.minutes}}分钟</template>
+              <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>
           </el-table-column>
         </el-table>
 
-        <el-form style="margin-top: 20px;" ref="salaryForm" :model="updateForm" :rules="rules">
-          <el-form-item label="是否结算课酬" label-width="120px" prop="isSettlementSalary" :rules="[{ required: true, message: '请选择是否结算课酬', trigger: 'change'}]">
-              <el-select v-model.trim="updateForm.isSettlementSalary" style="width: 220px !important;">
-                <el-option label="是" :value="1"></el-option>
-                <el-option label="否" :value="0"></el-option>
-              </el-select>
-            <div style="display: inline; color: red; padding-left: 10px;">说明：老师是否结算课酬；</div>
+        <el-form
+          style="margin-top: 20px"
+          ref="salaryForm"
+          :model="updateForm"
+          :rules="rules"
+        >
+          <el-form-item
+            label="是否结算课酬"
+            label-width="120px"
+            prop="isSettlementSalary"
+            :rules="[
+              {
+                required: true,
+                message: '请选择是否结算课酬',
+                trigger: 'change',
+              },
+            ]"
+          >
+            <el-select
+              v-model.trim="updateForm.isSettlementSalary"
+              style="width: 220px !important"
+            >
+              <el-option label="是" :value="1"></el-option>
+              <el-option label="否" :value="0"></el-option>
+            </el-select>
+            <div style="display: inline; color: red; padding-left: 10px">
+              说明：老师是否结算课酬；
+            </div>
           </el-form-item>
-          <el-form-item label="生效日期" label-width="120px" prop="startDate" :rules="[{ required: true, message: '请选择生效日期', trigger: 'change'}]">
-            <el-date-picker v-model.trim="updateForm.startDate"
-                            type="date"
-                            value-format="yyyy-MM-dd"
-                            :picker-options="pickerOptions"
-                            placeholder="选择日期"></el-date-picker>
-            <div style="display: inline; color: red; padding-left: 10px;">说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；</div>
+          <el-form-item
+            label="生效日期"
+            label-width="120px"
+            prop="startDate"
+            :rules="[
+              { required: true, message: '请选择生效日期', trigger: 'change' },
+            ]"
+          >
+            <el-date-picker
+              v-model.trim="updateForm.startDate"
+              type="date"
+              value-format="yyyy-MM-dd"
+              :picker-options="pickerOptions"
+              placeholder="选择日期"
+            ></el-date-picker>
+            <div style="display: inline; color: red; padding-left: 10px">
+              说明：本次调整只对生效日期之后（包含当天）且未结算的课程生效；
+            </div>
           </el-form-item>
-
         </el-form>
 
         <!--  v-permission="pageType == 'create' ? {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherAdd/batchUpset'} : {child: 'teacherDefaultMusicGroupSalary/batchUpset', parent: 'teacherUpdate/batchUpset'}" -->
-        <div style="padding-top: 10px;">
-          <auth :auths="pageType == 'create' ? ['/teacherOperationAdd', 'teacherDefaultCreateSave'] : ['/teacherOperationUpdate', 'teacherDefaultUpdateSave']" mulit>
+        <div style="padding-top: 10px">
+          <auth
+            :auths="
+              pageType == 'create'
+                ? ['/teacherOperationAdd', 'teacherDefaultCreateSave']
+                : ['/teacherOperationUpdate', 'teacherDefaultUpdateSave']
+            "
+            mulit
+          >
             <el-button @click="onSave()" type="primary">保存</el-button>
           </auth>
         </div>
@@ -217,10 +297,11 @@ import {
   teacherDefaultPracticeGroupSalary,
   PracticeGroupSalaryUpdate,
   teacherGet,
-  teacherUpdate1
+  teacherUpdate1,
 } from "@/api/teacherManager";
+
 import { sysConfigList } from "@/api/generalSettings";
-import { findTeacherDefaultSalary } from "@/api/vipSeting";
+import { findTeacherDefaultSalary, getOnlineMun } from "@/api/vipSeting";
 let nowTime = new Date();
 let checkTime =
   nowTime.getFullYear() +
@@ -231,7 +312,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,
@@ -242,7 +323,7 @@ export default {
           courseScheduleType: "SINGLE",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           assistantTeacher30MinSalary: 0,
@@ -250,7 +331,7 @@ export default {
           courseScheduleType: "MIX",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           assistantTeacher30MinSalary: 0,
@@ -258,7 +339,7 @@ export default {
           courseScheduleType: "COMPREHENSIVE",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           assistantTeacher30MinSalary: 0,
@@ -266,7 +347,7 @@ export default {
           courseScheduleType: "TRAINING_SINGLE",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           assistantTeacher30MinSalary: 0,
@@ -274,7 +355,7 @@ export default {
           courseScheduleType: "TRAINING_MIX",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           assistantTeacher30MinSalary: 0,
@@ -282,7 +363,7 @@ export default {
           courseScheduleType: "HIGH",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           assistantTeacher30MinSalary: 0,
@@ -290,8 +371,8 @@ export default {
           courseScheduleType: "CLASSROOM",
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
-        }
+          userId: this.teacherId,
+        },
       ],
       // salaryRuleJson: { 3: 0, 4: 0, 5: 0 },
       // userId: this.teacherId
@@ -308,7 +389,7 @@ export default {
           assistantTeacher90MinSalary: 0,
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
+          userId: this.teacherId,
         },
         {
           courseScheduleType: "MUSIC_NETWORK",
@@ -322,8 +403,8 @@ export default {
           assistantTeacher90MinSalary: 0,
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: this.teacherId
-        }
+          userId: this.teacherId,
+        },
       ],
       vipTable: [],
       musicGroupTable: [],
@@ -339,20 +420,30 @@ export default {
           assistantTeacherSalary: 30,
           minutes: 25,
           userId: this.teacherId,
-          mainTeacherSalary: 0
-        }
+          mainTeacherSalary: 0,
+        },
       ],
       pickerOptions: {
-        disabledDate (time) {
+        disabledDate(time) {
           return time.getTime() > Date.now();
         },
-        firstDayOfWeek: 1
-      }
+        firstDayOfWeek: 1,
+      },
+      tenantId: "",
+      studentRuleNum: "",
     };
   },
-  created () { },
-  mounted () {
+  created() {},
+  async mounted() {
     // this.pageType = this.$route.query.type;
+    try {
+      const res = await getOnlineMun();
+      let tempObj = JSON.parse(res.data.config);
+      this.studentRuleNum = tempObj.cloud_room_rule.cloud_room_up_limit - 1;
+    } catch (e) {
+      console.log(e);
+    }
+    this.tenantId = this.$helpers.tenantId;
     this.__init();
   },
   // activated () {
@@ -360,7 +451,7 @@ export default {
   //   this.__init();
   // },
   methods: {
-    __init () {
+    __init() {
       if (this.$route.query.search) {
         this.Fsearch = this.$route.query.search;
       }
@@ -368,32 +459,36 @@ export default {
         this.Frules = this.$route.query.rules;
       }
       teacherGet({ teacherId: this.teacherId }).then((res) => {
-          if (res.code == 200) {
-            let result = res.data;
-            this.updateForm.isSettlementSalary = result.isSettlementSalary ? 1 : 0
-          }
-        });
+        if (res.code == 200) {
+          let result = res.data;
+          this.updateForm.isSettlementSalary = result.isSettlementSalary
+            ? 1
+            : 0;
+        }
+      });
 
       // 获取课程形态 设置vip课酬
-      findTeacherDefaultSalary({ userId: this.teacherId }).then(res => {
+      findTeacherDefaultSalary({ userId: this.teacherId }).then((res) => {
         if (res.code == 200 && res.data.length > 0) {
           let vipData = [];
-          res.data.forEach(item => {
-            vipData.push({
-              offlineClassesSalary: null,
-              onlineClassesSalary: null,
-              vipGroupCategoryId: item.id,
-              vipGroupCategoryName: item.name,
-              userId: this.teacherId,
-               musicTheory:item.musicTheory
-            });
+          res.data.forEach((item) => {
+            if (item.studentNum <= this.studentRuleNum) {
+              vipData.push({
+                offlineClassesSalary: null,
+                onlineClassesSalary: null,
+                vipGroupCategoryId: item.id,
+                vipGroupCategoryName: item.name,
+                userId: this.teacherId,
+                musicTheory: item.musicTheory,
+              });
+            }
           });
           // VIP课列表
           vipGroupSalaryList({
             rows: 9999,
             page: 1,
-            search: this.teacherId
-          }).then(res => {
+            search: this.teacherId,
+          }).then((res) => {
             if (res.code == 200) {
               let rows = res.data.rows;
               this.vipListCompare(vipData, rows);
@@ -405,9 +500,9 @@ export default {
       teacherSalaryList({
         rows: 9999,
         page: 1,
-        teacherId: this.teacherId
+        teacherId: this.teacherId,
         // settlementType: 'FIXED_SALARY'
-      }).then(res => {
+      }).then((res) => {
         if (res.code == 200) {
           // this.teamTable = res.data.rows
           let rows = res.data.rows;
@@ -416,14 +511,14 @@ export default {
       });
       // 网管课
       teacherDefaultPracticeGroupSalary({ teacherId: this.teacherId }).then(
-        res => {
+        (res) => {
           if (res.code == 200 && res.data.length > 0) {
             this.accompanyTable = res.data;
           }
         }
       );
     },
-    vipListCompare (vipData, rows) {
+    vipListCompare(vipData, rows) {
       // vip 做对比
       if (!rows) {
         // 判断是否有数据
@@ -431,8 +526,8 @@ export default {
         return;
       }
       let result = [];
-      vipData.forEach(item => {
-        rows.forEach(c => {
+      vipData.forEach((item) => {
+        rows.forEach((c) => {
           if (item.vipGroupCategoryId == c.vipGroupCategoryId) {
             item.checked = true;
             result.push({
@@ -441,13 +536,13 @@ export default {
               onlineClassesSalary: c.onlineClassesSalary,
               vipGroupCategoryName: c.vipGroupCategoryName,
               userId: c.userId,
-              musicTheory:c.musicTheory
+              musicTheory: c.musicTheory,
             });
           }
         });
       });
       if (result.length > 0) {
-        vipData.forEach(item => {
+        vipData.forEach((item) => {
           if (!item.checked) {
             result.push(item);
           }
@@ -458,13 +553,13 @@ export default {
       this.vipTable = result;
     },
 
-    teacherSalaryMoney (rows) {
+    teacherSalaryMoney(rows) {
       // 判断是否有数据
       if (!rows || rows.length <= 0) return;
       let teamTable = this.teamTable;
       let result = [];
-      teamTable.forEach(item => {
-        rows.forEach(c => {
+      teamTable.forEach((item) => {
+        rows.forEach((c) => {
           if (item.courseScheduleType == c.courseScheduleType) {
             item.checked = true;
             result.push({
@@ -473,13 +568,13 @@ export default {
               assistantTeacher30MinSalary: c.assistantTeacher30MinSalary,
               assistantTeacher90MinSalary: c.assistantTeacher90MinSalary,
               courseScheduleType: c.courseScheduleType,
-              userId: this.teacherId
+              userId: this.teacherId,
             });
           }
         });
       });
       if (result.length > 0) {
-        teamTable.forEach(item => {
+        teamTable.forEach((item) => {
           if (!item.checked) {
             result.push(item);
           }
@@ -489,13 +584,15 @@ export default {
       }
       this.teamTable = result;
 
-      let smallResult = []
-      let teamSmallTable = this.teamSmallTable
-      teamSmallTable.forEach(item => {
-        rows.forEach(c => {
+      let smallResult = [];
+      let teamSmallTable = this.teamSmallTable;
+      teamSmallTable.forEach((item) => {
+        rows.forEach((c) => {
           if (item.courseScheduleType == c.courseScheduleType) {
             item.checked = true;
-            let tempJson = c.salaryRuleJson ? JSON.parse(c.salaryRuleJson) : { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 }
+            let tempJson = c.salaryRuleJson
+              ? JSON.parse(c.salaryRuleJson)
+              : { 1: 0, 2: 0, 3: 0, 4: 0, 5: 0 };
             // console.log(tempJson)
             smallResult.push({
               mainTeacher30MinSalary: c.mainTeacher30MinSalary,
@@ -509,14 +606,14 @@ export default {
               v4: tempJson[4] ? tempJson[4] : 0,
               v5: tempJson[5] ? tempJson[5] : 0,
               courseScheduleType: c.courseScheduleType,
-              userId: this.teacherId
+              userId: this.teacherId,
             });
           }
         });
-      })
+      });
 
       if (smallResult.length > 0) {
-        teamSmallTable.forEach(item => {
+        teamSmallTable.forEach((item) => {
           if (!item.checked) {
             smallResult.push(item);
           }
@@ -526,10 +623,10 @@ export default {
       }
       this.teamSmallTable = smallResult;
     },
-    onSave () {
+    onSave() {
       let teamTable = this.teamTable;
       let checkStatus = true;
-      teamTable.forEach(item => {
+      teamTable.forEach((item) => {
         if (
           item.assistantTeacher30MinSalary < 0 ||
           item.assistantTeacher90MinSalary < 0 ||
@@ -541,24 +638,36 @@ export default {
           return;
         }
       });
-      let temps = []
-      this.teamSmallTable.forEach(item => {
-        if (item.v1 < 0 || item.v2 < 0 || item.v3 < 0 || item.v4 < 0 || item.v5 < 0) {
+      let temps = [];
+      this.teamSmallTable.forEach((item) => {
+        if (
+          item.v1 < 0 ||
+          item.v2 < 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), 2: Number(item.v2), 3: Number(item.v3), 4: Number(item.v4), 5: Number(item.v5) }),
+          salaryRuleJson: JSON.stringify({
+            1: Number(item.v1),
+            2: Number(item.v2),
+            3: Number(item.v3),
+            4: Number(item.v4),
+            5: Number(item.v5),
+          }),
           assistantTeacher30MinSalary: 0,
           assistantTeacher90MinSalary: 0,
           mainTeacher30MinSalary: 0,
           mainTeacher90MinSalary: 0,
-          userId: item.userId
-        })
-      })
-      this.vipTable.forEach(item => {
+          userId: item.userId,
+        });
+      });
+      this.vipTable.forEach((item) => {
         // console.log(item)
         if (item.offlineClassesSalary < 0 || item.onlineClassesSalary < 0) {
           this.$message.error("输入课酬不能为负数");
@@ -566,7 +675,7 @@ export default {
           return;
         }
       });
-      this.accompanyTable.forEach(item => {
+      this.accompanyTable.forEach((item) => {
         if (item.mainTeacherSalary < 0) {
           this.$message.error("输入课酬不能为负数");
           checkStatus = false;
@@ -579,44 +688,48 @@ export default {
         }
       });
       if (!checkStatus) {
-        return
+        return;
       }
-      this.$refs['salaryForm'].validate((valid) => {
-        if(valid) {
+      this.$refs["salaryForm"].validate((valid) => {
+        if (valid) {
           this.$confirm("您确定更改老师课酬", "提示", {
             confirmButtonText: "确定",
             cancelButtonText: "取消",
-            type: "warning"
+            type: "warning",
           })
             .then(async () => {
-              let params = teamTable.concat(temps)
-              let updateForm = this.updateForm
-              let res = await teacherUpdate1({ id: this.teacherId, isSettlementSalary: updateForm.isSettlementSalary })
-              if(res.code != 200) {
-                this.$message.error(res.msg)
-                return
+              let params = teamTable.concat(temps);
+              let updateForm = this.updateForm;
+              let res = await teacherUpdate1({
+                id: this.teacherId,
+                isSettlementSalary: updateForm.isSettlementSalary,
+              });
+              if (res.code != 200) {
+                this.$message.error(res.msg);
+                return;
               }
               teacherSalaryBatchUpset({
                 teacherDefaultMusicGroupSalaries: params,
-                startDate: updateForm.startDate
-              }).then(res => {
+                startDate: updateForm.startDate,
+              }).then((res) => {
                 if (res.code == 200) {
                   // 判断输入的值是否正确
                   vipGroupSalarySet({
                     teacherDefaultVipGroupSalaries: this.vipTable,
-                    startDate: updateForm.startDate
-                  }).then(res => {
+                    startDate: updateForm.startDate,
+                  }).then((res) => {
                     if (res.code == 200) {
                       PracticeGroupSalaryUpdate({
                         startDate: updateForm.startDate,
-                        teacherDefaultPracticeGroupSalaries: this.accompanyTable
-                      }).then(res => {
+                        teacherDefaultPracticeGroupSalaries:
+                          this.accompanyTable,
+                      }).then((res) => {
                         if (res.code == 200) {
                           this.$message.success("保存成功");
-                          this.$store.dispatch('delVisitedViews', this.$route)
+                          this.$store.dispatch("delVisitedViews", this.$route);
                           this.$router.push({
                             path: "/teacherManager/teacherList",
-                            query: { rules: this.Frules, search: this.Fsearch }
+                            query: { rules: this.Frules, search: this.Fsearch },
                           });
                         }
                       });
@@ -625,18 +738,16 @@ export default {
                 }
               });
             })
-            .catch(() => { });
+            .catch(() => {});
         }
-      })
+      });
       // 判断输入的值是否正确
       // if (!this.startDate) {
       //   this.$message.error("请填写生效日期");
       //   return;
       // }
-
-
-    }
-  }
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>

src/views/teamBuild/components/soundSetComponents/chioseMusic.vue

@@ -9,6 +9,7 @@
               style="width: 180px"
               :disabled="basdisabled"
               v-model="music.musical"
+              clearable
               @change="
                 (val) => {
                   chioseMusic(val, music);