Merge branch 'change-voice' into online

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

@@ -47,6 +47,10 @@
           placeholder="请选择乐器"
         >
           <el-option
+            label="自备乐器"
+            value="OWNED">
+          </el-option>
+          <el-option
             v-for="item in musicalGoods"
             :key="item.goodsIdList"
             :label="item.name"
@@ -177,10 +181,6 @@ const formatAllGoods = (data, kitGroupPurchaseType) => {
           try {
             json = JSON.parse(item.kitGroupPurchaseTypeJson)
           } catch (error) {}
-          json = {
-            ...json,
-            OWN: 0
-          }
           try {
             courseJson = JSON.parse(item.coursePurchaseTypeJson)
           } catch (error) {}
@@ -452,6 +452,27 @@ export default {
     submit() {
       this.$refs['form'].validate((valid) => {
         if (valid) {
+          console.log({
+            changeCourseFee: this.numFormat(this.musicGroupSubjectPlanFee - this.coursePurchaseTypeJsonTypePrice),
+            changeAccessories: this.selectAccessories.join(','),
+            changeAccessoriesPrice: this.numFormat(this.selectAccessoriesMoney),
+            changeMusicalPrice: this.numFormat(this.musicalPrice),
+            originalCourseFee: this.originalCourseFee,
+            originalMusicalPrice: this.originalMusicalPrice,
+            originalMusical: this.item.originalMusical,
+            originalAccessories: this.item.originalAccessories,
+            originalAccessoriesPrice: this.originalAccessoriesPrice,
+            cooperationOrganId: this.item.cooperationOrganId,
+            kitGroupPurchaseType: (this.form.musicalGoods === 'OWNED' ? this.form.musicalGoods : this.form.type),
+            musicGroupId: this.musicGroupId,
+            studentId: this.detail.studentId,
+            changeMusical: this.form.musicalGoods,
+            originalCost: this.item.originalCost,
+            organId: this.item.organId,
+            originalSubjectId: this.detail.actualSubjectId,
+            changeSubjectId: this.form.subjectId,
+          })
+          return
           subjectChangeAdd({
             changeCourseFee: this.numFormat(this.musicGroupSubjectPlanFee - this.coursePurchaseTypeJsonTypePrice),
             changeAccessories: this.selectAccessories.join(','),
@@ -463,7 +484,7 @@ export default {
             originalAccessories: this.item.originalAccessories,
             originalAccessoriesPrice: this.originalAccessoriesPrice,
             cooperationOrganId: this.item.cooperationOrganId,
-            kitGroupPurchaseType: this.form.type,
+            kitGroupPurchaseType: (this.form.musicalGoods === 'OWNDE' ? this.form.musicalGoods : this.form.type),
             musicGroupId: this.musicGroupId,
             studentId: this.detail.studentId,
             changeMusical: this.form.musicalGoods,