页面修改

src/components/SalesModule/addPassenger.vue

@@ -1844,7 +1844,8 @@
         // 获取国内机场
         let msg = {
           City_id: 0,
-          Country_id: 2
+          Country_id: 2,
+          TrafficType: 1,
         };
         this.apipost(
           "airport_post_GetList",
@@ -1863,7 +1864,8 @@
         // 获取日本机场
         let msg = {
           City_id: 0,
-          Country_id: 651
+          Country_id: 651,
+          TrafficType: 1
         };
         this.apipost(
           "airport_post_GetList",

src/components/Ticketing/flightManagement.vue

@@ -407,7 +407,7 @@
           Arrival_city: "0",
           Arrival_airport: "0",
           Status: "0",
-          TrafficType:1
+          TrafficType: 1
         },
         addMsg: {
           ID: 0,
@@ -429,7 +429,7 @@
           synchronization: 0,
           StartDate: "",
           EndDate: "",
-          TrafficType:1,
+          TrafficType: 1,
         },
         SeasonTypeList: [],
         DataList: [],
@@ -551,7 +551,8 @@
       getaAirport(ID, blo) {
         //根据城市获取起飞机场
         let msg = {
-          City_id: ID
+          City_id: ID,
+          TrafficType: 1,
         };
         this.apipost(
           "airport_post_GetList",
@@ -590,7 +591,7 @@
           synchronization: 0,
           StartDate: "",
           EndDate: "",
-          TrafficType:1,
+          TrafficType: 1,
         };
         this.addMsg = newMsg;
       },
@@ -598,7 +599,8 @@
       getaStopAirport(ID, blo) {
         this.apipost(
           "airport_post_GetList", {
-            City_id: ID
+            City_id: ID,
+            TrafficType: 1,
           },
           res => {
             if (this.outerVisible) {
@@ -617,7 +619,8 @@
       getaArrivalAirport(ID, blo) {
         //根据城市获取到达机场
         let msg = {
-          City_id: ID
+          City_id: ID,
+          TrafficType: 1,
         };
         this.apipost(
           "airport_post_GetList",

src/components/Ticketing/trainManagement.vue

@@ -169,8 +169,10 @@
       <tr>
         <th width="">动车号</th>
         <th width="">出发城市</th>
+        <th width="">出发站点</th>
         <th>出发时间</th>
         <th>到达城市</th>
+        <th>达到站点</th>
         <th>到达时间</th>
         <th>{{$t("admin.admin_czPerson")}}</th>
         <th>{{$t("hotel.table_operattime")}}</th>
@@ -180,8 +182,10 @@
         <td>{{item.Flight_number}}
         </td>
         <td>{{item.DepartureCityName}}</td>
+        <td>{{item.DName}}</td>
         <td>{{item.Departure_time}}</td>
         <td>{{item.ArrivalCityName}}</td>
+        <td>{{item.AName}}</td>
         <td>{{item.Arrival_time}}</td>
         <td>{{item.emName}}</td>
         <td>{{item.UpdateDate}}</td>
@@ -216,21 +220,35 @@
           <el-input v-model="addMsg.Flight_number" placeholder="请填写动车号"></el-input>
         </el-form-item>
         <el-form-item label="出发城市" prop="Departure_city">
-          <el-select v-model="addMsg.Departure_city" filterable :placeholder="$t('system.ph_flightCity')">
+          <el-select v-model="addMsg.Departure_city" filterable placeholder="请选择出发城市"
+            @change="getaAirport(addMsg.Departure_city,false)">
             <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="出发车站" prop="Departure_airport">
+          <el-select v-model="addMsg.Departure_airport" filterable placeholder="请选择出发车站">
+            <el-option v-for='item in layer_Departure_airport' :key="item.ID" :label="item.Name" :value="item.ID">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="出发时间" prop="Departure_time" class='flightMg_delete_icon time'>
           <el-input type="text" v-model="addMsg.Departure_time" @keyup.native="checkTime(addMsg,'Departure_time')"
             maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
         </el-form-item>
         <el-form-item label="到达城市" prop="Arrival_city">
-          <el-select v-model="addMsg.Arrival_city" filterable :placeholder="$t('system.ph_flightCity')">
+          <el-select v-model="addMsg.Arrival_city" filterable placeholder="请选择到达城市"
+            @change="getaArrivalAirport(addMsg.Arrival_city,false)">
             <el-option v-for='item in cityList' :key="item.ID" :label="item.Name" :value="item.ID">
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="到达车站" prop="Arrival_airport">
+          <el-select v-model="addMsg.Arrival_airport" filterable placeholder="请选择到达车站">
+            <el-option v-for='item in layer_Arrival_airport' :key="item.ID" :label="item.Name" :value="item.ID">
+            </el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item label="到达时间" prop="Arrival_time" class='flightMg_delete_icon time'>
           <el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="checkTime(addMsg,'Arrival_time')"
             maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
@@ -422,7 +440,8 @@
       getaAirport(ID, blo) {
         //根据城市获取起飞机场
         let msg = {
-          City_id: ID
+          City_id: ID,
+          TrafficType: 2,
         };
         this.apipost(
           "airport_post_GetList",
@@ -461,7 +480,7 @@
           synchronization: 0,
           StartDate: "",
           EndDate: "",
-          TrafficType:2,
+          TrafficType: 2,
         };
         this.addMsg = newMsg;
       },
@@ -469,7 +488,8 @@
       getaStopAirport(ID, blo) {
         this.apipost(
           "airport_post_GetList", {
-            City_id: ID
+            City_id: ID,
+            TrafficType: 2,
           },
           res => {
             if (this.outerVisible) {
@@ -486,9 +506,10 @@
         );
       },
       getaArrivalAirport(ID, blo) {
-        //根据城市获取到达机场
+        //根据城市获取到达车站
         let msg = {
-          City_id: ID
+          City_id: ID,
+          TrafficType: 2,
         };
         this.apipost(
           "airport_post_GetList",

src/components/TravelManager/TravelList/TravelControlList.vue

@@ -467,14 +467,17 @@
                           class="TCL-flighInfoList">
                           <span class="travelnowrap">
                             <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
-                            <span v-if="subItem.DIATA">({{subItem.DIATA}})</span>{{subItem.DepartureName}}
+                            <span><template v-if="subItem.DIATA">({{subItem.DIATA}})</template>
+                            <template  v-else>({{subItem.dName}})</template></span>
+                            {{subItem.DepartureName}}
                             {{subItem.StopoverName==''?'':'-('+subItem.StopoverIATA+')'+subItem.StopoverName}}
                             <template v-if="subItem.ArrivalCityName">
                               <span v-if="subItem.AIATA">
-                               -({{subItem.AIATA}})
+                                -({{subItem.AIATA}})
                               </span>
                               <span v-else>-</span>
                               {{subItem.ArrivalCityName}}
+                              <template  v-if="!subItem.DIATA">({{subItem.aName}})</template>
                             </template>
                             <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>
                             <span v-else class="TCL-redType">【{{$t('visa.v_zanding')}}】</span>
@@ -486,7 +489,7 @@
                           class="TCL-flighInfoList">
                           <span class="travelnowrap">
                             <span class="TCL-FlightNumber">{{subItem.Flight_number}}</span>
-                            {{subItem.aName}} {{subItem.Departure_time}}  
+                            {{subItem.aName}} {{subItem.Departure_time}}
                             -
                             {{subItem.dName}} {{subItem.Arrival_time}}
                             <span v-if="subItem.FlightState==1" class="TCL-greenType">【OK】</span>

src/components/systemManagement/airportManagement.vue

@@ -160,7 +160,8 @@
           City_id: '',
           Name: '',
           IATA: '',
-          ICAO: ''
+          ICAO: '',
+          TrafficType:1,//机场
         },
         addMsg: {
           ID: '',
@@ -176,7 +177,8 @@
           //经
           Lng:'',
           //纬
-          Lat:''
+          Lat:'',
+          TrafficType:1,//机场
         },
         DataList: [],
         BranchGetList: [],

src/router/config.js

@@ -1139,7 +1139,14 @@ export default {
               meta: {
                 title: '机场管理'
               },
-
+            },
+            {
+              path: '/stationManagement', //车站管理
+              name: 'stationManagement',
+              component: resolve => require(['@/components/systemManagement/stationManagement'], resolve),
+              meta: {
+                title: '车站管理'
+              },
             },
             {
               path: '/aviationConfiguration', //航空模板配置