Merge branch 'master' of http://gitlab.oytour.com/luochao/confucius

src/components/sale/editOrder-form.vue

@@ -278,11 +278,10 @@
           guestNum = Number(this.OrderMsg.GuestNum);
         }
         let temp = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
-        console.log('temp', temp)
         if (temp) {
           this.courseObj = temp;
           var tempDiscountMoney = 0; //优惠金额
-          var tempSaleRemark = `直客首次报名优惠比例${ temp.B2CRatio??0 }%`; //备注
+          // var tempSaleRemark = `直客首次报名优惠比例${ temp.B2CRatio??0 }%`; //备注
           //插班课时单价
           var classHourPrice = temp.SellPrice / this.courseObj.ClassHours;
           var chaBanPrice = Number(classHourPrice * (this.courseObj.ClassHours - this.OrderMsg.StartClassHours))
@@ -329,7 +328,7 @@
             this.OrderMsg.Unit_Price = temp.SellPrice;
             this.UnitPrice = temp.SellPrice;
           }
-          this.OrderMsg.SaleRemark = tempSaleRemark;
+          // this.OrderMsg.SaleRemark = tempSaleRemark;
         } else {
           if (this.saveObj.ClassId) {
             this.OrderMsg.ClassId = this.saveObj.ClassId;
@@ -415,7 +414,6 @@
             }
           })
         } else {
-          this.OrderMsg.SaleRemark = ''; //清空备注
           this.OrderMsg.HelpEnterId = 0;
           this.OrderMsg.GeneralOccupation = '';
           this.OrderMsg.EduOccupation = '';
@@ -460,15 +458,16 @@
               this.OrderMsg.CourseId = '';
             }
             if(this.saveObj.B2CRatio){
+
               this.OrderMsg.B2CRatio = this.saveObj.B2CRatio>1?this.saveObj.B2CRatio/100:this.saveObj.B2CRatio;
             }
             if(this.saveObj.B2CReNewRatio){
               this.OrderMsg.B2CReNewRatio = this.saveObj.B2CReNewRatio>1?this.saveObj.B2CReNewRatio/100:this.saveObj.B2CReNewRatio;
             }
+            this.OrderMsg.SaleRemark = `直客首次报名优惠比例${this.saveObj.B2CRatio }%`; //备注
           }
           this.IsShowEditOrder = true;
           this.calcPrice();
-          console.log("this.saveObj",this.saveObj)
         }
       },
       //筛选员工

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

@@ -435,7 +435,6 @@ export default {
     };
   },
   created() {
-    this.OrderMsg.IsChaBan = this.isChaBan;
     //HK2021-08-06新增
 
     if (this.saveObj && this.saveObj.CourseId) {
@@ -615,7 +614,8 @@ export default {
       this.OrderMsg.OrderNature = 0;
       this.OrderMsg.OldPreferPrice = 0;
       this.OrderMsg.StartClassHours = 0;
-      this.OrderMsg.IsChaBan = this.isChaBan;
+      this.OrderMsg.IsChaBan = 0
+      ;
       this.OrderMsg.EffectTime = "";
       this.OrderMsg.UpOrderId = 0;
       this.OrderMsg.JoinType = 1;