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

src/assets/css/UpgradedVersion.css

@@ -147,6 +147,21 @@ img {
   background: url('http://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png') repeat;
   /* background-size: 100% 100%; */
 }
+.VerticalBjNew .travelDaysTitlle-left-text{
+  background: url('../img/trip/bjHP4.png')no-repeat center;
+  background-size: auto 100%;
+}
+.travelControlTrip.VerticalBjNew{
+  background: url('../img/trip/bjHP3.png') repeat;
+  background-size: 1240px 1754px;
+}
+.UpgradedVersion-homebj.VerticalBjNew{
+  background: url('../img/trip/bjHP3.png') repeat;
+  background-size: 1240px 1754px;
+}
+.VerticalBjNew .UpgradedVersionBJ{
+  background: none;
+}
 .UpgradedVersion-introduceBj{
   background: url('http://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png') repeat;
   /* background-size: 100% 100%; */

src/assets/css/tripIndexNew2.css

@@ -202,6 +202,8 @@ html, body{
 }
 .UpgradedVersionBJ{
   background: url(http://imgfile.oytour.com/Static/NewTripFeature/otherBjTwo.png) repeat;
+  /* background: url('../img/trip/bjHP2.png')repeat; */
+  /* background-size: 1240px 1754px ; */
 }
 .UpgradedVersion2Line{
   height: 0px;
@@ -238,6 +240,9 @@ html, body{
 .hangban-info {
     background: #FFF !important;
 }
+.VerticalBjNew .hangban-info {
+  background: none !important;
+}
 
 .trip-v3-base {
     margin-top: 20px !important;

src/components/FinancialModule/Kingdee/RecPayQuery.vue

@@ -678,7 +678,7 @@
               </el-form>
             </div>
       <div>
-        <span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据   &nbsp;&nbsp;&nbsp; 2、团成本对接系统抓取团队所有的成本单据,不包含‘月结单’与‘多账户合并付款’与‘多币种账户付款’单据 </span>
+        <span style="font-size: 13px; color:coral">*注意: 1、团费对接系统抓取'所有订单相关'和'客户预存与抵用'单据   &nbsp;&nbsp;&nbsp; 2、团成本对接系统抓取团队所有的成本单据,不包含‘月结单’与‘多币种账户付款’单据 </span>
       </div>
       <div class="query-box" style="padding: 0;border: 0;">
         <ul class="clearfix">
@@ -869,6 +869,7 @@
             {Name:'团费对接',Id:1},
             {Name:'资金调拨',Id:2},
             {Name:'团队成本',Id:3},
+            {Name:'日常费用',Id:4},
           ],
           showID: false,
           active: 1,

src/components/LeaveGroupDownload/index.vue

 <template>
   <div id="pdf_1" v-if="orderMsg&&dataAll">
     <div class="UpgradedVersion-box relative"
-    :class="[dataAll.featurePageType==2?'UpgradedVersion-homebj':'UpgradedVersion-homebjHV']"
-    :style="{'width':dataAll.featurePageType==2?'1123px':'1754px',
-    'height':dataAll.featurePageType==2?'1478px':'1240px'}">
-      <div class="absolute z-index1 column" style="left: 0;right: 0; top: 0;bottom: 0;">
+    :class="[dataAll.featurePageType==2?'UpgradedVersion-homebj':'UpgradedVersion-homebjHV',
+    dataAll.feature.featureType==9?'VerticalBjNew':'']"
+    :style="{'width':dataAll.featurePageType==2?'1240px':'1754px',
+    'height':dataAll.featurePageType==2?'1754px':'1754px'}">
+      <div class="absolute z-index1 column UpgradedVersionBJ" style="left: 0;right: 0; top: 0;bottom: 0;">
         <template v-if="dataAll.featurePageType==2">
-          <Header :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
+          <Header v-if="dataAll.feature.featureType!=9" :TripColor="dataAll&&dataAll.tripColor" :orderMsg="orderMsg"></Header>
           <div class="travelDaysTitlle row-aic" :style="{'background':backgroundColor}">
             <div class="travelDaysTitlle-left">
               <div class="relative">
@@ -266,7 +267,7 @@
 
 
         <!-- otherJourney-footer -->
-        <div v-if="dataAll.featurePageType==2">
+        <div v-if="dataAll.featurePageType==2&&dataAll.feature.featureType!=9">
           <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
             <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.tripColor}">&nbsp;</div>
             <div class="introduceFooterBJ introduceFootertTwo" :style="{'background':dataAll.tripColor}">&nbsp;</div>

src/components/LeaveGroupDownload/travelDays.vue

 <template>
   <div id="pdf_3" v-if="vshowD">
-    <div style="width: 1123px;">
+    <div style="width: 1240px;">
       <template v-for="(i,index) in feature.detailsImageList">
         <img :key="index" :src="feature.headerImage" style="width:100%;display: block;">
         <img :key="index+100000" :src="i" style="width:100%;display: block;">
@@ -8,7 +8,7 @@
       </template>
     </div>
     <div style="display: none;" class="UpgradedVersion-boxHeight height UpgradedVersion-homebj relative" v-for="(item,index) in tripList">
-      <div class="z-index1">
+      <div class="z-index1 UpgradedVersionBJ">
         <Header :TripColor="dataAll.tripColor" :orderMsg="orderMsg"></Header>
         <div class="travelDaysTitlle row-aic">
           <div class="travelDaysTitlle-left">

src/components/SalesModule/signedFinanceCheck.vue

@@ -1156,6 +1156,9 @@ input[type="number"] {
             class="w216"
           ></el-input>
         </el-form-item>
+        <el-form-item label="交易日期">
+          <el-date-picker value-format="yyyy-MM-dd" class="w217" v-model="addMsg.TradeDate" type="date"></el-date-picker>
+        </el-form-item>
         <el-form-item label="审核意见">
   <el-radio-group v-model="addMsg.Status">
     <el-radio :label="1">通过</el-radio>

src/components/TravelManager/TravelList/DistributionTransport.vue

@@ -72,7 +72,7 @@
     <div class="DT_rightList">
       <div class="TMTitle"><i></i>联运设置</div>
       <!--保存-->
-      <input type='button' class="normalBtn" @click="SaveUnion()" value="保存"></input>
+      <input type='button' class="normalBtn" @click="SaveUnion()" value="保存" />
       <table class="singeRowTable DT_Table" border="0" cellspacing="0" cellpadding="0">
         <tbody>
           <tr>
@@ -128,6 +128,9 @@
             <th width="160">
               集合地点
             </th>
+            <th width="160">
+              隐藏航班
+            </th>
             <th width="150">
               操作
             </th>
@@ -197,6 +200,13 @@
             <td rowspan="2">
               <el-input class="w150" v-model="item.GatherAddress"></el-input>
             </td>
+            <td rowspan="2">
+              <el-select class="w200" filterable v-model="item.NotShowFlightIdsList" multiple clearable>
+                <el-option v-for="subItem in TravelFlightList" :label='subItem.Flight_number' :value='subItem.ID'
+                  :key="subItem.subCode">
+                </el-option>
+              </el-select>
+            </td>
             <td rowspan="2">
               <el-button type="danger" icon="iconfont icon-guanbi" circle @click="DeleteUnion(item,index)"></el-button>
               <el-popover width="400" trigger="click">
@@ -273,9 +283,9 @@
         </tbody>
         <tfoot>
           <tr>
-            <td colspan="12">
+            <td colspan="13">
               <input v-if="ChoosrPriceArray!=null && ChoosrPriceArray.length>0" type='button' class="normalBtn"
-                @click="AddItem()" value="新增"></input>
+                @click="AddItem()" value="新增" />
             </td>
           </tr>
         </tfoot>
@@ -338,10 +348,23 @@
             ID: 2,
             Name: "后两天"
           }
-        ]
+        ],
+        //团绑定的航班列表
+        TravelFlightList: [],
       };
     },
     methods: {
+      //根据团号获取团绑定的航班列表
+      getTravelPriceFlight(TCID) {
+        this.apipost(
+          "travel_post_GetFlightListByTCID", {
+            TCID: TCID
+          },
+          res => {
+            this.TravelFlightList = res.data.data;
+          },
+        );
+      },
       //交通类型切换
       getTrafficType1(item, type) {
         item.FlightList = [];
@@ -383,6 +406,7 @@
           //出团公司
           OutBranchId: item.OutBranchId
         };
+        this.getTravelPriceFlight(item.TCID);
         switch (item.checkState) {
           //未选中====>选中
           case this.ShowStatusList.NoChecked:
@@ -573,6 +597,8 @@
           ArrList: [],
           GoTrafficType: 1, //去程交通类型
           BackTrafficType: 1, //回程交通类型
+          NotShowFlightIdsList: [], //不显示航班下拉列表
+          NotShowFlightIds: "", //不显示航班
         });
       },
       //保存联运信息数据

src/components/confirmationOrderDownLoadNew.vue

@@ -23,7 +23,8 @@
 </style>
 
 <template>
-  <div class="travelControlTrip" :style="{'width':dataAll&&dataAll.featurePageType==2?'1123px':'1754px'}">
+  <div class="travelControlTrip" :style="{'width':dataAll&&dataAll.featurePageType==2?'1240px':'1754px'}"
+    :class="[dataAll&& dataAll.feature&& dataAll.feature.featureType==9?'VerticalBjNew':'']">
     <div class="trip_cover" v-show="pdfLoading" v-loading="pdfLoading"></div>
     <el-row style="padding: 0 0 20px 0;box-shadow: 1px 10px 10px#e6e6e6;">
       <el-col :span="14" class="row-aic">
@@ -54,9 +55,9 @@
     <div id="pdfNode" class="LeaveGroupDownload-form LeaveGroupDownload-formHV">
       <div id="pdfDom" :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHV':'']">
         <!-- 首页 -->
-        <LeaveGroupDownload :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHVIndex':'']" :dataAll="dataAll" :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc"
-          :orderMsg="orderMsg" :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId"
-          :priceList="priceList">
+        <LeaveGroupDownload :class="[dataAll&&dataAll.featurePageType==1?'pdfDomHVIndex':'']" :dataAll="dataAll"
+          :vshowJ="vshowJ" :vshowL="vshowL" :WeiXinShareImgSrc="WeiXinShareImgSrc" :orderMsg="orderMsg"
+          :orderTripdiff="orderTripdiff" :vshowLLR="vshowLLR" :vshowB="vshowB" :lineId="lineId" :priceList="priceList">
         </LeaveGroupDownload>
         <!-- 行程特色 -->
         <ItineraryFeatures :dataAll="dataAll" :feature="feature" :vshowC="vshowC" :showType="showType">

src/components/newTravelmanager/TravelGroupControl/TravelManagerThree.vue

@@ -884,6 +884,7 @@
                 this.PostConfig.CountryID = tempData.CountryID;
                 this.PostConfig.TeamType = tempData.TeamType;
                 this.PostConfig.FeaturePageType = tempData.FeaturePageType;
+                this.PostConfig.FeatureType = tempData.Feature.FeatureType
                 //视频地址
                 this.PostConfig.VideoStr = tempData.VideoStr;
                 this.PostConfig.OpenTeamDescribe = tempData.OpenTeamDescribe;

src/components/newTravelmanager/travelLineTrip/components/travelDays.vue

@@ -2,7 +2,8 @@
   <div :style="{'height':item.zoom==1?'auto':'100%',
 'overflow':item.zoom==1?'auto':'hidden'}"
    v-if="RenderingOk">
-    <div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" :style="{'zoom': item.zoom}">
+    <div class="UpgradedVersion-box2 UpgradedVersion-homebj relative" :style="{'zoom': item.zoom}"
+    :class="[dataAll.FeatureType==9?'VerticalBjNew':'']">
       <div class="z-index1 UpgradedVersionBJ" style="left: 0;right: 0; top: 0;bottom: 0;">
         <div :id="'LineOfTravel'+(item*4)+'_0'+index">
           <!-- <Header :TripColor="dataAll.TripColor" :orderMsg="dataAll"></Header> -->
@@ -844,6 +845,7 @@
         </div>
 
         <!-- otherJourney-footer -->
+        <!--
         <div v-if="item.zoom!=1" :class="[item.zoom==1?'':'footer']">
           <div class="otherJourney-introduceFooter absolute z-index1 row-aic" :style="{'background':''}">
             <div class="introduceFooterBJ introduceFooterOne" :style="{'background':dataAll.TripColor}">&nbsp;</div>
@@ -855,7 +857,8 @@
             <div class="introduceFooterBJ introduceFootertThree" :style="{'background':dataAll.TripColor}">&nbsp;</div>
             <div class="introduceFooterBJ introduceFootertFour" :style="{'background':dataAll.TripColor}">&nbsp;</div>
           </div>
-        </div>
+        </div> -->
+        <div style="height: 40px;"></div>
       </div>
       <div class="UpgradedVersion2Line absolute z-index3 row-ajc">
         <span>{{pageHeight>1754?'超出内容分割到下一页':'底线'}}</span>