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

src/components/FinancialModule/FinancialDocuments.vue

@@ -308,13 +308,13 @@
                     <li>
                         <span>
                             <em>{{$t('scen.sc_temID')}}</em>
-                            <el-input v-model="msg.TCID" class="w150"></el-input> 
+                            <el-input v-model="msg.TCID" class="w150" @keyup.native="checkInteger(msg,'TCID')"></el-input> 
                         </span>
                     </li>
                     <li>
                         <span>
                             <em>{{$t('fnc.ddbianhao')}}</em>
-                            <el-input v-model="msg.OrderID" class="w150"></el-input> 
+                            <el-input v-model="msg.OrderID" class="w150" @keyup.native="checkInteger(msg,'OrderID')"></el-input> 
                         </span>
                     </li>
                     <li>

src/components/busManagement/BusInfo.vue

@@ -625,7 +625,7 @@
       getBusTypeList() {
         this.apipost(
           "bus_get_GetBusTypePriceList",
-          null,
+          {StartDate:this.parametersData.StartDate},
           res => {
             if (res.data.resultCode == 1) {
               this.BusTypeList = res.data.data;

src/components/busManagement/busArrangement.vue

@@ -565,7 +565,7 @@ export default {
       var that = this;
       this.tripTitle = title;
       this.$nextTick(() => {
-        that.$refs.comTeam.GetTrip(id);
+        that.$refs.comTeam.GetTrip(0,id);
       });
       that.outerVisible = true;
     },