11

src/components/SalesModule/groupTourOrderByTuan.vue

@@ -5486,13 +5486,6 @@
         this.addMsg.CommissionShareMoney = "0";
       },
       saveOrder() {
-        // 判断单团类型
-        if (this.addMsg.GroupType == 2) {
-          // if (this.addMsg.QuotationUrl == "") {
-          //   this.Error(this.$t('objFill.v101.FinancialModule.qingscfj'));
-          //   return;
-          // }
-        }
         // 选择联运，联运备注必填
         if (this.addMsg.IsIntermodal == 1 || this.addMsg.IsReturnIntermodal == 1) {
           if (!this.addMsg.UnionRemark) {

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -1252,7 +1252,7 @@
                                     </template>
                                   </table>
                                   <font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
-                                    {{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
+                                    {{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}</font>
                                 </el-popover>
                               </template>
                             </td>

src/components/TravelManager/TravelList/TravelControlListSale.vue

@@ -858,7 +858,7 @@
                                     </template>
                                   </table>
                                   <font style="color:red;font-weight:bold;cursor:pointer;" slot="reference">
-                                    {{subItem.ChangeNum>0?'+':'-'}}{{subItem.ChangeNum}}</font>
+                                    {{subItem.ChangeNum>0?'+':''}}{{subItem.ChangeNum}}</font>
                                 </el-popover>
                               </template>
                             </td>

src/components/orderCommon/order-form2.vue

@@ -1167,8 +1167,6 @@
         })
         this.getTotalPrice();
         this.getTicheng();
-        console.log("this.ScenicList", this.addMsg.ScenicList);
-
       },
       // 获取已选优惠券
       getDiscountAmount() {
@@ -1302,7 +1300,6 @@
           this.addMsg.ManNum = 0;
           this.addMsg.BabyNum = 0;
           this.addMsg.OldPeopleNum = 0;
-
           this.addMsg.PreferPrice = 0;
           this.addMsg.LessPrice = 0;
           this.addMsg.LessAvgPrice = 0;
@@ -1316,7 +1313,6 @@
           this.addMsg.ManNum = 0;
           this.addMsg.BabyNum = 0;
           this.addMsg.OldPeopleNum = 0;
-
           this.addMsg.PreferPrice = 0;
           this.addMsg.LessPrice = 0;
           this.addMsg.LessAvgPrice = 0;
@@ -1911,7 +1907,6 @@
             Number(this.addMsg.ChirdNoNeedBedNum) :
             0;
         }
-        // this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) +Number(this.addMsg.ChirdNeedBedNum) -Number(etbzc) +Number(this.addMsg.OldPeopleNum)) -Number(this.addMsg.TripleRoomNum) * 3 -Number(this.addMsg.SingleRoomNum)) /2 +Number(this.addMsg.SingleRoomNum) +Number(this.addMsg.TripleRoomNum);
         this.addMsg.PredictRoomNum = (Number(this.addMsg.AirticketNum) + (Number(this.addMsg.ManNum) + Number(this
           .addMsg.ChirdNeedBedNum) - Number(etbzc) + Number(this.addMsg.OldPeopleNum)) - Number(this.addMsg
           .TripleRoomNum) * 3 - Number(this.addMsg.SingleRoomNum)) / 2 + Number(this.addMsg.SingleRoomNum) + Number(
@@ -2053,8 +2048,7 @@
             }
           });
         }
-        // var refundScenicPrice = this.ScenicRefundMoney * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
-        //   Number(this.addMsg.OldPeopleNum));
+ 
         //单地接
         let dandijie = 0;
         if (this.addMsg.GroupType == 4) {
@@ -2081,8 +2075,17 @@
         this.addMsg.PreferPrice = Number(dandijie) + Number(lianyun) + Number(chengren) + Number(ertong) + Number(
           yinger) + Number(laoren) + Number(zafeiqianzhen) + Number(danfang) + Number(ertongbed) - Number(
           refundScenicPrice)
-        console.log(dandijie + '--', lianyun + '--', chengren + '--', ertong + '--', yinger + '--', laoren + '--',
-          zafeiqianzhen + '--', danfang + '--', ertongbed + '--', refundScenicPrice)
+        var logStr = "单地接:" + dandijie;
+        logStr += ",联运:" + lianyun;
+        logStr += ",成人:" + chengren;
+        logStr += ",儿童:" + ertong;
+        logStr += ",婴儿:" + yinger;
+        logStr += ",老人:" + laoren;
+        logStr += ",杂费签证:" + zafeiqianzhen;
+        logStr += ",单房:" + danfang;
+        logStr += ",儿童不占床:" + ertongbed;
+        logStr += ",退景点:" + refundScenicPrice;
+        console.log(logStr);
         if (this.priceObj.IsLessPrice == 1 && this.addMsg.GroupType == 1 && (this.addMsg.CustomerType == '1' || this
             .addMsg.CustomerType == '2') && this.priceObj.LineID > 0 && this.LessRule && this.LessRule.length > 0) {
           let LessNum = (Number(this.addMsg.ManNum) +