no message

src/components/SalesModule/groupTourOrderByTuanOne.vue

@@ -1088,9 +1088,9 @@
             </el-form-item>
           </el-col>
           <el-col :span="4">
-            <p v-if='addObj.IsSupportChildren==2'
+            <p v-if='addObj&&addObj.IsSupportChildren==2'
               style="color: #E95252; font-size: 12px; line-height: 40px; text-align: center;">本团不支持儿童出游!</p>
-            <el-form-item v-if='addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" label="儿童人数"
+            <el-form-item v-if='addObj&&addObj.IsSupportChildren==1' v-show="addMsg.GroupType !== '4'" label="儿童人数"
               prop="ChirdNoNeedBedNum">
               <el-input v-model='addMsg.ChirdNum' :disabled="addMsg.GroupType==='4'"
                 @keyup.native="checkInteger(addMsg,'ChirdNoNeedBedNum')"
@@ -1121,8 +1121,6 @@
                 @input='yzSafeNum();getTotalPrice()'></el-input>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
           <el-col :span="4" class="Ysze">
             <el-form-item label="应收总额" prop="PreferPrice">
               <el-input v-model='addMsg.PreferPrice' :disabled="!IsUpdateOrderMoney"></el-input>
@@ -1220,11 +1218,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row>
-        <el-row :gutter="20">
-        </el-row>
-        <el-row :gutter="20">
-
           <el-col :span="4">
             <el-form-item label="所属平台" prop="BrandId" v-show="addMsg.ClientSource==1">
               <el-select v-model='addMsg.BrandId' :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
@@ -1256,6 +1249,15 @@
               </el-input>
             </el-form-item>
           </el-col>
+        </el-row>
+        <el-row :gutter="20">
+          
+        </el-row>
+        <el-row :gutter="20">
+        </el-row>
+        <el-row :gutter="20">
+
+          
           
         </el-row>
         <el-row :gutter="20" style="margin-bottom: 20px;">
@@ -2309,11 +2311,7 @@
         IsLookOrder: false, //出纳查看订单权限
         //修改订单业务员权限
         isEditOrderCreate: 0,
-        addObj: {
-          OrderId: 0,
-          OpSetLossMoney: '',
-          IsSupportChildren: 0
-        },
+        addObj: {},
         // 修改应收总额
         Ysze: false,
         addMsg_form: {},
@@ -3315,7 +3313,7 @@
               this.addMsg.TradeWay = x.TradeWay.toString();
               this.addMsg.PredictRoomNum = x.PredictRoomNum;
               this.addMsg.IsIntermodal = x.IsIntermodal ? x.IsIntermodal.toString() : 2;
-              this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal.toString();
+              this.addMsg.IsReturnIntermodal = x.IsReturnIntermodal?x.IsReturnIntermodal.toString():'';
               this.addMsg.ChirdNum = x.ChirdNum.toString();
               this.addMsg.ChirdNeedBedNum = 0;
               this.addMsg.ChirdNoNeedBedNum = 0;
@@ -3323,7 +3321,10 @@
               this.addMsg.RefuseVisaNum = x.RefuseVisaNum.toString();
               this.addMsg.OrderForm = x.OrderForm
               this.addMsg.allName = x.ContactName
-              this.IsChildrenTour = this.addObj.IsSupportChildren = x.IsChildrenTour;
+              if(x.IsChildrenTour){
+                this.IsChildrenTour = this.addObj.IsSupportChildren = x.IsChildrenTour;
+              }
+              
               this.IsBirdDiscount = x.IsBirdDiscount;
               this.OpSetLossPeople = x.OpSetLossPeople;
               this.OpSetLossMoney = x.OpSetLossMoney;
@@ -3332,16 +3333,24 @@
                 this.Unit_Price = x.Unit_Price
               } else {
                 this.HightUnitPrice = '2'
-                this.Unit_Price = this.addObj.SingleDMCPrice
+                if(this.addObj&&this.addObj.SingleDMCPrice){
+                  this.Unit_Price = this.addObj.SingleDMCPrice
+                }
               }
-              this.stratPrice = res.data.data.modelPrice.GoAddPrice;
+              if(res.data.data.modelPrice&&res.data.data.modelPrice.GoAddPrice){
+                this.stratPrice = res.data.data.modelPrice.GoAddPrice;
+              }
+              
 
               if (this.stratPrice == 0) {
                 this.stratPriceShow = false;
               } else {
                 this.stratPriceShow = true;
               }
-              this.returnPrice = res.data.data.modelPrice.BackAddPrice;
+              if(res.data.data.modelPrice&&res.data.data.modelPrice.BackAddPrice){
+                this.returnPrice = res.data.data.modelPrice.BackAddPrice;
+              }
+              
               if (this.returnPrice == 0) {
                 this.returnPriceShow = false;
               } else {
@@ -3358,6 +3367,7 @@
                 this.isShowLayer = false;
                 this.isShowLayer2 = true;
               }
+              this.getNumber()
               if(x.GuestList.length>0){
                 let GuestList = JSON.parse(JSON.stringify(x.GuestList))
                 this.addMsg.GuestList = []
@@ -3614,7 +3624,7 @@
           if (num > 0) {
             this.apipost(
               "sellorder_get_GetOrderMinPrice", {
-                ltID: this.addObj.ltID,
+                ltID: this.addObj&&this.addObj.ltID?this.addObj.ltID:0,
                 Num: num
               },
               res => {
@@ -3691,8 +3701,8 @@
             return
           }
         }
-        if (this.addMsg.GroupType != 5) {
-          if (this.addObj.IsBirdDiscount && this.addObj.IsBirdDiscount == 1) {
+        if (this.addMsg.GroupType != 5 && this.addObj) {
+          if (this.addObj&&this.addObj.IsBirdDiscount && this.addObj.IsBirdDiscount == 1) {
             //早鸟优惠
             //this.addMsg.Unit_Price  //成交单价
             //BabyPrice 婴儿价
@@ -3708,12 +3718,9 @@
                 this.addObj.DiscountPrice +
                 this.addObj.BabyChargePrice);
             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 =
+            let laoren = 0
+            if(this.addObj&&this.addObj.OtherPrice){
+              zafeiqianzhen =
               this.addObj.OtherPrice *
               (Number(this.addMsg.ManNum) +
                 Number(this.addMsg.ChirdNum) +
@@ -3730,19 +3737,26 @@
                 Number(this.addMsg.BabyNum) +
                 Number(this.addMsg.OldPeopleNum) -
                 Number(this.addMsg.VisaNum));
-            let danfang =
+            }
+            let danfang = 0
+            if(this.addObj&&this.addObj.SingleRoomNum){
+              danfang =
               Number(this.addMsg.SingleRoomNum) * this.addObj.SingleRoomPrice;
-            let ertongbed =
+            }
+            let ertongbed = 0
+            if(this.addObj&&this.addObj.ChildNeedPrice){
+              ertongbed =
               this.addObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) -
               this.addObj.ChildNoNeedPrice *
               (Number(this.addMsg.ChirdNum) -
                 Number(this.addMsg.ChirdNeedBedNum));
+            }
             let lianyun =
               (Number(this.addMsg.ManNum) +
                 Number(this.addMsg.ChirdNum) +
                 Number(this.addMsg.OldPeopleNum)) *
               (Number(this.stratPrice) + Number(this.returnPrice));
-            let dandijie
+            let dandijie = 0
             if (this.addMsg.GroupType == 4) {
               dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
 
@@ -3769,14 +3783,23 @@
             // 1111111111111111111
             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 ertong =0
+              if(this.addObj){
+                ertong =
+                Number(this.addMsg.ChirdNum) *
+                (Number(this.addMsg.Unit_Price) + this.addObj.BabyChargePrice);
+              }
+            
             let yinger = Number(this.addMsg.BabyNum) * Number(this.addMsg.Unit_Price);
-            let laoren =
+            let laoren = 0
+            if(this.addObj&&this.addObj.OldManChargePrice){
+              laoren =
               Number(this.addMsg.OldPeopleNum) *
               (Number(this.addMsg.Unit_Price) + this.addObj.OldManChargePrice);
-            let zafeiqianzhen =
+            }
+            let zafeiqianzhen = 0
+            if(this.addObj&&this.addObj.OtherPrice){
+              zafeiqianzhen =
               this.addObj.OtherPrice *
               (Number(this.addMsg.ManNum) +
                 Number(this.addMsg.ChirdNum) +
@@ -3793,10 +3816,17 @@
                 Number(this.addMsg.BabyNum) +
                 Number(this.addMsg.OldPeopleNum) -
                 Number(this.addMsg.VisaNum));
-            let danfang =
+            }
+            let danfang = 0
+            if(this.addObj&&this.addObj.SingleRoomPrice){
+              danfang =
               Number(this.addMsg.SingleRoomNum) * this.addObj.SingleRoomPrice;
-            let ertongbed = this.addObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) - this.addObj
+            }
+            let ertongbed = 0
+            if(this.addObj&&this.addObj.ChildNeedPrice){
+              ertongbed = this.addObj.ChildNeedPrice * Number(this.addMsg.ChirdNeedBedNum) - this.addObj
               .ChildNoNeedPrice * (Number(this.addMsg.ChirdNum) - Number(this.addMsg.ChirdNeedBedNum));
+            }
             let lianyun =
               (Number(this.addMsg.ManNum) +
                 Number(this.addMsg.ChirdNum) +
@@ -3806,8 +3836,9 @@
             if (this.addMsg.GroupType == 4) {
               dandijie = this.addMsg.Unit_Price * Number(this.addMsg.AirticketNum);
             } else {
-              dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
-
+              if(this.addObj&&this.addObj.SingleDMCPrice){
+                dandijie = this.addObj.SingleDMCPrice * Number(this.addMsg.AirticketNum);
+              }
             }
 
             this.addMsg.PreferPrice =
@@ -4354,7 +4385,7 @@
               this.isUpdateOrder = res.data.data.pageData.isUpdateOrder
               this.IsUpdateOrderMoney = res.data.data.pageData.isUpdateOrderMoney
               this.isUpdateOrderCommission = res.data.data.pageData.isUpdateOrderCommission
-              this.cancelRtData = res.data.data.pageData.cancelRtData[0].list ? res.data.data.pageData.cancelRtData[0]
+              this.cancelRtData = res.data.data.pageData.cancelRtData.length>0&&res.data.data.pageData.cancelRtData[0].list ? res.data.data.pageData.cancelRtData[0]
                 .list : '';
               this.seat.YSeat = res.data.data.pageData.ySeatNum
               this.seat.CSeat = res.data.data.pageData.eSeatNum

src/components/SalesModule/groupTourOrderOne.vue

@@ -940,8 +940,6 @@
                 @input='getNumber();getTotalPrice();getHouseNo()'></el-input>
             </el-form-item>
           </el-col> -->
-        </el-row>
-        <!-- <el-row :gutter="20"> -->
           <!-- <el-col :span="4">
             <el-form-item label="单房数量" prop="SingleRoomNum">
               <el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')"
@@ -972,8 +970,6 @@
                 @input='getTotalPrice()'></el-input>
             </el-form-item>
           </el-col> -->
-        <!-- </el-row> -->
-        <el-row :gutter="20">
           <!-- <el-col :span="4">
             <el-form-item label="预计用房" prop="PredictRoomNum">
               <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
@@ -1072,9 +1068,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
-        </el-row>
-        <!-- <el-row :gutter="20"> -->
           <!-- <el-col :span="4">
             <el-form-item label="经济舱" prop="YSeatNum">
               <el-input v-model='addMsg.YSeatNum' @keyup.native="checkInteger(addMsg,'YSeatNum')"></el-input>
@@ -1094,9 +1087,7 @@
 						<el-form-item label="单地接数量" prop="AirticketNum">
 						   <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')"    @input='getTotalPrice();getHouseNo()'></el-input>
 						</el-form-item>
-					</el-col> --> 
-        <!-- </el-row> -->
-        <el-row :gutter="20">
+					</el-col> -->
           <el-col :span="4">
             <el-form-item :label="$t('salesModule.SSPT')" prop="BrandId" v-show="addMsg.ClientSource==1">
               <el-select v-model='addMsg.BrandId' :disabled="false" filterable :placeholder="$t('pub.pleaseSel')">
@@ -3008,7 +2999,7 @@
               if (x.ClientSource == 1) {
                 this.isPingtai = true
               }
-
+              this.getNumber()
               if(x.GuestList.length>0){
                 let GuestList = JSON.parse(JSON.stringify(x.GuestList))
                 this.addMsg.GuestList = []

src/components/SalesModule/productQueryOne.vue

@@ -337,9 +337,6 @@
               <el-input v-model='addMsg.AirticketNum' @keyup.native="checkInteger(addMsg,'AirticketNum')" @input='getNumber();getTotalPrice();getHouseNo();autoRemarks("AirticketNum","单地接数量")'></el-input>
             </el-form-item>
           </el-col> -->
-        </el-row>
-        
-        <el-row :gutter="20">
           <!-- <el-col :span="4">
             <el-form-item label="单房数量" prop="SingleRoomNum">
               <el-input v-model='addMsg.SingleRoomNum' @keyup.native="checkInteger(addMsg,'SingleRoomNum')" @input='yzBigBed2();getTotalPrice();autoRemarks("SingleRoomNum","单房数量")'></el-input>
@@ -395,9 +392,6 @@
               </el-select>
             </el-form-item>
           </el-col>
-          
-        </el-row>
-        <el-row :gutter="20">
           <!-- <el-col :span="4">
             <el-form-item label="预计用房" prop="PredictRoomNum">
               <el-input v-model='addMsg.PredictRoomNum' :disabled="true"></el-input>
@@ -427,12 +421,8 @@
               <el-input v-model='addMsg.CommissionShareMoney' :disabled="true"></el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            &nbsp;
-          </el-col>
-        </el-row>
-        <!-- <el-row :gutter="20">
-          <el-col :span="4">
+          <!-- 
+            <el-col :span="4">
             <el-form-item label="经济舱" prop="YSeatNum">
               <el-input v-model='addMsg.YSeatNum' @keyup.native="checkInteger(addMsg,'YSeatNum')"></el-input>
             </el-form-item>
@@ -469,12 +459,8 @@
               </el-select>
             </el-form-item>
           </el-col>
-          <el-col :span="4">
-            &nbsp;
-          </el-col>
-        </el-row> -->
-        <el-row :gutter="20">
-          <!-- <el-col :span="4">
+           -->
+           <!-- <el-col :span="4">
             <el-form-item label="客人来源" prop="ClientSource">
               <el-select v-model='addMsg.ClientSource' filterable :placeholder="$t('pub.pleaseSel')">
                 <el-option v-for="item in ddlyList" :label='item.Name' :value='item.Id' :key='item.Id'>
@@ -530,7 +516,6 @@
               <el-date-picker v-model='addMsg.TradeDate' value-format="yyyy-MM-dd" type="date"></el-date-picker>
             </el-form-item>
           </el-col> -->
-          
         </el-row>
         <el-row :gutter="20" style="margin-bottom: 20px;">
           <el-col :span="24">