12/24 11

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

@@ -46,6 +46,7 @@
           >
             团购价:
           </p>
+
           <div
             v-show="
               music.type && music.type.length > 0
@@ -58,6 +59,7 @@
               <template slot="append">元</template></el-input
             >
           </div>
+
           <!-- <div v-else
                style="width:180px">
             <el-input value="--"
@@ -105,7 +107,18 @@
             @click="deleteMusic(music)"
             style="font-size: 20px; cursor: pointer"
           ></i>
+
+        </div>
+        <div style="margin-left:140px;margin-top:5px;"  v-show="
+              music.type && music.type.length > 0
+                ? music.type.includes('GROUP')
+                : false
+            ">
+          <el-checkbox :disabled="basdisabled" v-model="music.groupRemissionCourseFee" @change="(val)=>{changeFee(val,music)}">团购减免课程费用</el-checkbox>
+          {{music}}
+
         </div>
+
       </div>
       <el-divider></el-divider>
     </div>
@@ -148,6 +161,7 @@ export default {
         type: ["GROUP"],
         groupPrice: null,
         borrowPrice: 1500,
+        groupRemissionCourseFee:0
       });
       this.$emit("lookMusic");
     },
@@ -168,6 +182,9 @@ export default {
        })
      })
      return flag
+    },
+    changeFee(val,music){
+      console.log(val,music.groupRemissionCourseFee)
     }
   },
 };
@@ -205,4 +222,4 @@ p {
   margin-top: 10px;
   width: 100%;
 }
-</style>
+</style>

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

@@ -190,7 +190,6 @@ export default {
                     this.chioseActiveSound = activeSound;
                     this.changeActiveSound(activeSound.join(","));
                     // 格式化商品和教辅
-
                     res.data.musicGroupSubjectGoodsGroups.forEach((shop) => {
                       let index = findIndex(this.activeSoundList, (o) => {
                         return o.id == shop.subjectId;
@@ -213,6 +212,7 @@ export default {
                             type: typeJson,
                             groupPrice: shop.price,
                             borrowPrice: shop.depositFee,
+                            groupRemissionCourseFee :Boolean(shop.groupRemissionCourseFee)
                           });
                         }
                       }
@@ -268,7 +268,7 @@ export default {
         sound: item.name,
         expectedStudentNum: item.expectedStudentNum,
         chioseMusic: [
-          { musical: "", type: ["GROUP"], groupPrice: 0, borrowPrice: 1500 },
+          { musical: "", type: ["GROUP"], groupPrice: 0, borrowPrice: 1500,groupRemissionCourseFee:Boolean(item.groupRemissionCourseFee) },
         ],
         markChioseList: [],
         goodsList: [],
@@ -355,10 +355,12 @@ export default {
         };
         obj.musicGroupSubjectPlans.push(item);
         // 格式化商品数据 chioseMusic: [{ musical: '', type: ["GROUP"], groupPrice: 0, borrowPrice: 1500 }],
+        console.log(active.chioseMusic)
         active.chioseMusic.forEach((music) => {
           let goodsItem = null;
           let depositFee = music.borrowPrice;
           let price = music.groupPrice;
+          let groupRemissionCourseFee  = music.groupRemissionCourseFee*1
           let index = findIndex(active.goodsList, (o) => {
             return o.id == music.musical;
           });
@@ -377,7 +379,7 @@ export default {
           //   // 字符串
           //   let arr = [ music.type]
           //     arr.forEach((type) => {
-          //     kitGroupPurchaseTypeJson[type] = 0; 
+          //     kitGroupPurchaseTypeJson[type] = 0;
           //   });
           // }
           kitGroupPurchaseTypeJson = JSON.stringify(kitGroupPurchaseTypeJson);
@@ -390,6 +392,7 @@ export default {
               kitGroupPurchaseTypeJson,
               depositFee,
               price,
+              groupRemissionCourseFee
             };
             obj.musicGroupSubjectGoodsGroups.push(some);
           }