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

src/components/Details.vue

@@ -762,6 +762,9 @@
           case "/TeamBalancePayment": //团队收支明细
             path = "/TravelControlList";
             break;
+          case "/airplaneList": //包机管理
+            path = "/TravelControlList";
+            break;
           case "/saleReceivablesTotal": //工作汇总 询价
             path = "/workTotal";
             break;

src/components/SupplierIndex.vue

@@ -1554,112 +1554,6 @@
       },
 
     },
-    mounted() {
-      let that = this;
-      this.MsgBus.$on('doudong', function () {
-        that.dou()
-      });
-      this.MsgBus.$on('openChat', function (obj) {
-        that.lt(obj)
-      });
-      const permissionNow = Notification.requestPermission();
-      var hiddenProperty =
-        "hidden" in document ?
-        "hidden" :
-        "webkitHidden" in document ?
-        "webkitHidden" :
-        "mozHidden" in document ?
-        "mozHidden" :
-        null;
-      var visibilityChangeEvent = hiddenProperty.replace(
-        /hidden/i,
-        "visibilitychange"
-      );
-      var onVisibilityChange = function () {
-        if (!document[hiddenProperty]) {
-          that.isFocus = true;
-        } else {
-          that.isFocus = false;
-        }
-      };
-      document.addEventListener(visibilityChangeEvent, onVisibilityChange);
-      if (!localStorage.menu)
-        this.$store.dispatch("connect");
-      else {
-        this.firstMenuList = JSON.parse(localStorage.menu)
-        if (this.firstMenuList.indexOf('IM') != -1) {
-          this.$store.dispatch("connect");
-        }
-      }
-
-      this.getDynamic();
-      this.getMyDynamic();
-      this.getAboutMeDynamic();
-      this.getWebAllPart();
-      this.getNoticeList()
-      document
-        .getElementById("allDynamic")
-        .addEventListener("scroll", function () {
-          //全部动态
-          if (this.scrollHeight - this.scrollTop === this.clientHeight) {
-            that.isAppend = true;
-            that.dynamicMsg.pageIndex =
-              Math.ceil(that.dynamicList.length / 10) + 1;
-            that.getDynamic();
-          }
-        });
-
-      document.getElementById("myDynamic").addEventListener("scroll", function () {
-        //我的动态
-        if (this.scrollHeight - this.scrollTop === this.clientHeight) {
-          that.isAppendOne = true;
-          that.myDynamicMsg.pageIndex =
-            Math.ceil(that.myDynamicList.length / 10) + 1;
-          that.getMyDynamic();
-        }
-      });
-
-      document
-        .getElementById("aboutMeDynamic")
-        .addEventListener("scroll", function () {
-          //与我相关
-          if (this.scrollHeight - this.scrollTop === this.clientHeight) {
-            that.isAppendTwo = true;
-            that.aboutMeDynamicMsg.pageIndex =
-              Math.ceil(that.aboutMyDynamicList.length / 10) + 1;
-            that.getAboutMeDynamic();
-          }
-        });
-      if (
-        window.localStorage.msgBoxInfo &&
-        window.localStorage.msgBoxInfo != ""
-      ) {
-        this.boxInfo = JSON.parse(window.localStorage.msgBoxInfo);
-      }
-      if (this.boxInfo.x == 0) {
-        this.boxInfo.x = 560;
-      }
-      if (this.boxInfo.y == 0) {
-        this.boxInfo.y = 280;
-      }
-      document.title = this.userInfo.GroupName;
-      this.getMenu();
-      this.getBranchList();
-      this.getProvinceList(651, 1);
-      this.GetHotelList();
-      this.getList2();
-      this.GetHotelTipList();
-      var url = window.location.href;
-      if (String(url).indexOf('SupplierIndex') >= 0) {
-        this.showPage = true;
-      } else {
-        this.showPage = false;
-      };
-      this.com_onresize();
-      window.onresize = () => {
-        this.com_onresize();
-      }
-    },
     created() {
       //页面刚进入时开启长连接
       //  this.initWebSocket()

src/components/TravelManager/TravelList/DistributionTransport.vue

@@ -79,9 +79,13 @@
             <td width="120">选择团期</td>
             <td align="left">
               <ul>
-                <li v-for="item in PriceDataList" class="Distri_TeamDayList"><span @click="clickedDay(item)"
-                    class="_Checked"
-                    :class="{NoChecked:item.checkState===ShowStatusList.NoChecked,YesChecked:item.checkState===ShowStatusList.Checked}">{{item.StartDate}}</span>
+                <li v-for="(item,index) in PriceDataList" class="Distri_TeamDayList" :key="index+100">
+                  <el-tooltip class="item" effect="dark" content="点击选中团期" placement="top">
+                    <span @click="clickedDay(item)" class="_Checked"
+                      :class="{NoChecked:item.checkState===ShowStatusList.NoChecked,YesChecked:item.checkState===ShowStatusList.Checked}">
+                      {{item.StartDate}}
+                    </span>
+                  </el-tooltip>
                 </li>
               </ul>
             </td>
@@ -204,8 +208,8 @@
                       <th>订单号</th>
                       <th>销售</th>
                     </tr>
-                    <tbody v-for="item in  OrderDataList.OtherOrderList">
-                      <tr v-for="subItem in item.List">
+                    <tbody v-for="(item,index) in  OrderDataList.OtherOrderList" :key="index">
+                      <tr v-for="(subItem,subIndex) in item.List" :key="subIndex+10000">
                         <td>
                           <label>
                             <input :value="subItem.OrderId" style="vertical-align: middle;" v-model="ArrList"

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -585,7 +585,7 @@
                     <span>{{$t('Airticket.Air_StartTime')}}</span>
                     <span class="go_date">{{item.StartDate}}</span>
                   </p>
-                  <p class="travelnowrap flex" v-if="item.PriceOfferUrl">
+                  <p class="travelnowrap flex" v-if="item.OfferUrlExtArray&&item.OfferUrlExtArray.length>0">
                     <span>报价单</span>
                     <span class="go_date">
                       <template v-for="(subItem,subIndex) in item.OfferUrlExtArray">
@@ -597,6 +597,13 @@
                       </template>
                     </span>
                   </p>
+                  <p class="travelnowrap flex" v-else-if="item.PriceOfferUrl&&item.PriceOfferUrl!=''">
+                    <span>报价单</span>
+                    <span class="go_date">
+                      <a style="margin-left:20px;color:blue;cursor:pointer;" :href="item.PriceOfferUrl"
+                        v-if="item.PriceOfferUrl" target="_blank">下载报价单</a>
+                    </span>
+                  </p>
                   <p class="travelnowrap flex" v-if="item.OfferShouPeiFee>0">
                     <span>手配费</span>
                     <span class="go_date">

src/components/TravelManager/TravelNewQuotation/CostNewPrice.vue

@@ -234,13 +234,14 @@
           </tr>
           <tr>
             <td rowspan="2" style="width:100px" class="CP_ComTitle2 CostcomCenter">Day</td>
-            <td rowspan="2" colspan="2" width='80' class="CP_ComTitle2 CostcomCenter">行程大点</td>
+            <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">行程大点</td>
             <td rowspan="2" width="80" class="CP_ComTitle2 CostcomCenter">币种</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">酒店</td>
             <td colspan="4" class="CP_ComTitle2 CostcomCenter">车</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">门票</td>
             <td colspan="3" class="CP_ComTitle2 CostcomCenter">餐</td>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
+            <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br/>(保险、司导杂费等)</td>
           </tr>
           <tr>
             <td width="80" class="CP_ComTitle2 CostcomCenter">总车资</td>
@@ -323,17 +324,21 @@
                       v-model='subItem.DinnerCostPrice' class="w60"
                       @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
                   </td>
-                  <td v-if="childIndex==0" :rowspan="CostNumberList.length" colspan="2" style="border:1px solid red">
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     <el-input type="text" v-model='subItem.RebatePrice' class="w60"
                       @keyup.native="checkPrice(subItem,'RebatePrice'),getchange()"></el-input>
                   </td>
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                    <el-input type="text" v-model='subItem.OtherPrice' class="w60"
+                      @keyup.native="checkPrice(subItem,'OtherPrice'),getchange()"></el-input>
+                  </td>
                 </tr>
               </template>
             </template>
 
             <template v-for="(childItem,childIndex) in CostNumberList">
               <tr>
-                <td colspan="4" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
+                <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
                   :rowspan="CostNumberList.length">
                   外币小计
                 </td>
@@ -367,11 +372,14 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(8,1)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(9,1)}}
+                </td>
               </tr>
             </template>
             <template v-for="(childItem,childIndex) in CostNumberList">
               <tr>
-                <td colspan="4" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
+                <td colspan="3" class="CP_ComTitle2 CostcomCenter" v-if="childIndex==0"
                   :rowspan="CostNumberList.length">
                   人民币小计
                 </td>
@@ -405,6 +413,9 @@
                 <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                   {{getDayXiaoJi(8,2)}}
                 </td>
+                <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                  {{getDayXiaoJi(9,2)}}
+                </td>
               </tr>
             </template>
           </template>
@@ -413,7 +424,7 @@
               <td align="center">
                 {{subItem.DayNum}}
               </td>
-              <td colspan="2">
+              <td>
                 <el-input type="textarea" resize="none" class="w250" v-model="subItem.Title"></el-input>
               </td>
               <td>
@@ -482,13 +493,17 @@
                   v-model='subItem.DinnerCostPrice' class="w60"
                   @keyup.native="checkPrice(subItem,'DinnerCostPrice'),getchange()"></el-input>
               </td>
-              <td style="border:1px solid red">
+              <td>
                 <el-input type="text" v-model='subItem.RebatePrice' class="w60"
                   @keyup.native="checkPrice(subItem,'RebatePrice'),getchange()"></el-input>
               </td>
+              <td>
+                <el-input type="text" v-model='subItem.OtherPrice' class="w60"
+                  @keyup.native="checkPrice(subItem,'OtherPrice'),getchange()"></el-input>
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 外币小计
               </td>
               <td>
@@ -525,9 +540,12 @@
               <td>
                 {{getDayXiaoJi(8,1)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,1)}}
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 人民币小计
               </td>
               <td>
@@ -564,6 +582,9 @@
               <td>
                 {{getDayXiaoJi(8,2)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,2)}}
+              </td>
             </tr>
           </template>
           <tr>
@@ -1337,6 +1358,10 @@
           if (type == 8) {
             xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
           }
+          //杂费
+          if (type == 9) {
+            xiaoJi += Number(item.OtherPrice) * Number(currencyRate);
+          }
         });
         return xiaoJi.toFixed(0);
       },
@@ -1471,6 +1496,7 @@
               PassFee: 0, //过路费
               HotelName: "", //酒店名称
               RebatePrice: 0, //回佣
+              OtherPrice: 0, //其它费用(保险、司导杂费等)
             };
             this.dayCostPrice.push(dayItem);
           }
@@ -1661,28 +1687,39 @@
       //获取地接项目报价
       getLocalTotalMoney(PeopleNumber) {
         let totalMoney = 0.0;
-        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(this.getDayXiaoJi(7, 2));
+        var hotelPrice = Number(this.getDayXiaoJi(1, 2)); //酒店费用
+        var sencePrice = Number(this.getDayXiaoJi(3, 2)); //景点费用
+        var zaoPrice = Number(this.getDayXiaoJi(4, 2)); //早餐
+        var wuPrice = Number(this.getDayXiaoJi(5, 2)); //午餐
+        var wanPrice = Number(this.getDayXiaoJi(6, 2)); //晚餐
+        var otherPrice = Number(this.getDayXiaoJi(9, 2)); //其它费用
+        //每人车费
+        var perBusFee = 0;
+        if (PeopleNumber > 0) {
+          perBusFee = (Number(this.getDayXiaoJi(2, 2)) + Number(this.getDayXiaoJi(7, 2))) / Number(PeopleNumber)
+            .toFixed(0);
+        }
+        totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
         return totalMoney.toFixed(0);
       },
       //获取地接项目报价
       getLocalJpyTotalMoney(PeopleNumber) {
         let totalMoney = 0.0;
-        totalMoney = Number(this.getDayXiaoJi(1, 1)) +
-          Number(this.getDayXiaoJi(3, 1)) +
-          Number(this.getDayXiaoJi(4, 1)) +
-          Number(this.getDayXiaoJi(5, 1)) +
-          Number(this.getDayXiaoJi(6, 1)) +
-          Number(this.getDayXiaoJi(2, 1)) +
-          Number(this.getDayXiaoJi(7, 1));
+        //每人车费
+        var perBusFee = 0;
+        if (PeopleNumber > 0) {
+          perBusFee = (Number(this.getDayXiaoJi(2, 1)) + Number(this.getDayXiaoJi(7, 1))) / Number(PeopleNumber)
+            .toFixed(0);
+        }
+        var hotelPrice = Number(this.getDayXiaoJi(1, 1)); //酒店费用
+        var sencePrice = Number(this.getDayXiaoJi(3, 1)); //景点费用
+        var zaoPrice = Number(this.getDayXiaoJi(4, 1)); //早餐
+        var wuPrice = Number(this.getDayXiaoJi(5, 1)); //午餐
+        var wanPrice = Number(this.getDayXiaoJi(6, 1)); //晚餐
+        var otherPrice = Number(this.getDayXiaoJi(9, 1)); //其它费用
+        totalMoney = perBusFee + hotelPrice + sencePrice + zaoPrice + wuPrice + wanPrice + otherPrice;
         return totalMoney.toFixed(0);
       },
-
       //计算领队分摊
       getLeaderShare() {
         let that = this;

src/components/TravelManager/TravelNewQuotation/CostNewPriceAudit.vue

@@ -150,13 +150,14 @@
           </tr>
           <tr>
             <td rowspan="2" width='180' class="CP_ComTitle2 CostcomCenter">Day</td>
-            <td rowspan="2" colspan="2" width='200' class="CP_ComTitle2 CostcomCenter">行程大点</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="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>
             <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">回佣</td>
+            <td rowspan="2" width='80' class="CP_ComTitle2 CostcomCenter">其它费用<br/>(保险、司导杂费等)</td>
           </tr>
           <tr>
             <td width="120" class="CP_ComTitle2 CostcomCenter">总车资</td>
@@ -216,6 +217,9 @@
                   <td v-if="childIndex==0" :rowspan="CostNumberList.length">
                     {{subItem.RebatePrice}}
                   </td>
+                  <td v-if="childIndex==0" :rowspan="CostNumberList.length">
+                    {{subItem.OtherPrice}}
+                  </td>
                 </tr>
               </template>
             </template>
@@ -296,7 +300,7 @@
               <td align="center">
                 <div style="width:100px;">{{subItem.DayNum}}</div>
               </td>
-              <td colspan="2">
+              <td>
                 {{subItem.Title}}
               </td>
               <td>
@@ -342,9 +346,12 @@
               <td>
                 {{subItem.RebatePrice}}
               </td>
+              <td>
+                {{subItem.OtherPrice}}
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 外币小计
               </td>
               <td>
@@ -381,9 +388,12 @@
               <td>
                 {{getDayXiaoJi(8,1)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,1)}}
+              </td>
             </tr>
             <tr>
-              <td colspan="4" class="CP_ComTitle2 CostcomCenter">
+              <td colspan="3" class="CP_ComTitle2 CostcomCenter">
                 人民币小计
               </td>
               <td>
@@ -420,6 +430,9 @@
               <td>
                 {{getDayXiaoJi(8,2)}}
               </td>
+              <td>
+                {{getDayXiaoJi(9,2)}}
+              </td>
             </tr>
           </template>
           <tr>
@@ -996,6 +1009,10 @@
           if (type == 8) {
             xiaoJi += Number(item.RebatePrice) * Number(currencyRate);
           }
+          // 其它费用(保险、司导杂费等)
+          if (type == 9) {
+            xiaoJi += Number(item.OtherPrice) * Number(currencyRate);
+          }
         });
         return xiaoJi.toFixed(0);
       },
@@ -1061,18 +1078,7 @@
         }
         return parseFloat(value);
       },
-      //获取地接项目报价
-      getLocalTotalMoney(PeopleNumber) {
-        let totalMoney = 0.0;
-        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);
-      },
+
       //计算领队分摊
       getLeaderShare() {
         let that = this;

src/components/airplane/airplaneGroup.vue

+<style scoped>
+.wrapper {
+  width: 600px;
+  background: #fff;
+  margin: 0 auto;
+  padding: 20px;
+}
+</style>
+<template>
+  <div class="wrapper">
+    <el-form :model="editForm" label-width="100px">
+      <div>基础信息</div>
+      <div class="edit_form_box">
+        <div>
+          <el-form-item label="所属线路">
+            <el-select
+              lass="wp40 accountList"
+              v-model="editForm.accountNum"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(item, index) in 4"
+                :key="index"
+                :label="item"
+                :value="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="团名">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="出发城市">
+            <el-select
+              lass="wp40 accountList"
+              v-model="editForm.accountNum"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(item, index) in 4"
+                :key="index"
+                :label="item"
+                :value="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="经济舱">
+            <el-input v-model="editForm.gatherIdent"></el-input>
+          </el-form-item>
+          <el-form-item label="商务舱">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="头等舱">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="出发时间">
+            <el-date-picker
+              v-model="editForm.gatheringTime"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+        </div>
+      </div>
+      <div>报价信息</div>
+      <div class="edit_form_box">
+        <div>
+          <el-form-item label="同行价">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="直客价">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="小孩占床减免">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="小孩不占床减免">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="三人房减免">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="单人房加价">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+        </div>
+      </div>
+
+      <div>控制信息</div>
+      <div class="edit_form_box">
+        <el-form-item label="同业网站销售">
+          <el-radio-group v-model="editForm.gatheringAddress">
+            <el-radio :label="3">备选项</el-radio>
+            <el-radio :label="6">备选项</el-radio>
+            <el-radio :label="9">备选项</el-radio>
+          </el-radio-group> </el-form-item
+        ><el-form-item label="直客网站销售">
+          <el-radio-group v-model="editForm.gatheringAddress">
+            <el-radio :label="3">备选项</el-radio>
+            <el-radio :label="6">备选项</el-radio>
+            <el-radio :label="9">备选项</el-radio>
+          </el-radio-group> </el-form-item
+        ><el-form-item label="开启在线预定">
+          <el-radio-group v-model="editForm.gatheringAddress">
+            <el-radio :label="3">备选项</el-radio>
+            <el-radio :label="6">备选项</el-radio>
+            <el-radio :label="9">备选项</el-radio>
+          </el-radio-group> </el-form-item
+        ><el-form-item label="允许订单修改">
+          <el-radio-group v-model="editForm.gatheringAddress">
+            <el-radio :label="3">备选项</el-radio>
+            <el-radio :label="6">备选项</el-radio>
+            <el-radio :label="9">备选项</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="允许报名候补">
+          <el-radio-group v-model="editForm.gatheringAddress">
+            <el-radio :label="3">备选项</el-radio>
+            <el-radio :label="6">备选项</el-radio>
+            <el-radio :label="9">备选项</el-radio>
+          </el-radio-group>
+        </el-form-item>
+      </div>
+      <div class="TravelFlightList">
+        <div class="TFAddFlight" @click="addFlight()">
+          <i class="iconfont icon-img_haha"></i>添加
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+export default {
+  data() {
+    return {
+      editForm: {},
+    };
+  },
+};
+</script>
\ No newline at end of file

src/components/airplane/apply.vue

+<style scoped>
+.wrapper {
+    width: 600px;
+    background: #fff;
+    margin: 0 auto;
+    padding: 20px;
+}
+</style>
+<template>
+  <div class="wrapper">
+    <el-form :model="editForm" label-width="100px">
+      <div class="edit_form_box">
+        <div>
+          <el-form-item label="业务名称">
+            <el-input v-model="editForm.leaderInfo"></el-input>
+          </el-form-item>
+          <el-form-item label="航空公司">
+            <el-select
+              lass="wp40 accountList"
+              v-model="editForm.accountNum"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(item, index) in 4"
+                :key="index"
+                :label="item"
+                :value="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+          <el-form-item label="航班号">
+            <el-select
+              lass="wp40 accountList"
+              v-model="editForm.accountNum"
+              placeholder="请选择"
+            >
+              <el-option
+                v-for="(item, index) in 4"
+                :key="index"
+                :label="item"
+                :value="index"
+              >
+              </el-option>
+            </el-select>
+          </el-form-item>
+        </div>
+        <div>
+          <el-form-item label="出发时间">
+            <el-date-picker
+              v-model="editForm.gatheringTime"
+              type="date"
+              placeholder="选择日期"
+            >
+            </el-date-picker>
+          </el-form-item>
+          <el-form-item label="经济舱">
+            <el-input v-model="editForm.gatherIdent"></el-input>
+          </el-form-item>
+          <el-form-item label="商务舱">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="头等舱">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="占位方式">
+            <el-radio-group v-model="editForm.gatheringAddress">
+              <el-radio :label="3">备选项</el-radio>
+              <el-radio :label="6">备选项</el-radio>
+              <el-radio :label="9">备选项</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="销售方式">
+            <el-radio-group v-model="editForm.gatheringAddress">
+              <el-radio :label="3">备选项</el-radio>
+              <el-radio :label="6">备选项</el-radio>
+              <el-radio :label="9">备选项</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="经济舱">
+            <div class="flex" v-for="(item, index) in baseList" :key="index">
+            <el-input style="width: 70px" v-model="item.start"></el-input>至
+            <el-input style="width: 70px" v-model="item.end"></el-input>:
+            <el-input style="width: 70px" v-model="item.max"></el-input>
+            <span @click="handleAddOrDelete(index)">{{index > 0 ? '删除' : '添加'}}</span>
+            </div>
+          </el-form-item>
+          <el-form-item label="商务舱">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="头等舱">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="合作伙伴">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="包机旅游集团">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+          <el-form-item label="是否显示">
+            <el-radio-group v-model="editForm.gatheringAddress">
+              <el-radio :label="3">备选项</el-radio>
+              <el-radio :label="6">备选项</el-radio>
+              <el-radio :label="9">备选项</el-radio>
+            </el-radio-group>
+          </el-form-item>
+          <el-form-item label="备注">
+            <el-input v-model="editForm.gatheringAddress"></el-input>
+          </el-form-item>
+        </div>
+      </div>
+      <div class="TravelFlightList">
+        <div class="TFAddFlight" @click="addFlight()">
+          <i class="iconfont icon-img_haha"></i>添加
+        </div>
+      </div>
+    </el-form>
+  </div>
+</template>
+<script>
+const baseInfo = {
+    start: '',
+    end: '',
+    max: ''
+}
+export default {
+  data() {
+    return {
+      editForm: {},
+      baseList: [this.createBaseInfo()]
+    };
+  },
+  methods: {
+    handleAddOrDelete(index) {
+        if(index) {
+            this.baseList.splice(index, 1)
+        } else {
+            this.baseList.push(this.createBaseInfo())
+        }
+    },
+    createBaseInfo() {
+        return JSON.parse(JSON.stringify(baseInfo))
+    }
+  }
+};
+</script>
\ No newline at end of file

src/plug/index.js

@@ -118,9 +118,9 @@ export default {
                 let lxymallUrl = ''; //国内游api
                 let crmUrl = ""; //crm API
                 let locationName = window.location.hostname;
-                domainUrl = "http://192.168.10.128";
+                // domainUrl = "http://192.168.10.128";
                 // domainUrl = "http://192.168.10.11:8083" // 刘东电脑
-                //  domainUrl = "http://192.168.10.206";
+                 domainUrl = "http://192.168.10.206:8015";
                 // domainUrl = "http://reborn.oytour.com";
                 let crmLocalFileStreamDownLoadUrl = "";
                 crmLocalFileStreamDownLoadUrl = locationName.indexOf('oytour') !== -1 ? "http://crm.oytour.com" : "http://testcrm.oytour.com";

src/router/config.js

@@ -2292,6 +2292,13 @@ export default {
                 title: '团控列表'
               },
             }, , {
+              path: '/TravelTeam', //包机列表
+              name: 'TravelTeam',
+              component: resolve => require(['@/components/TravelManager/TravelTeam/travelTeamList'], resolve),
+              meta: {
+                title: '包机列表'
+              },
+            }, {
               path: '/TravelSupplier', //供应商列表
               name: 'TravelSupplier',
               component: resolve => require(['@/components/newTravelManager/TravelGroupControl/TravelSupplier'], resolve),
@@ -5808,7 +5815,35 @@ export default {
           meta: {
             title: '供应商投诉'
           },
-        },
+        }, {
+          path: '/airplaneInfo', //包机信息
+          name: 'airplaneInfo',
+          component: resolve => require(['@/components/airplane/addInfo'], resolve),
+          meta: {
+            title: '包机信息'
+          },
+        }, {
+          path: '/airplaneGroup', //团控信息
+          name: 'airplaneGroup',
+          component: resolve => require(['@/components/airplane/airplaneGroup'], resolve),
+          meta: {
+            title: '团控信息'
+          },
+        }, {
+          path: '/airplaneGroup', //团控信息
+          name: 'airplaneGroup',
+          component: resolve => require(['@/components/airplane/airplaneGroup'], resolve),
+          meta: {
+            title: '团控信息'
+          },
+        }, {
+          path: '/airplane/apply', //团控信息
+          name: 'airplane/apply',
+          component: resolve => require(['@/components/airplane/apply'], resolve),
+          meta: {
+            title: '在线申请'
+          },
+        }
       ]
     },
     { // crm财务单据自动登录