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

src/components/sale/editOrder-form.vue

@@ -301,6 +301,7 @@
               this.OrderMsg.OrderNature = tempData.OrderNature;
               this.OrderMsg.OldPreferPrice = tempData.OldPreferPrice;
               this.OrderMsg.CourseId = tempData.CourseId;
+
               this.OrderMsg.StartClassHours = tempData.StartClassHours;
               this.OrderMsg.IsChaBan = tempData.IsChaBan;
               this.OrderMsg.EffectTime = tempData.EffectTime;
@@ -401,6 +402,7 @@
         //计算应收价格
         if (this.OrderMsg.IsChaBan == 1) {
           var newPreferPrice = 0;
+
           if (this.courseObj && this.courseObj.CourseId && this.courseObj.CourseId > 0) {
             newPreferPrice = (this.UnitPrice / this.courseObj.ClassHours) * (this.courseObj.ClassHours - this
               .OrderMsg.StartClassHours) * guestNum
@@ -425,6 +427,11 @@
         //计算应收价格
         if (this.OrderMsg.IsChaBan == 1) {
           if (this.modityOrderType == 1 || this.modityOrderType == 2) {
+            if (!this.courseObj || (this.courseObj && !this.courseObj.ClassHours)) {
+              if (this.OrderMsg && this.OrderMsg.CourseId) {
+                this.courseObj = this.CourseList.find(x => x.CourseId == this.OrderMsg.CourseId);
+              }
+            }
             var newPreferPrice = (this.UnitPrice / this.courseObj.ClassHours) * (this.courseObj.ClassHours -
               this.OrderMsg.StartClassHours) * this.OrderMsg.GuestNum - this.OrderMsg.LessPrice;
             this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2);