Merge branch '08/24teamQuest' into jenkins

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

@@ -397,16 +397,16 @@ export default {
     },
     editSpread() {
       const data = this.changeInfo || {};
+      // 更换进行中
       const payed =
         (data.originalAccessoriesPrice || 0) +
-        (data.originalCourseFee || 0) +
+        (this.originalCourseFee || 0) +
         (data.originalMusicalPrice || 0);
-
-      return this.changeInfo.kitGroupPurchaseType == "GROUP"
+      console.log(payed,'payed')
+      return  this.changeInfo.kitGroupPurchaseType == "GROUP"
         ? (data.changeMusicalPrice || 0) +
             (data.changeAccessoriesPrice || 0) +
             this.changeCourseFee -
-            (data.originalCourseFee || 0) -
             payed
         : (data.changeMusicalPrice || 0) +
             (data.changeAccessoriesPrice || 0) -
@@ -467,18 +467,36 @@ export default {
         const { data } = res;
         this.item = data || {};
         if (data) {
+          console.log(this.changeInfo,'changeInfo')
+          if (!this.changeInfo) {
+            this.$set(this.form, "type", this.item.kitGroupPurchaseType);
+            this.originalAccessoriesPrice = data.changeAccessoriesPrice;
+            this.originalMusicalPrice = data.changeMusicalPrice;
+            if (this.item.kitGroupPurchaseType == "GROUP") {
+              this.originalCourseFee = data.changeCourseFee; // 改为原乐器分润
+            }
+            // console.log( this.originalCourseFee,'originalCourseFee')
+            this.originalMusicalGoods =
+              data.changeMusicalGoods && data.changeMusicalGoods.name;
+            this.originalAccessoriesGoods = (data.changeAccessoriesGoods || [])
+              .map((item) => item.name)
+              .join();
+          }else {
+            //  更换过程中
           this.$set(this.form, "type", this.item.kitGroupPurchaseType);
-          this.originalAccessoriesPrice = data.changeAccessoriesPrice;
-          this.originalMusicalPrice = data.changeMusicalPrice;
-          if(this.item.kitGroupPurchaseType == 'GROUP'){
-          this.originalCourseFee = data.changeCourseFee; // 改为原乐器分润
-          }
-          // console.log( this.originalCourseFee,'originalCourseFee')
-          this.originalMusicalGoods =
-            data.changeMusicalGoods && data.changeMusicalGoods.name;
-          this.originalAccessoriesGoods = (data.changeAccessoriesGoods || [])
-            .map((item) => item.name)
-            .join();
+            this.originalAccessoriesPrice = data.originalAccessoriesPrice;
+            this.originalMusicalPrice = data.originalMusicalPrice;
+            if (this.item.originalKitGroupPurchaseType == "GROUP") {
+              this.originalCourseFee = data.originalCourseFee; // 改为原乐器分润
+            }
+            // console.log( this.originalCourseFee,'originalCourseFee')
+            this.originalMusicalGoods =
+              data.originalMusicalGoods && data.originalMusicalGoods.name;
+            this.originalAccessoriesGoods = (data.originalAccessoriesGoods || [])
+              .map((item) => item.name)
+              .join();
+        }
+
           // this.changeCourseFee = data.changeCourseFee
         }
       };
@@ -486,8 +504,9 @@ export default {
         await getChangeInfo({
           id: this.detail.subjectChange.id,
         }).then((res) => {
-          setRes(res);
           this.changeInfo = res.data;
+          setRes(res);
+
         });
       } else {
         this.changeInfo = this.detail.subjectChange;