no message

src/components/orderCommon/order-form2.vue

@@ -68,7 +68,7 @@
         <input type="button" class="normalBtn" :value="$t('salesModule.SignImdi')" @click="submitForm('addMsg')" />
       </span>
     </p>
-    <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="90px">
+    <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="110px">
       <el-row :gutter="20">
         <el-col :span="4">
           <!-- 客户类型 -->
@@ -982,7 +982,7 @@
         let obj = this.customerList.find(x=>{
           return x.customerId==this.addMsg.CustomerId
         })
-        if(this.addMsg.GroupType!=2) {
+        if(this.addMsg.GroupType!=1&&this.addMsg.GroupType!=2) {
           this.couponList = []
           this.DiscountAmountId = null
           this.DiscountAmountObj = {}
@@ -2094,7 +2094,7 @@
           if (this.pagesTitle == "跟团游产品") {
             url = "sellorder_post_SetOrderInfo_02";
             // 优惠券计算
-            if(this.addMsg.GroupType==2&&this.DiscountAmountId){
+            if((this.addMsg.GroupType==1||this.addMsg.GroupType==2)&&this.DiscountAmountId){
               this.addMsg.CouponAllotIds = this.DiscountAmountId
               // this.addMsg.PreferPrice = this.CalculationPreference()
             }else{
@@ -2148,19 +2148,28 @@
           ChirdNum +
           Number(this.addMsg.OldPeopleNum)
         // couponsType 优惠券类型 1：抵用券，2：折扣卷
-        if(DiscountNumber>0&&this.addMsg.GroupType==2&&this.DiscountAmountId){
+        if(DiscountNumber>0&&this.DiscountAmountId&&(this.addMsg.GroupType==1||this.addMsg.GroupType==2)){
           if(this.DiscountAmountObj&&this.DiscountAmountObj.couponsType==1){
-            if(DiscountNumber==this.DiscountAmountObj.expansionModel.orderGuestNum){
-              PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.expansionModel.denomination
+            if(this.addMsg.GroupType==2){
+              if(DiscountNumber==this.DiscountAmountObj.expansionModel.orderGuestNum){
+                PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.expansionModel.denomination
+              }else{
+                PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.denomination
+              }
             }else{
               PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.denomination
             }
+
           }else if(this.DiscountAmountObj&&this.DiscountAmountObj.couponsType==2){
-            if(DiscountNumber==this.DiscountAmountObj.expansionModel.orderGuestNum){
-              PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.expansionModel.denomination
+            if(this.addMsg.GroupType==2){
+              if(DiscountNumber==this.DiscountAmountObj.expansionModel.orderGuestNum){
+                PreferPrice = this.addMsg.PreferPrice-this.DiscountAmountObj.expansionModel.denomination
+              }else{
+                PreferPrice = this.addMsg.PreferPrice*(this.DiscountAmountObj.denomination/100)
+              }
             }else{
               PreferPrice = this.addMsg.PreferPrice*(this.DiscountAmountObj.denomination/100)
-              }
+            }
           }
           return PreferPrice
         }else {
@@ -2486,7 +2495,7 @@
             this.getUserCouponList()
           }
         }
-      }
+      },
     },
   };