Merge branch '11/24SAAS' of http://git.dayaedu.com/yonge/dy-admin-manager into 11/24SAAS

src/constant/guide.js

@@ -7,7 +7,7 @@ export const guideList = {
   },
   teamManager: {
     name: '乐团主管',
-    desc: '乐团主管是直接管理乐团的负责人，可在分部中设置各分部的乐团主管',
+    desc: '乐团主管是直接管理乐团的负责人，可在员工管理中设置各分部的乐团主管',
     path: '/sysBasics/staffManager',
     permission: '/staffManager'
   },

src/views/couponManager/couponUpdate.vue

@@ -253,7 +253,8 @@
         <el-col style="width: 395px">
           <el-form-item
             prop="limitExchangeNum"
-            :rules="[{ required: true, message: '请输入领取上限' }]"
+            :rules="[{ required: true, message: '请输入领取上限' },
+            {pattern:/^[1-9][0-9]?$/,message:'请输入1-99的正整数',trigger: 'blur'}]"
           >
             <span style="color: #606266">
               <span style="color: #f56c6c">*</span> 领取上限

src/views/sporadicManager/sporadicList.vue

@@ -535,9 +535,9 @@ export default {
         { label: "双十一活动", value: 12 },
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
-        { label: "乐保服务", value: 10 },
-        { label: "网基课活动", value: 13 },
-        { label: "云教练购买", value: 15 },
+        // { label: "乐保服务", value: 10 },
+        // { label: "网基课活动", value: 13 },
+        // { label: "云教练购买", value: 15 },
         { label: "其它", value: 11 },
       ],
       orderType1: [
@@ -548,9 +548,9 @@ export default {
         // { label: '双十一活动', value: 12 },
         { label: "上门费", value: 7 },
         { label: "账户充值", value: 9 },
-        { label: "乐保服务", value: 10 },
-        { label: "网基课活动", value: 13 },
-        { label: "云教练购买", value: 15 },
+        // { label: "乐保服务", value: 10 },
+        // { label: "网基课活动", value: 13 },
+        // { label: "云教练购买", value: 15 },
       ],
       maskForm: {
         organId: "",

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

@@ -42,7 +42,7 @@
             <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"
@@ -59,7 +59,7 @@
             <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"

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

@@ -164,10 +164,11 @@ export default {
   },
   created() {},
   mounted() {
+    console.log({...this.item})
     if (this.item.chioseMusic.length < 1) {
       this.item.chioseMusic.push({
         musical: "",
-        type: ["GROUP"],
+        type: [],
         groupPrice: 0,
         borrowPrice: 1500,
         groupRemissionCourseFee: false,
@@ -185,7 +186,7 @@ export default {
     addMusic() {
       this.item.chioseMusic.push({
         musical: "",
-        type: ["GROUP"],
+        type: [],
         groupPrice: null,
         borrowPrice: 1500,
         groupRemissionCourseFee: 0,

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

@@ -252,6 +252,7 @@ export default {
                         // 格式化商品和教辅
                         res.data.musicGroupSubjectGoodsGroups.forEach(
                           (shop) => {
+
                             let index = findIndex(this.activeSoundList, (o) => {
                               return o.id == shop.subjectId;
                             });
@@ -355,6 +356,7 @@ export default {
       this.soundVisible = false;
     },
     initSound(item) {
+
       let obj = {
         id: item.id,
         sound: item.name,
@@ -362,7 +364,7 @@ export default {
         chioseMusic: [
           {
             musical: "",
-            type: ["GROUP"],
+            type: [],
             groupPrice: 0,
             borrowPrice: 1500,
             groupRemissionCourseFee: Boolean(item.groupRemissionCourseFee),

src/views/teamBuild/components/teamBaseInfo.vue

@@ -461,7 +461,7 @@ export default {
         time: "", // 报名截止时间
         startClass: [], // 招生年级起始
         address: "", // 教学地点
-        salary: "TEACHER_DEFAULT", // 收费模式
+        salary: "", // 收费模式
         head: "",
         homeworkPushFlag: 1, // 是否同步群消息
         memberCourseShowFlag: 0,