Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/nmms/ExitTidy.vue

@@ -33,10 +33,10 @@
             </el-table-column>
             <el-table-column label="操作" align="center">
                 <template slot-scope="scope">
+                    <el-button type="primary" size="mini" @click="handlePre(scope.row)">预配舱单</el-button>
+                    <el-button type="primary" size="mini" @click="handleArrive(scope.row)">出港运抵</el-button>
                     <el-button type="primary" size="mini" @click="handleLoading(scope.row)">装载舱单</el-button>
                     <el-button type="primary" size="mini" @click="handleTidy(scope.row)">出港理货</el-button>
-                    <el-button type="primary" size="mini" @click="handleArrive(scope.row)">出港运抵</el-button>
-                    <el-button type="primary" size="mini" @click="handlePre(scope.row)">预配舱单</el-button>
                 </template>
             </el-table-column>
         </el-table>
@@ -79,18 +79,26 @@
             },
             handleLoading(row) {
                 row.messageType = 'MT4201'
+                row.flightdate = row.flightDate
+                row.flightno = row.flightNo
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             },
             handleTidy(row) {
                 row.messageType = 'MT5201'
+                row.flightdate = row.flightDate
+                row.flightno = row.flightNo
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             },
             handleArrive(row) {
                 row.messageType = 'MT3201'
+                row.flightdate = row.flightDate
+                row.flightno = row.flightNo
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             },
             handlePre(row) {
                 row.messageType = 'MT2201'
+                row.flightdate = row.flightDate
+                row.flightno = row.flightNo
                 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
             }
         }

@@ -29,7 +29,7 @@
                     <el-select
                             :remote-method="remoteMethodAirport"
                             :loading="listLoading"
-                            v-model="flight.originstation"
+                            v-model="originstation"
                             allow-create
                             default-first-option
                             filterable
@@ -49,7 +49,7 @@
                     <el-select
                             :remote-method="remoteMethodAirport"
                             :loading="listLoading"
-                            v-model="flight.destinationstation"
+                            v-model="destinationstation"
                             allow-create
                             default-first-option
                             filterable

@@ -622,6 +622,7 @@
                     this.detailData = res.data
                 })
             },
+
             //发送舱单报
             handleAwbSend(row) {
                 delete row.children
@@ -733,6 +734,7 @@
                     }
                 })
             },
+
             // 删除当前运单
             handleAwbDelete(row) {
                 delete row.parent