合并分支 'ExportOrder' 到 'master'

Export order



查看合并请求 !35

@@ -82,7 +82,7 @@ import Location from './views/empt/Location.vue'
 
 
 //运输工具 通用业务申报
 //运输工具 通用业务申报
 import Route from './views/airtransport/route.vue'
 import Route from './views/airtransport/route.vue'
-import Bill from './views/airtransport/bill.vue'
+import Bills from './views/airtransport/bills.vue'
 import Flight from './views/airtransport/flight.vue'
 import Flight from './views/airtransport/flight.vue'
 import Flightplan from './views/airtransport/flightplan.vue'
 import Flightplan from './views/airtransport/flightplan.vue'
 import Aircraft from './views/airtransport/aircraft.vue'
 import Aircraft from './views/airtransport/aircraft.vue'
@@ -188,6 +188,7 @@ import Telegram from './views/nav3/Telegram.vue'
 import TeleAddr from "./views/nav3/TeleAddr.vue";
 import TeleAddr from "./views/nav3/TeleAddr.vue";
 //朱总让做的网页在线客服
 //朱总让做的网页在线客服
 import Webdialog from './views/bus/Webdialog.vue'
 import Webdialog from './views/bus/Webdialog.vue'
+import C6Way from './views/nav3/C6Way.vue'
 
 
 //转运申请
 //转运申请
 import Transport from './views/nav4/Transport.vue'
 import Transport from './views/nav4/Transport.vue'
@@ -276,7 +277,8 @@ let routes = [
             {path: '/Way', component: Way, name: '货运单'},
             {path: '/Way', component: Way, name: '货运单'},
             {path: '/Telegram', component: Telegram, name: '电报查询'},
             {path: '/Telegram', component: Telegram, name: '电报查询'},
             {path: '/Webdialog', component: Webdialog, name: '在线客服'},
             {path: '/Webdialog', component: Webdialog, name: '在线客服'},
-            {path: '/TeleAddr', component: TeleAddr, name: '电报地址'}
+            {path: '/TeleAddr', component: TeleAddr, name: '电报地址'},
+            {path: '/C6Way', component: C6Way, name: 'C6货运单'},
         ]
         ]
     },
     },
     {
     {
@@ -509,7 +511,7 @@ let routes = [
         iconCls:'el-icon-goods',
         iconCls:'el-icon-goods',
         children:[
         children:[
             {path:'/route',component:Route,name:'航线申报'},
             {path:'/route',component:Route,name:'航线申报'},
-            {path:'/bill',component:Bill,name:'单据申报'},
+            {path:'/bills',component:Bills,name:'单据申报'},
             {path:'/flights',component:Flight,name:'航班申报'},
             {path:'/flights',component:Flight,name:'航班申报'},
             {path:'/flightplan',component:Flightplan,name:'当日飞行计划'},
             {path:'/flightplan',component:Flightplan,name:'当日飞行计划'},
             {path:'/aircraft',component:Aircraft,name:'通用航空器申报'},
             {path:'/aircraft',component:Aircraft,name:'通用航空器申报'},

@@ -442,7 +442,7 @@
             //编辑单据查询
             //编辑单据查询
             handleEdit(index,row){
             handleEdit(index,row){
 
 
-               this.$router.push({path:'/bill',query:row});
+               this.$router.push({path:'/bills',query:row});
 
 
             },
             },
             //分页
             //分页

@@ -130,7 +130,7 @@
                     <el-pagination
                     <el-pagination
                             @size-change="handleSizeChange"
                             @size-change="handleSizeChange"
                             @current-change="handleCurrentChange"
                             @current-change="handleCurrentChange"
-                            :current-page="currentPage"
+                            :current-page="pageNum"
                             :page-sizes="[10, 20, 30, 40]"
                             :page-sizes="[10, 20, 30, 40]"
                             :page-size="pageSize"
                             :page-size="pageSize"
                             layout="total, sizes, prev, pager, next, jumper"
                             layout="total, sizes, prev, pager, next, jumper"
@@ -208,7 +208,7 @@
                     awcd:''
                     awcd:''
                 },
                 },
                 labelPosition:'left',
                 labelPosition:'left',
-                currentPage: 1,
+                pageNum: 1,
                 pageSize:10,
                 pageSize:10,
                 total:0,
                 total:0,
                 tableData: [],
                 tableData: [],
@@ -234,13 +234,13 @@
                 this.pageSize=val;
                 this.pageSize=val;
             },
             },
             handleCurrentChange(val) {
             handleCurrentChange(val) {
-                this.currentPage=val;
+                this.pageNum=val;
                 this.submitForm();
                 this.submitForm();
             },
             },
             //获取当日飞行计划列表
             //获取当日飞行计划列表
             submitForm() {
             submitForm() {
                 let params = {
                 let params = {
-                    currentPage: this.currentPage, pageSize: this.pageSize, flightNo: this.queryFlightplan.flightNo,
+                    pageNum: this.pageNum, pageSize: this.pageSize, flightNo: this.queryFlightplan.flightNo,
                     awcd: this.queryFlightplan.awcd, flightDate: this.queryFlightplan.flightDate
                     awcd: this.queryFlightplan.awcd, flightDate: this.queryFlightplan.flightDate
                 };
                 };
                 console.log(params)
                 console.log(params)

@@ -80,7 +80,7 @@
                 </el-drawer>
                 </el-drawer>
             </el-card>
             </el-card>
         </el-row>
         </el-row>
-        <div id="mapContainer" style="width: 100%; height: 500px;"></div>
+        <div id="mapContainer" style="width: 100%;height: 100vh;"></div>
     </div>
     </div>
 </template>
 </template>
 <script>
 <script>