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

src/components/SalesModule/addPassenger.vue

@@ -141,7 +141,11 @@
       <div class="contForm">
         <el-form :model="addMsg" ref="addMsg" label-position="right" :rules="rules" label-width="100px">
           <li>
-            <el-form-item label="身份证号码" prop="IdCard">
+            <el-form-item label="身份证号码" prop="IdCard" v-if="LineId === 14 || LineId === 2">
+              <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
+              </el-input>
+            </el-form-item>
+            <el-form-item label="身份证号码" v-else>
               <el-input v-model="addMsg.IdCard" type="text" size=mini class="w230" maxlength="50" placeholder="请填写" @blur.prevent="authentication()">
               </el-input>
             </el-form-item>
@@ -661,6 +665,11 @@
         },
         EconomicCapabilityS: [],
         rules: {
+          IdCard: [{
+            required: true,
+            message: "请填身份证号码",
+            trigger: "blur"
+          }],
           SurName: [{
             required: true,
             message: "请填写中文姓",
@@ -770,6 +779,7 @@
         btnState: true,
         roomlist:[],
         isOneDay: 0,
+        LineId: 0,
       };
     },
     methods: {
@@ -1512,6 +1522,9 @@
         }
       },
       savePassenger(type) {
+        if ((this.LineId === 14 || LineId === 2) && (this.addMsg.IdCard === '' || this.addMsg.IdCard.length < 18)) {
+          this.$message.error('请填写身份证号码！'); 
+        }
         this.addMsg.EconomicCapabilityList = [];
         this.EconomicCapabilityS.forEach(x => {
           if (x.isShow == true) {
@@ -1981,6 +1994,7 @@
       this.GetGuestMustVisaAir();
       this.getAccessToken();
       this.isOneDay = this.$route.query.isOneDay;
+      this.LineId = this.$route.query.LineId;
       this.addMsg.TCID = this.$route.query.TCID;
       this.addMsg.OrderId = this.$route.query.orderId;
       let userInfo = this.getLocalStorage();

src/components/SalesModule/groupTourOrder.vue

@@ -2082,7 +2082,8 @@
           QStartDate: '',
           QEndDate: '',
           PayStatus: '-1',
-          IsAirTicket: '2'
+          IsAirTicket: '2',
+          IsOneDay: 0,
         },
         checkedObj: {},
         //返回数据
@@ -2365,7 +2366,7 @@
       },
       // 获取统计数据
       getCount: function () {
-        this.apipost('sellorder_get_GetTravelOrderListStatistics', this.msg, res => {
+        this.apipost('sellorder_get_GetTravelOrderListStatistics_V2', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.countData = res.data.data
           } else {

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -3078,8 +3078,8 @@
               this.addMsg.IsIntermodal = x.IsIntermodal?x.IsIntermodal.toString():2;
               this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
               this.addMsg.ChirdNum = x.ChirdNum.toString();
-              this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
-              this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
+              this.addMsg.ChirdNeedBedNum = 0;
+              this.addMsg.ChirdNoNeedBedNum = 0;
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum=x.RefuseVisaNum.toString();
               this.addMsg.OrderForm = x.OrderForm
@@ -3216,8 +3216,8 @@
               this.addMsg.IsIntermodal = x.IsIntermodal.toString();
               this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
               this.addMsg.ChirdNum = x.ChirdNum.toString();
-              this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString();
-              this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString();
+              this.addMsg.ChirdNeedBedNum = 0;
+              this.addMsg.ChirdNoNeedBedNum = 0;
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.IsChildrenTour = x.IsChildrenTour;
               this.IsBirdDiscount = x.IsBirdDiscount;
@@ -3451,7 +3451,7 @@
               (Number(this.addMsg.Unit_Price) -
                 this.addObj.DiscountPrice +
                 this.addObj.BabyChargePrice);
-            let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice;
+            let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price);
             let laoren =
               Number(this.addMsg.OldPeopleNum) *
               (Number(this.addMsg.Unit_Price) -
@@ -3516,7 +3516,7 @@
             let ertong =
               Number(this.addMsg.ChirdNum) *
               (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice);
-            let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice;
+            let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price);
             let laoren =
               Number(this.addMsg.OldPeopleNum) *
               (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice);
@@ -3830,7 +3830,7 @@
         this.addMsg.IsChildrenTour = this.IsChildrenTour;
         this.addMsg.IsBirdDiscount = this.addObj.IsBirdDiscount;
         this.apipost(
-          "sellorder_post_SetOrderInfo_02",
+          "sellorder_post_SetOneDayOrderInfo",
           this.addMsg,
           res => {
             if (res.data.resultCode == 1) {

src/components/SalesModule/groupTourOrderOne.vue

@@ -2072,7 +2072,8 @@
           QStartDate: '',
           QEndDate: '',
           PayStatus: '-1',
-          IsAirTicket: '2'
+          IsAirTicket: '2',
+          IsOneDay: 1,
         },
         checkedObj: {},
         //返回数据
@@ -2355,7 +2356,7 @@
       },
       // 获取统计数据
       getCount: function () {
-        this.apipost('sellorder_get_GetTravelOrderListStatistics', this.msg, res => {
+        this.apipost('sellorder_get_GetTravelOrderListStatistics_V2', this.msg, res => {
           if (res.data.resultCode == 1) {
             this.countData = res.data.data
           } else {
@@ -2727,8 +2728,8 @@
               this.addMsg.IsIntermodal = x.IsIntermodal.toString()
               this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString()
               this.addMsg.ChirdNum = x.ChirdNum.toString()
-              this.addMsg.ChirdNeedBedNum = x.ChirdNeedBedNum.toString()
-              this.addMsg.ChirdNoNeedBedNum = (x.ChirdNum - x.ChirdNeedBedNum).toString()
+              this.addMsg.ChirdNeedBedNum = 0
+              this.addMsg.ChirdNoNeedBedNum = 0
               this.addMsg.BabyNum = x.BabyNum.toString();
               this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
               this.addMsg.OrderForm = x.OrderForm
@@ -3060,7 +3061,7 @@
             (Number(this.addMsg.Unit_Price) -
               this.addObj.DiscountPrice +
               this.addObj.BabyChargePrice)
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren =
             Number(this.addMsg.OldPeopleNum) *
             (Number(this.addMsg.Unit_Price) -
@@ -3123,7 +3124,7 @@
           let ertong =
             Number(this.addMsg.ChirdNum) *
             (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice)
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren =
             Number(this.addMsg.OldPeopleNum) *
             (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice)

src/components/SalesModule/passengerSaleList.vue

@@ -89,6 +89,7 @@
         isOrder: 0,
         tableList: [],
         isOneDay: 0,
+        LineId: 0,
       };
     },
     methods: {
@@ -101,6 +102,7 @@
             this.guestNum = res.data.data.GuestNum;
             this.tableList = res.data.data.list;
             this.isOneDay = res.data.data.IsOneDay;
+            this.LineId = res.data.data.LineId;
           } else {
             this.$message.error(res.data.message)
           }
@@ -132,7 +134,8 @@
             "TCID": this.msg.tcid,
             "orderId": this.msg.id,
             'guestId': guestId,
-            'isOneDay': this.isOneDay
+            'isOneDay': this.isOneDay,
+            'LineId': this.LineId,
           }
         });
       },

src/components/SalesModule/productQueryOne.vue

@@ -1263,10 +1263,10 @@
           }
           if (text === '婴儿人数') {
             if (this.remarkMsg.ye === '') {
-              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + this.addObj.BabyPrice + '/人;';
+              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + Number(this.addMsg.Unit_Price) + '/人;';
             } else {
               this.remarkMsg.ye = '';
-              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + this.addObj.BabyPrice + '/人;';
+              this.remarkMsg.ye = '婴儿人数:' + this.addMsg[key] + ';' + '婴儿价格:' + Number(this.addMsg.Unit_Price) + '/人;';
             }
           }
           if (text === '单地接数量') {
@@ -1650,7 +1650,7 @@
           let ertong = Number(this.addMsg.ChirdNum) * (Number(this.addMsg.Unit_Price) - this.addObj.DiscountPrice +
               this.addObj.BabyChargePrice)
 
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren = Number(this.addMsg.OldPeopleNum) * (Number(this.addMsg.Unit_Price) - this.addObj.DiscountPrice +
               this.addObj.OldManChargePrice)
           let zafeiqianzhen = this.addObj.OtherPrice * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
@@ -1675,7 +1675,7 @@
         } else {
           let chengren = Number(this.addMsg.ManNum) * (Number(this.addMsg.Unit_Price))
           let ertong = Number(this.addMsg.ChirdNum) * (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice)
-          let yinger = Number(this.addMsg.BabyNum) * this.addObj.BabyPrice
+          let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price)
           let laoren = Number(this.addMsg.OldPeopleNum) * (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice)
           let zafeiqianzhen = this.addObj.OtherPrice * (Number(this.addMsg.ManNum) + Number(this.addMsg.ChirdNum) +
               Number(this.addMsg.OldPeopleNum)) + this.addObj.VisaPrice * (Number(this.addMsg.AirticketNum) + Number(