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

src/components/Ticketing/trainManagement.vue

@@ -127,7 +127,15 @@
     <div class="query-box">
       <ul>
         <li>
-          <label>火车编号</label>
+          <label>交通类型</label>
+          <el-select v-model="msg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
+            <el-option label="火车" :value='2'></el-option>
+            <el-option label="轮船" :value='3'></el-option>
+            <el-option label="巴士" :value='4'></el-option>
+          </el-select>
+        </li>
+        <li>
+          <label>班次号</label>
           <el-input v-model="msg.Flight_number" placeholder="" @keyup.native.enter="getList" class="w210"></el-input>
         </li>
         <li>
@@ -167,26 +175,29 @@
     </div>
     <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
       <tr>
-        <th width="">动车号</th>
+        <th>交通类型</th>
+        <th width="">班次号</th>
         <th width="">出发城市</th>
         <th width="">出发站点</th>
         <th>出发时间</th>
         <th>到达城市</th>
         <th>达到站点</th>
         <th>到达时间</th>
+        <th>用时</th>
         <th>{{$t("admin.admin_czPerson")}}</th>
         <th>{{$t("hotel.table_operattime")}}</th>
         <th width="200">{{$t("admin.admin_operate")}}</th>
       </tr>
       <tr v-for="(item,index) in DataList" :key="index">
-        <td>{{item.Flight_number}}
-        </td>
+        <td>{{item.TrafficType==2?'火车':item.TrafficType==3?'轮船':'巴士'}}</td>
+        <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.FlyTime}}</td>
         <td>{{item.emName}}</td>
         <td>{{item.UpdateDate}}</td>
         <td style="position: relative;">
@@ -216,8 +227,15 @@
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
       :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="120px">
-        <el-form-item label="动车号" prop="Flight_number" class="other_input">
-          <el-input v-model="addMsg.Flight_number" placeholder="请填写动车号"></el-input>
+        <el-form-item label="交通类型">
+          <el-select v-model="addMsg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
+            <el-option label="火车" :value='2'></el-option>
+            <el-option label="轮船" :value='3'></el-option>
+            <el-option label="巴士" :value='4'></el-option>
+          </el-select>
+        </el-form-item>
+        <el-form-item label="班次号" prop="Flight_number" class="other_input">
+          <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="请选择出发城市"
@@ -253,6 +271,10 @@
           <el-input type="text" v-model="addMsg.Arrival_time" @keyup.native="checkTime(addMsg,'Arrival_time')"
             maxlength="5" :placeholder="$t('system.ph_time')"></el-input>
         </el-form-item>
+        <el-form-item label="用时">
+          <el-input type="text" v-model="addMsg.FlyTime" @keyup.native="checkTime(addMsg,'FlyTime')" maxlength="5"
+            :placeholder="$t('system.ph_time')"></el-input>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <button class="normalBtn" type="primary" @click="submitForm('addMsg')">{{$t('pub.saveBtn')}}</button> &nbsp;
@@ -296,7 +318,7 @@
           Arrival_city: "0",
           Arrival_airport: "0",
           Status: "0",
-          TrafficType: 2,
+          TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
         },
         addMsg: {
           ID: 0,
@@ -318,7 +340,8 @@
           synchronization: 0,
           StartDate: "",
           EndDate: "",
-          TrafficType: 2
+          TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
+          FlyTime: "", //用时
         },
         SeasonTypeList: [],
         DataList: [],
@@ -441,7 +464,7 @@
         //根据城市获取起飞机场
         let msg = {
           City_id: ID,
-          TrafficType: 2,
+          TrafficType: this.addMsg.TrafficType,
         };
         this.apipost(
           "airport_post_GetList",
@@ -481,35 +504,16 @@
           StartDate: "",
           EndDate: "",
           TrafficType: 2,
+          FlyTime: "",
         };
         this.addMsg = newMsg;
       },
-      //根据城市获取经停机场
-      getaStopAirport(ID, blo) {
-        this.apipost(
-          "airport_post_GetList", {
-            City_id: ID,
-            TrafficType: 2,
-          },
-          res => {
-            if (this.outerVisible) {
-              if (!blo) {
-                this.addMsg.Stopover_airport = "";
-              }
-              this.layer_Stopover_airport = res.data.data;
-            } else {
-              this.msg.Stopover_airport = "0";
-              this.Stopover_airport = res.data.data;
-            }
-          },
-          err => {}
-        );
-      },
+
       getaArrivalAirport(ID, blo) {
         //根据城市获取到达车站
         let msg = {
           City_id: ID,
-          TrafficType: 2,
+          TrafficType: this.addMsg.TrafficType,
         };
         this.apipost(
           "airport_post_GetList",
@@ -656,12 +660,9 @@
           msg,
           res => {
             var newMsg = res.data.data;
+            this.addMsg = res.data.data;
             this.getaAirport(newMsg.Departure_city, true);
-            if (newMsg.Stopover_city) {
-              this.getaStopAirport(newMsg.Stopover_city, true);
-            }
             this.getaArrivalAirport(newMsg.Arrival_city, true);
-            this.addMsg = res.data.data;
           },
           err => {}
         );

src/components/systemManagement/stationManagement.vue

@@ -43,6 +43,14 @@
             </el-option>
           </el-select>
         </li>
+        <li>
+          <label>交通类型</label>
+          <el-select v-model="msg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
+            <el-option label="火车" :value='2'></el-option>
+            <el-option label="轮船" :value='3'></el-option>
+            <el-option label="巴士" :value='4'></el-option>
+          </el-select>
+        </li>
         <li>
           <label class="margin_left_30">{{$t('system.query_airName')}}</label>
           <el-input v-model="msg.Name" :placeholder="$t('system.ph_in')" @keyup.native.enter="getList" class="w210">
@@ -55,20 +63,24 @@
             <el-option key="1" label="删除" value="1"></el-option>
           </el-select>
         </li>
-        <li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')" @click="resetPageIndex(),getList()" />
-          <input type="button" class="normalBtn" value="添加" @click="initAddMsg(),outerVisible=true,dialogTitle='新增车站'" /></li>
+        <li><input type="button" class="hollowFixedBtn" :value="$t('pub.searchBtn')"
+            @click="resetPageIndex(),getList()" />
+          <input type="button" class="normalBtn" value="添加"
+            @click="initAddMsg(),outerVisible=true,dialogTitle='新增车站'" /></li>
       </ul>
     </div>
-    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0" v-loading="loading">
+    <table class="singeRowTable" border="0" cellspacing="0" cellpadding="0">
       <tr>
+        <th>交通类型</th>
         <th>{{$t('system.query_airName')}}</th>
-
         <th>{{$t('system.table_city')}}</th>
         <th>{{$t('hotel.table_operater')}}</th>
         <th>{{$t('hotel.table_operattime')}}</th>
         <th>{{$t('system.table_operation')}}</th>
       </tr>
-      <tr v-for="(item,index) in DataList">
+      <tbody v-loading="loading">
+        <tr v-for="(item,index) in DataList" :key="`d_`+index">
+          <td>{{item.TrafficType==2?'火车':item.TrafficType==3?'轮船':'巴士'}}</td>
           <td>{{item.Name}}</td>
           <td>{{item.CityName}}</td>
           <td>{{item.EmName}}</td>
@@ -88,6 +100,7 @@
             </el-tooltip>
           </td>
         </tr>
+      </tbody>
     </table>
     <div class="noData" v-show="noData">
       {{$t('system.content_noData')}}
@@ -98,6 +111,13 @@
     <el-dialog custom-class='addCompany' :title="dialogTitle" :visible.sync="outerVisible" center
       :before-close="closeChangeMachie">
       <el-form :model="addMsg" :rules="rules" ref="addMsg" label-width="100px">
+        <el-form-item label="交通类型">
+          <el-select v-model="addMsg.TrafficType" filterable :placeholder="$t('system.ph_buxian')" class="w210">
+            <el-option label="火车" :value='2'></el-option>
+            <el-option label="轮船" :value='3'></el-option>
+            <el-option label="巴士" :value='4'></el-option>
+          </el-select>
+        </el-form-item>
         <el-form-item :label="$t('system.table_country')" prop="Country_id">
           <el-select v-model="addMsg.Country_id" filterable :placeholder="$t('system.ph_buxian')"
             @change="getProvinceListLayer(addMsg.Country_id,1)" class="w210">
@@ -157,7 +177,7 @@
           Name: '',
           IATA: '',
           ICAO: '',
-          TrafficType: 2, //车站
+          TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
         },
         addMsg: {
           ID: '',
@@ -170,15 +190,11 @@
           IATA: '',
           ICAO: '',
           RankNum: '',
-          //经
-          Lng: '',
-          //纬
-          Lat: '',
-          TrafficType: 2, //车站
+          Lng: '', //经
+          Lat: '', //纬
+          TrafficType: 2, //交通类型(1-飞机,2-火车,3-轮船,4-巴士)
         },
         DataList: [],
-        BranchGetList: [],
-        lineList: [],
         countryList: '',
         provinceList: '',
         cityList: '',