12/24 17:12 团购乐器减免

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

@@ -19,7 +19,7 @@
               :key="index"
               :label="item.name"
               :value="item.id"
-              :disabled='checkDisabled(item)'
+              :disabled="checkDisabled(item)"
             ></el-option>
           </el-select>
         </div>
@@ -59,13 +59,6 @@
               <template slot="append">元</template></el-input
             >
           </div>
-
-          <!-- <div v-else
-               style="width:180px">
-            <el-input value="--"
-                      disabled> <template slot="append">元</template></el-input>
-          </div> -->
-
           <p
             class="title"
             v-show="
@@ -107,18 +100,30 @@
             @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
+          style="margin-top: 5px"
+          v-show="
+            music.type && music.type.length > 0
+              ? music.type.includes('GROUP')
+              : false
+          "
+        >
+          <div class="flexRow">
+            <p class="title">团购乐器减免课程费用:</p>
+            <el-radio-group
+              v-model="music.groupRemissionCourseFee"
+              v-show="
+                music.type && music.type.length > 0
+                  ? music.type.includes('GROUP')
+                  : false
+              "
+            >
+              <el-radio :label="true">是</el-radio>
+              <el-radio :label="false">否</el-radio>
+            </el-radio-group>
+          </div>
         </div>
-
       </div>
       <el-divider></el-divider>
     </div>
@@ -138,7 +143,7 @@
 </template>
 <script>
 export default {
-  props: ["item", "basdisabled",'activeSoundList'],
+  props: ["item", "basdisabled", "activeSoundList"],
   data() {
     return {
       radio: "",
@@ -161,7 +166,7 @@ export default {
         type: ["GROUP"],
         groupPrice: null,
         borrowPrice: 1500,
-        groupRemissionCourseFee:0
+        groupRemissionCourseFee: 0,
       });
       this.$emit("lookMusic");
     },
@@ -172,21 +177,20 @@ export default {
         }
       });
     },
-    checkDisabled(item){
-      let flag = false
-     this.activeSoundList.forEach(musics=>{
-       musics.chioseMusic.forEach(music=>{
-         if(item.id==music.musical){
-           flag= true
-         }
-       })
-     })
-     return flag
+    checkDisabled(item) {
+      let flag = false;
+      this.activeSoundList.forEach((musics) => {
+        musics.chioseMusic.forEach((music) => {
+          if (item.id == music.musical) {
+            flag = true;
+          }
+        });
+      });
+      return flag;
+    },
+    changeFee(val, music) {
+      this.$set(music, "groupRemissionCourseFee", val);
     },
-    changeFee(val,music){
-      console.log(val,music.groupRemissionCourseFee)
-      this.$set(music,'groupRemissionCourseFee',val)
-    }
   },
 };
 </script>
@@ -208,7 +212,7 @@ p {
   margin-right: 10px;
 }
 .title {
-  width: 100px !important;
+  width: 140px !important;
   text-align: right;
   margin-right: 10px;
 }

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

@@ -44,7 +44,7 @@
             </div>
             <el-divider></el-divider>
             <chioseMusic
-            :activeSoundList="activeSoundList"
+              :activeSoundList="activeSoundList"
               :item="item"
               @lookMusic="lookMusic"
               :basdisabled="basdisabled"
@@ -212,12 +212,15 @@ export default {
                             type: typeJson,
                             groupPrice: shop.price,
                             borrowPrice: shop.depositFee,
-                            groupRemissionCourseFee :Boolean(shop.groupRemissionCourseFee)
+                            groupRemissionCourseFee: Boolean(
+                              shop.groupRemissionCourseFee
+                            ),
                           });
                         }
                       }
                     });
                   }
+                  console.log(this.activeSoundList);
                 }
               );
             }
@@ -268,7 +271,13 @@ export default {
         sound: item.name,
         expectedStudentNum: item.expectedStudentNum,
         chioseMusic: [
-          { musical: "", type: ["GROUP"], groupPrice: 0, borrowPrice: 1500,groupRemissionCourseFee:Boolean(item.groupRemissionCourseFee) },
+          {
+            musical: "",
+            type: ["GROUP"],
+            groupPrice: 0,
+            borrowPrice: 1500,
+            groupRemissionCourseFee: Boolean(item.groupRemissionCourseFee),
+          },
         ],
         markChioseList: [],
         goodsList: [],
@@ -355,12 +364,19 @@ export default {
         };
         obj.musicGroupSubjectPlans.push(item);
         // 格式化商品数据 chioseMusic: [{ musical: '', type: ["GROUP"], groupPrice: 0, borrowPrice: 1500 }],
-        console.log(active.chioseMusic)
+
         active.chioseMusic.forEach((music) => {
+          console.log(music);
           let goodsItem = null;
           let depositFee = music.borrowPrice;
           let price = music.groupPrice;
-          let groupRemissionCourseFee  = music.groupRemissionCourseFee*1
+          let groupRemissionCourseFee;
+          if (music.type.indexOf("GROUP") != -1) {
+            groupRemissionCourseFee = music.groupRemissionCourseFee * 1;
+          } else {
+            groupRemissionCourseFee = 0;
+          }
+
           let index = findIndex(active.goodsList, (o) => {
             return o.id == music.musical;
           });
@@ -368,9 +384,9 @@ export default {
             goodsItem = active.goodsList[index];
           }
           let kitGroupPurchaseTypeJson = {};
-             music.type.forEach((type) => {
-              kitGroupPurchaseTypeJson[type] = 0;
-            });
+          music.type.forEach((type) => {
+            kitGroupPurchaseTypeJson[type] = 0;
+          });
           // if (Array.isArray(music.type)) {
           //   music.type.forEach((type) => {
           //     kitGroupPurchaseTypeJson[type] = 0;
@@ -392,7 +408,7 @@ export default {
               kitGroupPurchaseTypeJson,
               depositFee,
               price,
-              groupRemissionCourseFee
+              groupRemissionCourseFee,
             };
             obj.musicGroupSubjectGoodsGroups.push(some);
           }
@@ -562,7 +578,7 @@ export default {
     margin-right: 10px;
   }
   .title {
-    width: 100px;
+    width: 140px;
     text-align: right;
   }
 }