1

src/components/sale/editOrder-form.vue

@@ -71,20 +71,20 @@
         <!-- <q-input filled stack-label :dense="false" v-model="OrderMsg.PerDiscountMoney" :disable="true"
           class="col-12 q-pb-lg" label="优惠金额(每人)" :hint="'总优惠金额：'+(OrderMsg.PerDiscountMoney*OrderMsg.GuestNum)" /> -->
 
-        <q-input filled stack-label :dense="false" :value="OrderMsg.Class_Price*OrderMsg.GuestNum*OrderMsg.B2CRatio" :disable="true"
+        <q-input filled stack-label :dense="false" v-model="OrderMsg.DiscountMoney" disable
           class="col-12 q-pb-lg" label="优惠金额"  />
 
         <template v-if="modityOrderType==3">
           <q-input filled stack-label :dense="false" v-model="OrderMsg.Unit_Price" @input="calcPrice()" class="col-12"
             label="成交单价" :rules="[val => !!val || '请填成交单价']" />
         </template>
-        <!-- <q-input filled stack-label :disable="modityOrderType!=3" :dense="false" maxlength="10"
+        <q-input filled stack-label :disable="modityOrderType!=3" :dense="false" maxlength="10"
           @keyup.native="checkPrice(OrderMsg,'PreferPrice')" v-model="OrderMsg.PreferPrice" class="col-12 q-pb-lg"
-          label="应收" /> -->
+          label="应收" />
 
-          <q-input filled stack-label :disable="modityOrderType!=3" :dense="false" maxlength="10"
+          <!-- <q-input filled stack-label :disable="modityOrderType!=3" :dense="false" maxlength="10"
           @keyup.native="checkPrice(OrderMsg,'PreferPrice')" :value="OrderMsg.Class_Price*OrderMsg.GuestNum*(1-OrderMsg.B2CRatio)" class="col-12 q-pb-lg"
-          label="应收" />
+          label="应收" /> -->
 
         <q-select :disable="modityOrderType==2" standout="bg-primary text-white" option-value="Id" option-label="Name"
           v-model="OrderMsg.OrderSource" :options="SourceEnumList" emit-value map-options class="q-pb-lg"
@@ -183,7 +183,7 @@
           B2CReNewRatio:0,
           CustomerId:0,//市场专员
           Unit_Price: 0,
-          PreferPrice: 0,
+          PreferPrice: 0,//应收
           OrderSource: 0,
           SaleRemark: "",
           Class_Price: 0, //单价
@@ -307,7 +307,9 @@
           }
           var perDiscountMoney = Number(tempDiscountMoney).toFixed(2);
           this.OrderMsg.PerDiscountMoney = perDiscountMoney;
-          this.OrderMsg.DiscountMoney = perDiscountMoney * guestNum;
+          // this.OrderMsg.DiscountMoney = perDiscountMoney * guestNum;
+          this.OrderMsg.DiscountMoney=this.OrderMsg.Class_Price*this.OrderMsg.GuestNum*this.OrderMsg.B2CRatio
+          this.OrderMsg.PreferPrice=this.OrderMsg.Class_Price*this.OrderMsg.GuestNum*(1-this.OrderMsg.B2CRatio)
           //计算每人优惠和总优惠
           if (this.OrderMsg.IsChaBan == 1) {
             this.OrderMsg.Unit_Price = chaBanPrice;
@@ -349,9 +351,9 @@
           if (this.courseObj && this.courseObj.CourseId && this.courseObj.CourseId > 0) {
             newPreferPrice = chaBanPrice * guestNum;
           }
-          this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2) - this.OrderMsg.LessPrice;
+          // this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2) - this.OrderMsg.LessPrice;
         } else {
-          this.OrderMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice;
+          // this.OrderMsg.PreferPrice = Number(guestNum * unit_price).toFixed(2) - this.OrderMsg.LessPrice;
         }
         //留学就业订单
         if (this.OrderMsg.OrderType == 2) {
@@ -544,13 +546,13 @@
             var chaBanPrice = Number(classHourPrice * (this.courseObj.ClassHours - this.OrderMsg.StartClassHours))
               .toFixed(2);
             var newPreferPrice = chaBanPrice * this.OrderMsg.GuestNum - this.OrderMsg.LessPrice;
-            this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2);
+            // this.OrderMsg.PreferPrice = Number(newPreferPrice).toFixed(2);
           }
         }
         //正常报名计算应收
         if (this.OrderMsg.IsChaBan == 0) {
           if (this.modityOrderType == 1 || this.modityOrderType == 2) {
-            this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
+            // this.OrderMsg.PreferPrice = (this.OrderMsg.GuestNum * this.OrderMsg.Unit_Price) - this.OrderMsg.LessPrice;
           }
         }
         setClassOrder(this.OrderMsg).then(res => {