Merge branch '07/06musicArchives' into test

src/views/teamBuild/modals/accessories.vue

@@ -1,20 +1,47 @@
 <template>
   <div>
-    <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-    <el-checkbox-group class="options" v-if="groupOptions.length" v-model="checkeds" @change="optionChange">
-      <el-checkbox class="option" v-for="item in groupOptions" :label="item.id" :key="item.id">
+    <el-checkbox
+      :indeterminate="isIndeterminate"
+      v-model="checkAll"
+      @change="handleCheckAllChange"
+      >全选</el-checkbox
+    >
+    <el-checkbox-group
+      class="options"
+      v-if="groupOptions.length"
+      v-model="checkeds"
+      @change="optionChange"
+    >
+      <el-checkbox
+        class="option"
+        v-for="item in groupOptions"
+        :label="item.id"
+        :key="item.id"
+      >
         <strong>
-          <span>{{item.name}}</span>
-          <span>{{item.price | moneyFormat}}元</span>
+          <span>{{ item.name }}</span>
+          <span>{{ item.price | moneyFormat }}元</span>
         </strong>
-        <p v-for="sub in item.subs" :key="sub">{{sub}}</p>
+        <p v-for="sub in item.subs" :key="sub">{{ sub }}</p>
       </el-checkbox>
     </el-checkbox-group>
-    <el-checkbox-group class="options" v-else v-model="checkeds" @change="optionChange">
-      <el-checkbox class="option" v-for="item in list" :label="item.id" :key="item.id">
+    <el-checkbox-group
+      class="options"
+      v-else
+      v-model="checkeds"
+      @change="optionChange"
+    >
+      <el-checkbox
+        class="option"
+        v-for="item in list"
+        :label="item.id"
+        :key="item.id"
+      >
         <strong>
-          <span>{{item.name}}</span>
-          <span v-if="item.groupPurchasePrice > 0">{{item.groupPurchasePrice | moneyFormat}} 元</span>
+          <span>{{ item.name }}</span>
+          <span v-if="item.groupPurchasePrice > 0"
+            >{{ item.groupPurchasePrice | moneyFormat }} 元</span
+          >
           <span v-else>免费</span>
         </strong>
       </el-checkbox>
@@ -22,119 +49,127 @@
   </div>
 </template>
 <script>
-  export default {
-    props: ['list', 'groupList'],
-    data() {
-      return {
-        type: 'list',
-        checkAll: false,
-        checkeds: [],
-        accessoriesByid: {},
-        groupListById: {},
-        selectMoney: 0,
-        isIndeterminate: false
-      };
-    },
-    watch: {
-      checkeds(vals) {
-        const optionsById = this.type === 'list' ? this.accessoriesByid : this.groupListById
-        let selectMoney = 0
-        if (this.type === 'list') {
-          for (const item of vals) {
-            const activeItem = this.accessoriesByid[item]
-            if (activeItem) {
-              selectMoney += parseFloat(activeItem.groupPurchasePrice)
-            }
+export default {
+  props: ["list", "groupList"],
+  data() {
+    return {
+      type: "list",
+      checkAll: false,
+      checkeds: [],
+      accessoriesByid: {},
+      groupListById: {},
+      selectMoney: 0,
+      isIndeterminate: false,
+    };
+  },
+  watch: {
+    checkeds(vals) {
+      const optionsById =
+        this.type === "list" ? this.accessoriesByid : this.groupListById;
+      let selectMoney = 0;
+      if (this.type === "list") {
+        for (const item of vals) {
+          const activeItem = this.accessoriesByid[item];
+          if (activeItem) {
+            selectMoney += parseFloat(activeItem.groupPurchasePrice);
           }
-        } else {
-          for (const item of vals) {
-            const activeItem = this.groupListById[item]
-            if (activeItem) {
-              selectMoney += parseFloat(activeItem.price)
-            }
+        }
+      } else {
+        for (const item of vals) {
+          const activeItem = this.groupListById[item];
+          if (activeItem) {
+            selectMoney += parseFloat(activeItem.price);
           }
         }
-        let formatids = []
-        if (this.type !== 'list') {
-          for (const item of vals) {
-            const active = this.groupListById[item]
-            if (active) {
-              const { goodsList } = this.groupListById[item]
-              formatids = formatids.concat((goodsList || []).map(goods => goods.id))
-            }
+      }
+      let formatids = [];
+      if (this.type !== "list") {
+        for (const item of vals) {
+          const active = this.groupListById[item];
+          if (active) {
+            const { goodsList } = this.groupListById[item];
+            formatids = formatids.concat(
+              (goodsList || []).map((goods) => goods.id)
+            );
           }
-        } else {
-          formatids = [...vals]
         }
-        this.$listeners.change(formatids, selectMoney)
+      } else {
+        formatids = [...vals];
       }
+      this.$listeners.change(formatids, selectMoney);
     },
-    mounted() {
+  },
+  mounted() {
+    this.init()
+  },
+  computed: {
+    groupOptions() {
+      const options = this.groupList.map((item) => ({
+        name: item.name,
+        price: item.price,
+        id: item.id,
+        subs: item.childGoodsList
+          ? item.childGoodsList.map((sub) => sub.name)
+          : [],
+      }));
+      if (options.length) {
+        this.type = "group";
+      }
+      return options;
+    },
+  },
+  methods: {
+    init() {
       this.$nextTick(() => {
-        const accessoriesByid = {}
+        const accessoriesByid = {};
         for (const item of this.list) {
-          accessoriesByid[item.id] = item
+          accessoriesByid[item.id] = item;
         }
-        const groupListById = {}
+        const groupListById = {};
         for (const item of this.groupList) {
-          groupListById[item.id] = item
+          groupListById[item.id] = item;
         }
-        this.accessoriesByid = accessoriesByid
-        this.groupListById = groupListById
-      })
+        this.accessoriesByid = accessoriesByid;
+        this.groupListById = groupListById;
+      });
     },
-    computed: {
-      groupOptions() {
-        const options = this.groupList.map(item => ({
-          name: item.name,
-          price:item.price,
-          id: item.id,
-          subs: item.childGoodsList ? item.childGoodsList.map(sub => sub.name) : []
-        }))
-        if (options.length) {
-          this.type = 'group'
-        }
-        return options
-      }
+    handleCheckAllChange(val) {
+      const options = this.type === "list" ? this.list : this.groupOptions;
+      const allids = options.map((item) => item.id);
+      this.checkeds = val ? allids : [];
+      this.isIndeterminate = false;
     },
-    methods: {
-      handleCheckAllChange(val) {
-        const options = this.type === 'list' ? this.list : this.groupOptions
-        const allids = options.map(item => item.id)
-        this.checkeds = val ? allids : [];
-        this.isIndeterminate = false;
-      },
-      optionChange(value) {
-        const options = this.type === 'list' ? this.list : this.groupOptions
-        const checkedCount = value.length;
-        this.checkAll = checkedCount === options.length;
-        this.isIndeterminate = checkedCount > 0 && checkedCount < options.length;
-      }
-    }
-  };
+    optionChange(value) {
+      const options = this.type === "list" ? this.list : this.groupOptions;
+      const checkedCount = value.length;
+      this.checkAll = checkedCount === options.length;
+      this.isIndeterminate = checkedCount > 0 && checkedCount < options.length;
+    },
+  },
+};
 </script>
 <style lang="less" scoped>
-  .options {
-    display: block;
-    .option{
-      display: flex;
-      width: 100%;
-      margin-top: 10px;
-      /deep/ .el-checkbox__label{
-        flex: 1;
-        >strong{
-          display: flex;
-          justify-content: space-between;
-          align-items: center;
-          >span:last-child{
-            color: red;
-          }
-        }
-        >p{
-          line-height: 1.8;
-          color: #606266;
+.options {
+  display: block;
+  .option {
+    display: flex;
+    width: 100%;
+    margin-top: 10px;
+    /deep/ .el-checkbox__label {
+      flex: 1;
+      > strong {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        > span:last-child {
+          color: red;
         }
       }
+      > p {
+        line-height: 1.8;
+        color: #606266;
+      }
     }
   }
+}
 </style>

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

@@ -94,19 +94,23 @@
           kitGroupPurchaseTypeFormater[changeInfo.kitGroupPurchaseType]
         }}</span>
       </el-form-item>
-      <template >
+      <template>
         <el-form-item
-          v-show="(courseViewType == 2 && form.musicalGoods == 'OWNED') || courseViewType != 2"
+          v-show="
+            (courseViewType == 2 && form.musicalGoods == 'OWNED') ||
+            courseViewType != 2
+          "
           v-if="activeAccessories.length || groupList.length || changeInfo"
           label="更换教辅"
           class="is-required"
         >
           <accessories
+          ref='accessories'
             :list.sync="activeAccessories"
             :groupList.sync="groupList"
             @change="accessoriesChange"
             v-if="!changeInfo"
-          />
+          /> 
           <span v-else-if="changeInfo">{{ changeAccessoriesGoods }}</span>
           <!-- <el-select style="width: 100%" v-model="form.accessories" clearable placeholder="请选择教辅">
             <el-option
@@ -323,7 +327,6 @@ export default {
   watch: {
     detail() {
       if (this.detail) {
-
         this.fetchDetail();
       }
     },
@@ -410,7 +413,7 @@ export default {
     },
   },
   mounted() {
-    if (this.detail && (this.detail.userId)) {
+    if (this.detail && this.detail.userId) {
       this.fetchDetail();
     }
   },
@@ -454,13 +457,16 @@ export default {
       this.$set(this.form, "musicalGoods", "");
       let data = null;
       if (id) {
-        await getSubjectGoodsAndInfo({
-          musicGroupId: this.musicGroupId,
-          subjectId: id,
-        }).then((res) => {
+        try {
+          const res = await getSubjectGoodsAndInfo({
+            musicGroupId: this.musicGroupId,
+            subjectId: id,
+          });
           data = res.data;
           this.musicGroupSubjectPlanFee = res.data.musicGroupSubjectPlan.fee;
-        });
+        } catch (e) {
+          console.log(e);
+        }
       } else {
         this.musicGroupSubjectPlanFee = 0;
       }
@@ -474,11 +480,17 @@ export default {
       this.musicalGoodsChange();
     },
     musicalGoodsChange(val) {
-      this.$refs["form"].clearValidate()
-      if(val != 'OWNED') {
-        this.selectAccessories = []
-        this.selectAccessoriesMoney = 0
+      this.$refs["form"].clearValidate();
+      this.accessoriesChange([],0)
+      console.log(this.$refs.accessories)
+      if(this.$refs.accessories){
+       this.$refs.accessories.checkeds = []
+       this.$refs.accessories.isIndeterminate = false;
       }
+      // if (val != "OWNED") {
+        // this.selectAccessories = [];
+        // this.selectAccessoriesMoney = 0;
+      // }
       const item = this.musicalGoodsById[val];
       if (item) {
         this.musicalPrice = this.numFormat(
@@ -495,6 +507,7 @@ export default {
         this.coursePurchaseTypeJsonTypePrice = 0;
         this.$set(this.form, "type", "");
       }
+      this.$forceUpdate()
     },
     accessoriesChange(ids, money) {
       this.selectAccessories = ids;
@@ -523,18 +536,23 @@ export default {
     },
     submit() {
       this.$refs["form"].validate((valid) => {
-        this.detail.subjectId
+        this.detail.subjectId;
         if (valid) {
-          if(this.courseViewType == 2 && this.form.musicalGoods == 'OWNED' && this.selectAccessories && this.selectAccessories.length <= 0) {
-            this.$message.error('请至少选择一个教辅')
-            return
+          if (
+            this.courseViewType == 2 &&
+            this.form.musicalGoods == "OWNED" &&
+            this.selectAccessories &&
+            this.selectAccessories.length <= 0
+          ) {
+            this.$message.error("请至少选择一个教辅");
+            return;
           }
           subjectChangeAdd({
             changeCourseFee: this.numFormat(
               this.musicGroupSubjectPlanFee -
                 this.coursePurchaseTypeJsonTypePrice
             ),
-            changeAccessories: this.selectAccessories.join(",")||null,
+            changeAccessories: this.selectAccessories.join(",") || null,
             changeAccessoriesPrice: this.numFormat(this.selectAccessoriesMoney),
             changeMusicalPrice: this.numFormat(this.musicalPrice),
             originalCourseFee: this.originalCourseFee,