Merge branch '02/23reviewBUG' into test

src/views/teamBuild/modals/accessories.vue

@@ -98,9 +98,27 @@ export default {
       }
       this.$listeners.change(formatids, selectMoney);
     },
+    list: {
+      deep: true,
+      immediate: true,
+      handler(val) {
+        this.$nextTick(() => {
+          const accessoriesByid = {};
+          for (const item of this.list) {
+            accessoriesByid[item.id] = item;
+          }
+          const groupListById = {};
+          for (const item of this.groupList) {
+            groupListById[item.id] = item;
+          }
+          this.accessoriesByid = accessoriesByid;
+          this.groupListById = groupListById;
+        });
+      },
+    },
   },
   mounted() {
-    this.init()
+    this.init();
   },
   computed: {
     groupOptions() {

src/views/teamBuild/modals/change-voice.vue

@@ -101,7 +101,7 @@
           " -->
         <el-form-item
 
-          v-if="activeAccessories.length || groupList.length || changeInfo"
+          v-if="(activeAccessories.length || groupList.length || changeInfo)&&form.musicalGoods"
           label="更换教辅"
           class="is-required"
         >
@@ -110,6 +110,7 @@
             :list.sync="activeAccessories"
             :groupList.sync="groupList"
             @change="accessoriesChange"
+
             v-if="!changeInfo"
           />
           <span v-else-if="changeInfo">{{ changeAccessoriesGoods }}</span>
@@ -351,8 +352,10 @@ export default {
       );
     },
     activeAccessories() {
+
       const { musicalGoods } = this.form || {};
-      return musicalGoods ? this.accessoriesByGoods[musicalGoods] || [] : [];
+        let arr = musicalGoods ? this.accessoriesByGoods[musicalGoods] || [] : [];
+      return arr
     },
     changeSubjectName() {
       let name = "";
@@ -379,7 +382,6 @@ export default {
         (data.originalAccessoriesPrice || 0) +
         (data.originalCourseFee || 0) +
         (data.originalMusicalPrice || 0);
-      // console.log(payed, data.changeMusicalPrice, data.changeAccessoriesPrice, data.changeCourseFee, {...data})
       return (
         (data.changeMusicalPrice || 0) +
         (data.changeAccessoriesPrice || 0) +
@@ -465,12 +467,16 @@ export default {
           });
           data = res.data;
           this.musicGroupSubjectPlanFee = res.data.musicGroupSubjectPlan.fee;
+          // 更改辅件了列表
+
         } catch (e) {
           console.log(e);
         }
       } else {
         this.musicGroupSubjectPlanFee = 0;
       }
+
+
       const items = formatAllGoods(data, this.item.kitGroupPurchaseType);
       for (const key in items) {
         if (items.hasOwnProperty(key)) {