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

src/assets/css/endTravelManager.css

@@ -602,7 +602,9 @@
     position:absolute;
     height:40px;
     top:42%;
-    left:42%;
+    left:50%;
+    transform: translate3d(-50%,-50%,0);
+    width: 180px;
     display:none;
     text-align:center;
     z-index:3
@@ -611,7 +613,6 @@
     display: inline-block;
     width: 40px;
     height: 40px;
-    /* display:none; */
     border-radius: 50%;
     line-height: 40px;
     color: #fff;

src/components/TravelManager/TravelList/OpTripList.vue

@@ -11,7 +11,7 @@
             <span>
               <em>{{$t('system.table_ssLine')}}</em>
               <el-select class='w150' v-model="queryMsg.LineId" filterable :placeholder="$t('pub.pleaseSel')"
-                @change="getLineTeamList()">
+               @change="getLinePlaceList()">
                 <el-option :label="$t('pub.unlimitedSel')" :value='queryCommonData.SelectDefaultValue'></el-option>
                 <el-option v-for="item in queryCommonData.LineList" :label='item.LineName' :value='item.LineID'
                   :key='item.LineID'>
@@ -19,6 +19,15 @@
               </el-select>
             </span>
           </li>
+          <li>
+            <span>
+              <em>{{$t('Operation.Op_Country')}}/{{$t('system.query_dest')}}</em>
+              <el-select class="w150" v-model="queryMsg.PlaceID" filterable :placeholder="$t('pub.pleaseSel')" @change="getLineTeamList()">
+                <el-option :label="$t('pub.unlimitedSel')" :value="queryCommonData.SelectDefaultValue"></el-option>
+                <el-option v-for="item in queryCommonData.PlaceList" :label="item.PlaceName" :value="item.PlaceID" :key="item.LtID"></el-option>
+              </el-select>
+            </span>
+          </li>
           <li>
             <span>
               <em>{{$t('active.ad_xlmc')}}</em>
@@ -149,6 +158,8 @@
         queryCommonData: {
           //线路列表
           LineList: [],
+          //目的地
+          PlaceList: [],
           //系列列表
           LineTeamList: [],
           //下拉框默认值
@@ -166,6 +177,7 @@
           pageSize: 10,
           LineId: 0,
           LineteamId: 0,
+          PlaceID:0,
           CreateBy: 0,
           TeamType: 0,
           TCNUMS: "",
@@ -239,29 +251,50 @@
           );
         });
       },
-      //获取线路列表
-      getLineList() {
-        this.apipost("line_post_GetList", {
-          "LineDirection": 2
-        }, res => {
-          if (res.data.resultCode == 1) {
-            this.queryCommonData.LineList = res.data.data;
-          }
-        });
-      },
-      //获取系列列表
-      getLineTeamList() {
-        this.queryMsg.LineteamId = 0;
-        let msg = {
-          lineID: this.queryMsg.LineId,
-          isTOOP: 1
-        };
-        this.apipost("team_post_GetList", msg, res => {
-          if (res.data.resultCode == 1) {
-            this.queryCommonData.LineTeamList = res.data.data;
-          }
-        });
-      },
+          //获取线路列表
+        getLineList() {
+            this.apipost(
+                "line_post_GetList",
+                {
+                    LineDirection: 2
+                },
+                res => {
+                    if (res.data.resultCode == 1) {
+                        this.queryCommonData.LineList = res.data.data;
+                        this.queryCommonData.PlaceList = [];
+                        this.queryCommonData.LineTeamList = [];
+                    }
+                }
+            );
+        },
+        //获取目的地列表
+        getLinePlaceList() {
+            this.queryMsg.PlaceID = 0;
+            this.queryMsg.LineteamId = 0;
+            let msg = {
+                lineID: this.queryMsg.LineId
+            };
+            this.apipost("team_post_GetLinePlace", msg, res => {
+                if (res.data.resultCode == 1) {
+                    this.queryCommonData.PlaceList = res.data.data;
+                    this.queryCommonData.LineTeamList = [];
+                }
+            });
+        },
+        //获取系列列表
+        getLineTeamList() {
+            this.queryMsg.LineteamId = 0;
+            let msg = {
+                lineID: this.queryMsg.LineId,
+                placeID: this.queryMsg.PlaceID,
+                isTOOP: 1
+            };
+            this.apipost("team_post_GetList", msg, res => {
+                if (res.data.resultCode == 1) {
+                    this.queryCommonData.LineTeamList = res.data.data;
+                }
+            });
+        },
       //新获取列表数据
       getControlList() {
         var msg = JSON.parse(JSON.stringify(this.queryMsg));

src/components/newTravelmanager/travelLineTrip/ScenicTraffic.vue

@@ -50,7 +50,7 @@
           </div>
           酒店出发
         </div>
-        <div class="St_current" style="margin-bottom:10px">
+        <div class="St_current" style="margin-bottom:20px" v-else-if="CurrentDayNum==1">
             <!--{{trafficObj.trafficIntroduce.IntroduceTitle}}-->
           <template
             v-if="trafficObj.trafficIntroduce.IntroduceTitle">机场</template>
@@ -82,6 +82,15 @@
           </div>
           回酒店
         </div>
+        <div class="St_current" style="margin:10px 0px;" v-else >
+            <!--{{trafficObj.trafficIntroduce.IntroduceTitle}}-->
+          <template
+            v-if="trafficObj.trafficIntroduce.IntroduceTitle">机场</template>
+          <template v-else>机场</template>
+          <div class="St_radioDiv Str1">
+            <i class="iconfont icon-Shape1"></i>
+          </div>
+        </div>
       </div>
       <div v-else>
         <div v-if="CurrentDayNum!=1" class="St_current" style="margin-bottom:20px;">