作者 shenhailong

Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/views/nmms/ExitTidy.vue
@@ -33,10 +33,10 @@ @@ -33,10 +33,10 @@
33 </el-table-column> 33 </el-table-column>
34 <el-table-column label="操作" align="center"> 34 <el-table-column label="操作" align="center">
35 <template slot-scope="scope"> 35 <template slot-scope="scope">
  36 + <el-button type="primary" size="mini" @click="handlePre(scope.row)">预配舱单</el-button>
  37 + <el-button type="primary" size="mini" @click="handleArrive(scope.row)">出港运抵</el-button>
36 <el-button type="primary" size="mini" @click="handleLoading(scope.row)">装载舱单</el-button> 38 <el-button type="primary" size="mini" @click="handleLoading(scope.row)">装载舱单</el-button>
37 <el-button type="primary" size="mini" @click="handleTidy(scope.row)">出港理货</el-button> 39 <el-button type="primary" size="mini" @click="handleTidy(scope.row)">出港理货</el-button>
38 - <el-button type="primary" size="mini" @click="handleArrive(scope.row)">出港运抵</el-button>  
39 - <el-button type="primary" size="mini" @click="handlePre(scope.row)">预配舱单</el-button>  
40 </template> 40 </template>
41 </el-table-column> 41 </el-table-column>
42 </el-table> 42 </el-table>
@@ -79,18 +79,26 @@ @@ -79,18 +79,26 @@
79 }, 79 },
80 handleLoading(row) { 80 handleLoading(row) {
81 row.messageType = 'MT4201' 81 row.messageType = 'MT4201'
  82 + row.flightdate = row.flightDate
  83 + row.flightno = row.flightNo
82 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 84 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
83 }, 85 },
84 handleTidy(row) { 86 handleTidy(row) {
85 row.messageType = 'MT5201' 87 row.messageType = 'MT5201'
  88 + row.flightdate = row.flightDate
  89 + row.flightno = row.flightNo
86 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 90 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
87 }, 91 },
88 handleArrive(row) { 92 handleArrive(row) {
89 row.messageType = 'MT3201' 93 row.messageType = 'MT3201'
  94 + row.flightdate = row.flightDate
  95 + row.flightno = row.flightNo
90 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 96 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
91 }, 97 },
92 handlePre(row) { 98 handlePre(row) {
93 row.messageType = 'MT2201' 99 row.messageType = 'MT2201'
  100 + row.flightdate = row.flightDate
  101 + row.flightno = row.flightNo
94 this.$router.push({name: '出港航班信息', params: {scopeRow: row}}) 102 this.$router.push({name: '出港航班信息', params: {scopeRow: row}})
95 } 103 }
96 } 104 }
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 <el-select 29 <el-select
30 :remote-method="remoteMethodAirport" 30 :remote-method="remoteMethodAirport"
31 :loading="listLoading" 31 :loading="listLoading"
32 - v-model="flight.originstation" 32 + v-model="originstation"
33 allow-create 33 allow-create
34 default-first-option 34 default-first-option
35 filterable 35 filterable
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 <el-select 49 <el-select
50 :remote-method="remoteMethodAirport" 50 :remote-method="remoteMethodAirport"
51 :loading="listLoading" 51 :loading="listLoading"
52 - v-model="flight.destinationstation" 52 + v-model="destinationstation"
53 allow-create 53 allow-create
54 default-first-option 54 default-first-option
55 filterable 55 filterable
@@ -622,6 +622,7 @@ @@ -622,6 +622,7 @@
622 this.detailData = res.data 622 this.detailData = res.data
623 }) 623 })
624 }, 624 },
  625 +
625 //发送舱单报 626 //发送舱单报
626 handleAwbSend(row) { 627 handleAwbSend(row) {
627 delete row.children 628 delete row.children
@@ -733,6 +734,7 @@ @@ -733,6 +734,7 @@
733 } 734 }
734 }) 735 })
735 }, 736 },
  737 +
736 // 删除当前运单 738 // 删除当前运单
737 handleAwbDelete(row) { 739 handleAwbDelete(row) {
738 delete row.parent 740 delete row.parent