1

src/components/school/student/transfer-order/order-form.vue

@@ -870,7 +870,12 @@ export default {
         if (item.ClassHours) {
           dataObj.TotalClassHours = item.ClassHours;
         }
-       
+        if (item.CoursewareFee) {
+          dataObj.CoursewareFee = item.CoursewareFee;
+        }
+        if (item.TextbookFee) {
+          dataObj.TextbookFee = item.TextbookFee;
+        }
         if (item.SourceId) {
           dataObj.SourceId = item.SourceId;
         }
@@ -1008,9 +1013,7 @@ export default {
       let temp = this.CourseList.find(
         x => x.CourseId == this.OrderMsg.CourseId
       );
-      console.log("我是计算价格",temp);
       if (temp) {
-        console.log("我是计算价格111",temp);
         this.courseObj = temp;
         var tempDiscountMoney = 0; //优惠金额
         // var tempSaleRemark = `直客首次报名优惠比例${temp.B2CRatio ?? 0}%`; //备注
@@ -1066,7 +1069,6 @@ export default {
         // }
         // this.OrderMsg.SaleRemark = tempSaleRemark;
       } else {
-        console.log("我是计算价格2222",temp);
         if (this.saveObj.ClassId) {
           this.OrderMsg.ClassId = this.saveObj.ClassId;
         }
@@ -1107,18 +1109,17 @@ export default {
             newPreferPrice =  chaBanPrice * guestNum*this.OrderMsg.TotalClassHours
           }
         }
-       console.log("我进来了...",this.OrderMsg);
         this.OrderMsg.PreferPrice =
           Number(newPreferPrice).toFixed(2) - this.OrderMsg.LessPrice;
       } else {
 
         if(this.OrderMsg.Unit_PriceType==1){
           this.OrderMsg.PreferPrice =
-          Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice;
+          Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice ;
           }
           else if(this.OrderMsg.Unit_PriceType==2){
             this.OrderMsg.PreferPrice =
-          Number((guestNum * unit_price*this.OrderMsg.TotalClassHours)+Number(this.OrderMsg.TextbookFee)).toFixed(2) - this.OrderMsg.LessPrice;
+          Number((guestNum * unit_price*this.OrderMsg.TotalClassHours)+Number(this.OrderMsg.TextbookFee)+Number(this.OrderMsg.CoursewareFee)).toFixed(2) - this.OrderMsg.LessPrice;
           }
       }
       //留学就业订单
@@ -1173,6 +1174,7 @@ export default {
       if (this.OrderMsg.OrderType == 2) {
         this.OrderMsg.OrderNature = 1;
       }
+      console.log("saveObj",this.saveObj);
       if (this.saveObj) {
         if (this.saveObj.ClassId) {
           this.OrderMsg.ClassId = this.saveObj.ClassId;
@@ -1191,10 +1193,13 @@ export default {
         if (this.saveObj.ClassHours) {
           this.OrderMsg.TotalClassHours = this.saveObj.ClassHours;
         }
-       console.log("this.OrderMsg.TotalClassHours",this.OrderMsg.TotalClassHours);
-       console.log("this.OrderMsg.Unit_Price",this.OrderMsg.Unit_Price);
-       console.log("this.OrderMsg.GuestNum",this.OrderMsg.GuestNum);
-       
+     
+        if (this.saveObj.TextbookFee) {
+          this.OrderMsg.TextbookFee = this.saveObj.TextbookFee;
+        }
+        if (this.saveObj.CoursewareFee) {
+          this.OrderMsg.CoursewareFee = this.saveObj.CoursewareFee;
+        }
         if (this.saveObj.CourseId) {
           this.OrderMsg.CourseId = this.saveObj.CourseId;
         } else {