页面修改

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -170,7 +170,7 @@
                   <i class="iconfont icon-quxiao" style="display:inline-block;" @click="DeleteCurrency(index)"></i>
                 </span>
               </td>
-              <td :colspan="12-2-CostCurrencyList.length+1">
+              <td :colspan="13-2-CostCurrencyList.length+1">
                 <el-form-item class="w70">
                   <el-select v-model='currencyType' @change="getRate(currencyType),addCurrency()">
                     <el-option v-for="item in currencyTypeArr" :label='item.Name' :value='item.ID' :key='item.ID'>
@@ -186,7 +186,7 @@
                   @keyup.native="checkRate(item,'ExchangeRate'),getchange()">
                 </el-input>
               </td>
-              <td :colspan="12-2-CostCurrencyList.length+1">
+              <td :colspan="13-2-CostCurrencyList.length+1">
                 <el-input class="w70" v-model='queryMsg.RateInput'
                   @keyup.native="checkRate(queryMsg,'RateInput'),getchange()">
                 </el-input>
@@ -201,7 +201,7 @@
                   <i class="iconfont icon-quxiao" @click="DeletePNumber(index),getchange()"></i>
                 </span>
               </td>
-              <td width="150" :colspan="12-2-CostNumberList.length+1">
+              <td width="150" :colspan="13-2-CostNumberList.length+1">
                 <el-form-item>
                   <el-input class="w50" v-model='queryMsg.PeopleNumber'
                     @keyup.native="checkInteger(queryMsg,'PeopleNumber'),getchange()"></el-input>
@@ -224,19 +224,20 @@
             </tr> -->
           </thead>
           <tr>
-            <td colspan="12"></td>
+            <td colspan="13"></td>
           </tr>
           <tr>
             <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
             <td rowspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</td>
             <td rowspan="2" width="100" class="CP_ComTitle2 CostcomCenter">币种</td>
             <td rowspan="2" width='60' class="CP_ComTitle2 CostcomCenter">酒店</td>
-            <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
+            <td colspan="4" width='100' class="CP_ComTitle2 CostcomCenter">车</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="3" width='100' class="CP_ComTitle2 CostcomCenter">餐</td>
           </tr>
           <tr>
             <td width="120" class="CP_ComTitle2 CostcomCenter">总车资</td>
+            <td width="120" class="CP_ComTitle2 CostcomCenter">过路费</td>
             <td width="100" class="CP_ComTitle2 CostcomCenter">人数</td>
             <td width="100" class="CP_ComTitle2 CostcomCenter" style="white-space:nowrap; ">每人车资</td>
             <td width="120" class="CP_ComTitle2 CostcomCenter">早</td>
@@ -280,6 +281,11 @@
                       @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
                     </el-input>
                   </td>
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                    <el-input type='text' v-model="subItem.PassFee" class="w70"
+                      @keyup.native="checkPrice(subItem,'PassFee'),getchange()">
+                    </el-input>
+                  </td>
                   <td>
                     {{childItem.PeopleNumber}}
                   </td>
@@ -323,11 +329,14 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(2,1)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(7,1)}}
+                </td>
                 <td>
                   {{childItem.PeopleNumber}}
                 </td>
                 <td>
-                  {{(Number(getDayXiaoJi(2,1))/Number(childItem.PeopleNumber)).toFixed(0)}}
+                  {{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(childItem.PeopleNumber)).toFixed(0)}}
                 </td>
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(3,1)}}
@@ -355,11 +364,14 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(2,2)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(7,2)}}
+                </td>
                 <td>
                   {{childItem.PeopleNumber}}
                 </td>
                 <td>
-                  {{(Number(getDayXiaoJi(2,2))/Number(childItem.PeopleNumber)).toFixed(0)}}
+                  {{((Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(childItem.PeopleNumber)).toFixed(0)}}
                 </td>
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(3,2)}}
@@ -411,6 +423,11 @@
                   @keyup.native="checkPrice(subItem,'BusCostPrice'),getchange()">
                 </el-input>
               </td>
+              <td>
+                <el-input type='text' v-model="subItem.PassFee" class="w70"
+                  @keyup.native="checkPrice(subItem,'PassFee'),getchange()">
+                </el-input>
+              </td>
               <td>
                 <template v-if="CostNumberList&&CostNumberList.length>0">
                   {{CostNumberList[0].PeopleNumber}}
@@ -453,6 +470,9 @@
               <td>
                 {{getDayXiaoJi(2,1)}}
               </td>
+              <td>
+                {{getDayXiaoJi(7,1)}}
+              </td>
               <td>
                 <template v-if="CostNumberList&&CostNumberList.length>0">
                   {{CostNumberList[0].PeopleNumber}}
@@ -460,7 +480,7 @@
               </td>
               <td>
                 <template v-if="CostNumberList&&CostNumberList.length>0">
-                  {{(Number(getDayXiaoJi(2,1))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
+                  {{((Number(getDayXiaoJi(2,1))+Number(getDayXiaoJi(7,1)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
                 </template>
               </td>
               <td>
@@ -486,6 +506,9 @@
               <td>
                 {{getDayXiaoJi(2,2)}}
               </td>
+              <td>
+                {{getDayXiaoJi(7,2)}}
+              </td>
               <td>
                 <template v-if="CostNumberList&&CostNumberList.length>0">
                   {{CostNumberList[0].PeopleNumber}}
@@ -493,7 +516,7 @@
               </td>
               <td>
                 <template v-if="CostNumberList&&CostNumberList.length>0">
-                  {{(Number(getDayXiaoJi(2,2))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
+                  {{( (Number(getDayXiaoJi(2,2))+Number(getDayXiaoJi(7,2)))/Number(CostNumberList[0].PeopleNumber)).toFixed(0)}}
                 </template>
               </td>
               <td>
@@ -511,16 +534,16 @@
             </tr>
           </template>
           <tr>
-            <td colspan="12"></td>
+            <td colspan="13"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2" colspan="5">内陆段交通部分</td>
+            <td class="CP_ComTitle2" colspan="6">内陆段交通部分</td>
             <td class="CP_ComTitle2" colspan="6">杂支部分</td>
           </tr>
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">1</td>
             <td class="CP_ComTitle2">内陆段机位(每人)</td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-select v-model='OtherPrice.InlandAirTicketCurrency' class="w70">
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
@@ -556,7 +579,7 @@
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">2</td>
             <td class="CP_ComTitle2">内陆段船票(每人)</td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-select v-model='OtherPrice.InlandShipTicketCurrency' class="w70">
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
@@ -594,7 +617,7 @@
           <tr>
             <td class="CP_ComTitle2 CostcomCenter">3</td>
             <td class="CP_ComTitle2">内陆段火车票(每人)</td>
-            <td>
+            <td colspan="2">
               <el-form-item>
                 <el-select v-model='OtherPrice.InlandTrainTicketCurrency' class="w70">
                   <el-option :label="$t('pub.unlimitedSel')" :value='defaultSelect'></el-option>
@@ -630,7 +653,7 @@
             </td>
           </tr>
           <tr>
-            <td colspan="5"></td>
+            <td colspan="6"></td>
             <td class="CP_ComTitle2 CostcomCenter">4</td>
             <td colspan="2" class="CP_ComTitle2">司机、导游小费</td>
             <td>
@@ -654,7 +677,7 @@
             <td class="CP_ComTitle2">
               外币小计
             </td>
-            <td colspan="4">
+            <td colspan="5">
               {{trafficXiaoJi(2)}}
             </td>
             <td class="CP_ComTitle2">
@@ -668,7 +691,7 @@
             <td class="CP_ComTitle2">
               人民币小计
             </td>
-            <td colspan="4">
+            <td colspan="5">
               {{ trafficXiaoJi(1) }}
             </td>
             <td class="CP_ComTitle2">
@@ -679,17 +702,17 @@
             </td>
           </tr>
           <tr>
-            <td colspan="12"></td>
+            <td colspan="13"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2" colspan="2">其他支出</td>
+            <td class="CP_ComTitle2" colspan="4">其他支出</td>
             <td class="CP_ComTitle2" colspan="3" style="display:none;">机票</td>
             <td class="CP_ComTitle2" colspan="4">收入</td>
             <td class="CP_ComTitle2" colspan="5">团负费</td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2 CostcomCenter">摘要</td>
-            <td class="CP_ComTitle2 CostcomCenter">金额<br />(人民币)</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
+            <td class="CP_ComTitle2 CostcomCenter" colspan="2">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2" style="display:none;">摘要</td>
             <td class="CP_ComTitle2 CostcomCenter" style="display:none;">金额<br />(人民币)</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">摘要</td>
@@ -698,8 +721,8 @@
             <td class="CP_ComTitle2 CostcomCenter" colspan="3">金额<br />(人民币)</td>
           </tr>
           <tr>
-            <td style="white-space:nowrap; " class="CP_ComTitle2">销售提成1%</td>
-            <td>
+            <td style="white-space:nowrap; " class="CP_ComTitle2" colspan="2">销售提成1%</td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.SalesCommissionMoney"
                   @keyup.native="checkPrice(OtherPrice,'SalesCommissionMoney'),getchange()"></el-input>
@@ -728,8 +751,8 @@
             </td>
           </tr>
           <tr>
-            <td style="white-space:nowrap; " class="CP_ComTitle2">作业处提成</td>
-            <td>
+            <td style="white-space:nowrap; " class="CP_ComTitle2" colspan="2">作业处提成</td>
+            <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w120" v-model="OtherPrice.OfficeCommissionMoney"
                   @keyup.native="checkPrice(OtherPrice,'OfficeCommissionMoney'),getchange()"></el-input>
@@ -746,10 +769,10 @@
             <td colspan="5"></td>
           </tr>
           <tr>
-            <td class="CP_ComTitle2">
+            <td class="CP_ComTitle2" colspan="2">
               人民币小计
             </td>
-            <td>
+            <td colspan="2">
               {{Number(OtherPrice.SalesCommissionMoney)+Number(OtherPrice.OfficeCommissionMoney)}}
             </td>
             <td class="CP_ComTitle2" style="display:none;">
@@ -785,6 +808,7 @@
             <td class="CP_ComTitle2 CostcomCenter">人数</td>
             <td class="CP_ComTitle2 CostcomCenter">机票</td>
             <td class="CP_ComTitle2 CostcomCenter">门票</td>
+            <td class="CP_ComTitle2 CostcomCenter">领队导游司机住宿</td>
             <td class="CP_ComTitle2 CostcomCenter">单房差</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">内陆段交通</td>
             <td class="CP_ComTitle2 CostcomCenter" colspan="2">杂费</td>
@@ -803,6 +827,12 @@
                 <el-input type='text' class="w70" v-model="OtherPrice.TicketShareMoney"
                   @keyup.native="checkPrice(OtherPrice,'TicketShareMoney'),getchange()"></el-input>
               </el-form-item>
+            </td>
+              <td>
+              <el-form-item>
+                <el-input type='text' class="w70" v-model="OtherPrice.LeaderGuideDriveZhuSu"
+                  @keyup.native="checkPrice(OtherPrice,'LeaderGuideDriveZhuSu'),getchange()"></el-input>
+              </el-form-item>
             </td>
             <td>
               <el-form-item>
@@ -810,6 +840,7 @@
                   @keyup.native="checkPrice(OtherPrice,'SingleRoomShareMoney'),getchange()"></el-input>
               </el-form-item>
             </td>
+          
             <td colspan="2">
               <el-form-item>
                 <el-input type='text' class="w70" v-model="OtherPrice.InlandTrafficShareMoney"
@@ -828,16 +859,17 @@
             <td>{{item.PeopleNumber}}+1</td>
             <td>{{item.AirTicketMoney}}</td>
             <td>{{item.TicketMoney}}</td>
+            <td>{{item.LeaderGuideDriveZhuSu}}</td>
             <td>{{item.SingleRoomMoney}}</td>
             <td colspan="2">{{item.InlandTrafficMoney}}</td>
             <td colspan="2">{{item.OtherMoney}}</td>
             <td colspan="3">{{item.SubtotalMoney}}</td>
           </tr>
           <tr>
-            <td colspan="12"></td>
+            <td colspan="13"></td>
           </tr>
           <tr>
-            <td colspan="12" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
+            <td colspan="13" class="CP_ComTitle2">成本统计（以下报价为每人费用）<br />
               计算规则: (房+餐+车+景点)*汇率+内陆段交通*汇率+杂支部分*汇率+其他资产+机票票+收入-团负费+领队分摊+地接报价*汇率
             </td>
           </tr>
@@ -846,7 +878,7 @@
             </td>
             <td class="CP_ComTitle2">成本价</td>
             <td class="CP_ComTitle2" colspan="2">销售价格</td>
-            <td colspan="7" class="CP_ComTitle2">备注</td>
+            <td colspan="8" class="CP_ComTitle2">备注</td>
           </tr>
           <tr v-for="item in CostNumberList" :key="item.subCode">
             <td>{{item.PeopleNumber}}+1</td>
@@ -855,12 +887,12 @@
               <el-input type='text' class="w70" v-model="item.SalePrice"
                 @keyup.native="checkPrice(item,'SalePrice',true)" maxlength="8"></el-input>
             </td>
-            <td colspan="7">
+            <td colspan="8">
               <el-input type="textarea" v-model="item.CostRemark"></el-input>
             </td>
           </tr>
           <tr>
-            <td colspan="12"></td>
+            <td colspan="13"></td>
           </tr>
           <tr>
             <td class="CP_ComTitle2">
@@ -884,7 +916,7 @@
             <td class="CP_ComTitle2">
               签证费
             </td>
-            <td class="CP_ComTitle2">
+            <td class="CP_ComTitle2" colspan="2">
               单房差
             </td>
           </tr>
@@ -924,7 +956,7 @@
                 class="w100">
               </el-input>
             </td>
-            <td>
+            <td colspan="2">
               <el-input placeholder="" v-model="teamPrice.SingleRoomPrice"
                 @keyup.native="checkPrice(teamPrice,'SingleRoomPrice')" class="w100">
               </el-input>
@@ -933,7 +965,7 @@
           </tr>
           <tr>
             <td class="CP_ComTitle2">备注</td>
-            <td colspan="11">
+            <td colspan="12">
               <el-input type="textarea" v-model="OtherPrice.OtherRemark"></el-input>
             </td>
           </tr>
@@ -1101,6 +1133,10 @@
           if (type == 6) {
             xiaoJi += Number(item.DinnerCostPrice) * Number(currencyRate);
           }
+          //过路费
+          if (type == 7) {
+            xiaoJi += Number(item.PassFee) * Number(currencyRate);
+          }
         });
         return xiaoJi.toFixed(0);
       },
@@ -1220,6 +1256,7 @@
               LunchCostPrice: 0, //午餐报价
               DinnerCostPrice: 0, //晚餐报价
               ContainDinnerType: 0, //含餐类型(1-含早餐,2-含晚餐,3-含早晚)
+              PassFee:0,//过路费
             };
             this.dayCostPrice.push(dayItem);
           }
@@ -1384,12 +1421,16 @@
             that.getConvertMoney(x.TicketMoney) +
             that.getConvertMoney(x.SingleRoomMoney) +
             that.getConvertMoney(x.InlandTrafficMoney) +
-            that.getConvertMoney(x.OtherMoney)
+            that.getConvertMoney(x.OtherMoney)+
+            that.getConvertMoney(x.LeaderGuideDriveZhuSu)
           ).toFixed(0);
           //房餐车景点价格
           var trip = Number(that.getLocalTotalMoney(x.PeopleNumber));
+          console.log("trip",trip);
+         
           //其他价格
           var otherPrice = Number(that.getCostTotalMoney())
+           console.log("otherPrice",otherPrice)
           x.TotalMoney = (trip + otherPrice +
             Number(that.getConvertMoney(x.SubtotalMoney))
           ).toFixed(0);
@@ -1406,9 +1447,14 @@
       //获取地接项目报价
       getLocalTotalMoney(PeopleNumber) {
         let totalMoney = 0.0;
-        totalMoney = Number(this.getDayXiaoJi(1, 2)) + Number(this.getDayXiaoJi(2, 2)) / Number(PeopleNumber) +
-          Number(this.getDayXiaoJi(3, 2)) + Number(this.getDayXiaoJi(4, 2)) + Number(this.getDayXiaoJi(5, 2)) +
-          Number(this.getDayXiaoJi(6, 2));
+        totalMoney = Number(this.getDayXiaoJi(1, 2))  
+        + Number(this.getDayXiaoJi(3, 2)) 
+        + Number(this.getDayXiaoJi(4, 2)) 
+        + Number(this.getDayXiaoJi(5, 2)) 
+        + Number(this.getDayXiaoJi(6, 2))
+        + Number(this.getDayXiaoJi(2, 2))/ Number(PeopleNumber)
+        + Number(this.getDayXiaoJi(7, 2))/ Number(PeopleNumber)
+        ;
         return totalMoney.toFixed(0);
       },
       //计算领队分摊
@@ -1419,12 +1465,15 @@
         var SingleRoomShareMoney = this.OtherPrice.SingleRoomShareMoney;
         var InlandTrafficShareMoney = this.OtherPrice.InlandTrafficShareMoney;
         var OtherShareMoney = this.OtherPrice.OtherShareMoney;
+        //司机导游住宿
+        var LeaderGuideDriveZhuSu=this.OtherPrice.LeaderGuideDriveZhuSu;
         this.CostNumberList.forEach(x => {
           x.AirTicketMoney = (AirTicketShareMoney / x.PeopleNumber).toFixed(0);
           x.TicketMoney = (TicketShareMoney / x.PeopleNumber).toFixed(0);
           x.SingleRoomMoney = (SingleRoomShareMoney / x.PeopleNumber).toFixed(0);
           x.InlandTrafficMoney = (InlandTrafficShareMoney / x.PeopleNumber).toFixed(0);
           x.OtherMoney = (OtherShareMoney / x.PeopleNumber).toFixed(0);
+          x.LeaderGuideDriveZhuSu=(LeaderGuideDriveZhuSu / x.PeopleNumber).toFixed(0);
         });
       },
       getchange() {

src/components/TravelManager/TravelNewQuotation/QuotationNewPrice.vue

@@ -52,6 +52,7 @@
           StartCityId: 0,
           ReturnArriveCityId: 0, //返回抵达城市
           CustomerName: "", //客户名称
+          TeamType: 0, //团队类型
         },
         dayCostPriceList: [], //报价列表
         isSubmit: true,
@@ -81,10 +82,10 @@
           InlandTrafficShareMoney: 0, //内陆段交通分摊费用
           OtherShareMoney: 0, //杂费分摊费用
           OtherRemark: "", //其他价格备注
-          VisaMoneyCurrencyId:0,//签证费币种
-          SafeMoneyCurrencyId:0,//保险费币种
-          LeaderTripMoneyCurrencyId:0,//领队小费币种
-          DriverGuideMoneyCurrencyId:0,//司机导游小费币种
+          VisaMoneyCurrencyId: 0, //签证费币种
+          SafeMoneyCurrencyId: 0, //保险费币种
+          LeaderTripMoneyCurrencyId: 0, //领队小费币种
+          DriverGuideMoneyCurrencyId: 0, //司机导游小费币种
         },
         CostCurrencyList: [], //选择的币种
         CostNumberList: [], //人数
@@ -118,6 +119,7 @@
           BackSafeMoney: 0, //退保险费
           ContractUrl: "", //合同地址
           PriceRemark: "", //定价备注
+          LeaderGuideDriveZhuSu:0,//领队导游住宿费
         },
         LineList: [], //线路列表
         loading: false
@@ -154,11 +156,10 @@
             this.loading = false;
             if (res.data.resultCode == 1) {
               this.Success(res.data.message);
-              let isfrom = this.$route.query.isNewQuo;
-              if(isfrom==1){
-                this.goUrl('newQuotation');
-              }else{
+              if (this.postData.TeamType == 1) {
                 this.goUrl('newQuotation2');
+              } else {
+                this.goUrl('newQuotation');
               }
             } else {
               this.Error(res.data.message);
@@ -191,7 +192,7 @@
           res => {
             if (res.data.resultCode == 1) {
               var tempData = res.data.data;
-              console.log("tempData",tempData);
+              console.log("tempData", tempData);
               if (tempData.ID && tempData.ID > 0) {
                 this.postData.ID = tempData.ID;
               }
@@ -264,9 +265,11 @@
           err => {}
         );
       },
-
     },
     created() {
+      if (this.$route.query.TeamType) {
+        this.postData.TeamType = this.$route.query.TeamType;
+      }
       this.getPostData();
     },
     components: {

src/components/TravelManager/TravelNewQuotation/newQuotation.vue

@@ -34,9 +34,11 @@
     box-shadow: none;
     color: #555;
   }
-  .BilldownLoadCommon table td{
+
+  .BilldownLoadCommon table td {
     text-align: left;
   }
+
 </style>
 <template>
   <div class="flexOne quoTation">
@@ -76,7 +78,7 @@
         </li>
         <li>
           <button class="hollowFixedBtn" @click="getList(),resetPageIndex()">查询</button>
-          <button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice')">新增</button>
+          <button class="hollowFixedBtn" @click="goMakeQuo('QuotationNewPrice',0)">新增</button>
         </li>
       </ul>
     </div>
@@ -195,7 +197,7 @@
                   <i class="iconfont icon-nav-hangzheng"></i>
                 </el-tooltip>
               </span>
-              <span class="bianji opbd" @click="goUrl('QuotationNewPrice',item.ID,false)">
+              <span class="bianji opbd" @click="goMakeQuo('QuotationNewPrice',item.ID)">
                 <el-tooltip class="item" effect="dark" :content="$t('pub.updateMsg')" placement="top-start"
                   popper-class="max-w250">
                   <i class="iconfont icon-bianji-smal"></i>
@@ -268,7 +270,8 @@
           </tbody>
           <tr height="66">
             <td colspan="2" style="text-align:center;">
-              <input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')" @click="DownLoadFile()" />
+              <input type="button" class="normalBtn" style="margin-left:-70px;" :value="$t('pub.sureBtn')"
+                @click="DownLoadFile()" />
             </td>
           </tr>
         </table>
@@ -290,7 +293,8 @@
           PageIndex: 1,
           PageSize: 10,
           total: 0,
-          currentPage: 1
+          currentPage: 1,
+          TeamType: 0, //0常规,1-小包团,2-一日游,3-地接团
         },
         loading: true,
         //报价单状态
@@ -511,70 +515,27 @@
         });
         that.outerVisible = true;
       },
-      goUrl(path, configId, isCopy) {
-        var routeName = this.$route.name;
-        var isNewQuo=1;
-        if (routeName == 'newQuotation') {
-          isNewQuo=1;
-        }
-        if (routeName == 'newQuotation2') {
-          isNewQuo=2;
-        }
-
-        if (configId > 0) {
-          this.$router.push({
-            name: path,
-            query: {
-              configId: configId,
-              isCopy: isCopy,
-              isNewQuo:isNewQuo,
-              blank: 'y'
-            }
-          });
-        } else {
-          this.$router.push({
-            name: path
-          });
-        }
-      },
-      goUrlBo(path) {
+      //报价单跳转
+      goMakeQuo(path, configId) {
         this.$router.push({
           path: path,
           query: {
+            TeamType: this.queryData.TeamType,
+            configId: configId,
             blank: 'y',
             tab: '报价单'
           }
         });
       },
-      goMakeQuo(path) {
-        this.$router.push({
-          path: path,
-          query: {
-            configId: 0,
-            blank: 'y',
-            tab: '报价单'
-          }
-        });
-      },
-
-      goSubInfo(path, configId) {
-        this.$store.commit("pageConditionUpdate", this.queryData);
-        this.$router.push({
-          path: path,
-          query: {
-            configId: configId
-          }
-        });
-      },
       //开团或修改
       goToOpenTravel(item) {
         var routeName = this.$route.name;
-        var path='';
+        var path = '';
         if (routeName == 'newQuotation') {
-          path='TravelManager6'
+          path = 'TravelManager6'
         }
         if (routeName == 'newQuotation2') {
-          path='TravelManager5'
+          path = 'TravelManager5'
         }
         if (item.ID > 0) {
           this.$router.push({
@@ -618,6 +579,13 @@
       },
     },
     mounted() {
+      var routeName = this.$route.name;
+      if (routeName == 'newQuotation') {
+        this.queryData.TeamType = 3;
+      }
+      if (routeName == 'newQuotation2') {
+        this.queryData.TeamType = 1;
+      }
       this.getLineList();
       this.getList();
       let isNoOffer = this.$route.params.isNoOffer;
@@ -626,6 +594,7 @@
       }
     },
     created() {
+
       if (this.$route.query.hasOwnProperty("cache")) {
         if (this.$store.state.pageCondition != null) {
           this.queryData = this.$store.state.pageCondition;