朱兆平 / vue_cli · 提交

转到一个项目

作者 shenhailong
提交 3fed8bebb3cdcfa24bec14e9b0433a339a77e0c3 1 个父辈 35691a95

添加 航班号 航班日期 查询条件 

优化远程调用运输工具返回航班预报申报信息
处理出港  el-tables 跳转后 页面头部信息消失
内嵌 并排对比
正在显示 4 个修改的文件 包含 84 行增加 和 66 行删除
@@ -537,13 +537,7 @@ @@ -537,13 +537,7 @@
537 pageSize: 1, 537 pageSize: 1,
538 limitSize: 10, 538 limitSize: 10,
539 awba: undefined, 539 awba: undefined,
540 - carrier: undefined,  
541 - flightno: undefined,  
542 - flightdate: undefined,  
543 - originstation: undefined,  
544 - destinationstation: undefined,  
545 - customcode: undefined,  
546 - messageType: undefined, 540 + messageType: 'MT3201',
547 } 541 }
548 } 542 }
549 let username = loginedUserInfo().username 543 let username = loginedUserInfo().username
@@ -562,13 +562,7 @@ @@ -562,13 +562,7 @@
562 pageSize: 1, 562 pageSize: 1,
563 limitSize: 10, 563 limitSize: 10,
564 awba: undefined, 564 awba: undefined,
565 - carrier: undefined,  
566 - flightno: undefined,  
567 - flightdate: undefined,  
568 - originstation: undefined,  
569 - destinationstation: undefined,  
570 - customcode: undefined,  
571 - messageType: undefined 565 + messageType: 'MT4201'
572 } 566 }
573 } 567 }
574 let username = loginedUserInfo().username 568 let username = loginedUserInfo().username
@@ -8,16 +8,30 @@ @@ -8,16 +8,30 @@
8 </el-col> 8 </el-col>
9 <el-col :span="24"> 9 <el-col :span="24">
10 <div class="grid-content co"> 10 <div class="grid-content co">
  11 + <el-col :span="24">
  12 + <el-row>
  13 + <el-col :span="4">
  14 + <el-input v-model="flightComNo" placeholder="航班号" clearable >
  15 + <template slot="prepend">航班号</template>
  16 + </el-input>
  17 + </el-col>
11 <el-col :span="1"> 18 <el-col :span="1">
12 <div class="grid-content"></div> 19 <div class="grid-content"></div>
13 </el-col> 20 </el-col>
14 - <el-col :span="20">  
15 - <div class="grid-content">  
16 - <span class="titleSpan">航班号：{{this.preQuery.carrier}}{{this.preQuery.flightno}}</span>  
17 - <span class="titleSpan">航班日期：{{this.preQuery.flightdate}}</span>  
18 - <span class="titleSpan">航段：{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span> 21 + <el-col :span="4">
  22 + <div class="el-input el-input--mini el-input-group el-input-group--prepend el-input--suffix">
  23 + <div class="el-input-group__prepend"> 航班日期</div>
  24 + <el-date-picker
  25 + value-format="yyyy-MM-dd"
  26 + style="width: 200px"
  27 + v-model="preQuery.flightdate" align="left"
  28 + class="flight-date-tianbo"
  29 + type="date" placeholder="请输入航班日期" clearable>
  30 + </el-date-picker>
19 </div> 31 </div>
20 </el-col> 32 </el-col>
  33 + </el-row>
  34 + </el-col>
21 </div> 35 </div>
22 </el-col> 36 </el-col>
23 <el-col :span="24"> 37 <el-col :span="24">
@@ -841,6 +855,7 @@ @@ -841,6 +855,7 @@
841 validAlphabetsAndSpanceKey, 855 validAlphabetsAndSpanceKey,
842 validatorNum 856 validatorNum
843 } from "@/utils/validate" 857 } from "@/utils/validate"
  858 + import flight from "../airtransport/flight";
844 859
845 export default { 860 export default {
846 name: "ExitPre", 861 name: "ExitPre",
@@ -887,6 +902,7 @@ @@ -887,6 +902,7 @@
887 batchChooseFlag: false, 902 batchChooseFlag: false,
888 batchChooseSelection: '', 903 batchChooseSelection: '',
889 consigneeList: [], 904 consigneeList: [],
  905 + carrierAndFlight: '',
890 consignerQuery: { 906 consignerQuery: {
891 companyName: '', 907 companyName: '',
892 total: 0, 908 total: 0,
@@ -1131,10 +1147,28 @@ @@ -1131,10 +1147,28 @@
1131 }) 1147 })
1132 }, 1000) 1148 }, 1000)
1133 }, 1149 },
1134 - created() { 1150 + // deactivated(){
  1151 + // this.preQuery= {
  1152 + // pageSize: 1,
  1153 + // limitSize: 30,
  1154 + // awba: '',
  1155 + // carrier: '',
  1156 + // flightno: '',
  1157 + // flightdate: '',
  1158 + // originstation: '',
  1159 + // destinationstation: '',
  1160 + // userId:loginedUserInfo().userId,
  1161 + // customCode:'',
  1162 + // enterpriseId:loginedUserInfo().companyId,
  1163 + // messageType: ''
  1164 + // }
  1165 + // console.log("distroyed")
  1166 + // },
  1167 + activated() {
1135 if (this.$route.params.flightData !== undefined) { 1168 if (this.$route.params.flightData !== undefined) {
1136 this.preQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2) 1169 this.preQuery.carrier = this.$route.params.flightData.flightno.substring(0, 2)
1137 this.preQuery.flightno = this.$route.params.flightData.flightno.substring(2) 1170 this.preQuery.flightno = this.$route.params.flightData.flightno.substring(2)
  1171 + this.carrierAndFlight = this.$route.params.flightData.flightno;
1138 this.preQuery.flightdate = this.$route.params.flightData.flightdate 1172 this.preQuery.flightdate = this.$route.params.flightData.flightdate
1139 this.preQuery.originstation = this.$route.params.flightData.originstation 1173 this.preQuery.originstation = this.$route.params.flightData.originstation
1140 this.preQuery.destinationstation = this.$route.params.flightData.destinationstation 1174 this.preQuery.destinationstation = this.$route.params.flightData.destinationstation
@@ -1142,21 +1176,6 @@ @@ -1142,21 +1176,6 @@
1142 this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3) 1176 this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3)
1143 } 1177 }
1144 this.getList() 1178 this.getList()
1145 - }else {  
1146 - this.preQuery= {  
1147 - pageSize: 1,  
1148 - limitSize: 30,  
1149 - awba: '',  
1150 - carrier: '',  
1151 - flightno: '',  
1152 - flightdate: '',  
1153 - originstation: '',  
1154 - destinationstation: '',  
1155 - userId:loginedUserInfo().userId,  
1156 - customCode:'',  
1157 - enterpriseId:loginedUserInfo().companyId,  
1158 - messageType: ''  
1159 - }  
1160 } 1179 }
1161 this.getCountryList() 1180 this.getCountryList()
1162 let username = JSON.parse(sessionStorage.getItem('user')).username 1181 let username = JSON.parse(sessionStorage.getItem('user')).username
@@ -1371,37 +1390,56 @@ @@ -1371,37 +1390,56 @@
1371 this.preModel.awbinfo.dest3 = val.toUpperCase().trim() 1390 this.preModel.awbinfo.dest3 = val.toUpperCase().trim()
1372 } 1391 }
1373 }, 1392 },
  1393 + flightComNo: {
  1394 + get: function () {
  1395 + return this.carrierAndFlight;
  1396 + },
  1397 + set: function (val) {
  1398 + val = val.toUpperCase();
  1399 + if (util.checkNull(val) && val.length>=2){
  1400 + this.preQuery.carrier= val.substring(0,2);
  1401 + this.preQuery.flightno = val.substring(2)
  1402 + }else {
  1403 + this.preQuery.carrier= ''
  1404 + this.preQuery.flightno = ''
  1405 + }
  1406 + this.carrierAndFlight = val
  1407 +
  1408 + }
  1409 + }
1374 }, 1410 },
1375 methods: { 1411 methods: {
1376 // >>>>>>>>>>>>>>>>获取list集合<<<<<<<<<<<<<<<<<< 1412 // >>>>>>>>>>>>>>>>获取list集合<<<<<<<<<<<<<<<<<<
1377 getList() { 1413 getList() {
  1414 + // console.log("11111"+JSON.stringify(this.preQuery));
1378 this.listLoading = true 1415 this.listLoading = true
1379 - if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {  
1380 - getMt2201ListForParam(this.preQuery).then(res => {  
1381 - this.preData = res.data.data.list  
1382 - this.total = res.data.data.total  
1383 - if (res.data.data.list.length > 0) {  
1384 - this.preQuery.carrier = this.preData[0].carrier  
1385 - this.preQuery.flightno = this.preData[0].flightno  
1386 - this.preQuery.flightdate = this.preData[0].flightdate  
1387 - this.preQuery.originstation = this.preData[0].originstation  
1388 - this.preQuery.destinationstation = this.preData[0].destinationstation  
1389 - this.preQuery.customcode = this.preData[0].customcode  
1390 - }  
1391 - setTimeout(() => {  
1392 - this.listLoading = false  
1393 - }, 1500)  
1394 - })  
1395 - } else { 1416 + // if (this.preQuery.awba !== undefined && this.preQuery.awba !== '') {
  1417 + // console.log("22222"+JSON.stringify(this.preQuery));
  1418 + // getMt2201ListForParam(this.preQuery).then(res => {
  1419 + // this.preData = res.data.data.list
  1420 + // this.total = res.data.data.total
  1421 + // if (res.data.data.list.length > 0) {
  1422 + // this.preQuery.carrier = this.preData[0].carrier
  1423 + // this.preQuery.flightno = this.preData[0].flightno
  1424 + // this.preQuery.flightdate = this.preData[0].flightdate
  1425 + // this.preQuery.originstation = this.preData[0].originstation
  1426 + // this.preQuery.destinationstation = this.preData[0].destinationstation
  1427 + // this.preQuery.customcode = this.preData[0].customcode
  1428 + // }
  1429 + // setTimeout(() => {
  1430 + // this.listLoading = false
  1431 + // }, 1500)
  1432 + // })
  1433 + // } else {
  1434 + // console.log("33333"+JSON.stringify(this.preQuery));
1396 getMt2201ListForParam(this.preQuery).then(res => { 1435 getMt2201ListForParam(this.preQuery).then(res => {
1397 this.preData = res.data.data.list 1436 this.preData = res.data.data.list
1398 -  
1399 this.total = res.data.data.total 1437 this.total = res.data.data.total
1400 setTimeout(() => { 1438 setTimeout(() => {
1401 this.listLoading = false 1439 this.listLoading = false
1402 }, 1500) 1440 }, 1500)
1403 }) 1441 })
1404 - } 1442 + // }
1405 }, 1443 },
1406 // >>>>>>>>>>>>>>>>重置实体<<<<<<<<<<<<<<<<<< 1444 // >>>>>>>>>>>>>>>>重置实体<<<<<<<<<<<<<<<<<<
1407 restModel() { 1445 restModel() {
@@ -1591,10 +1629,8 @@ @@ -1591,10 +1629,8 @@
1591 }, 1629 },
1592 // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<< 1630 // >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
1593 handleSerach() { 1631 handleSerach() {
1594 - this.preQuery.flightno = undefined  
1595 - this.preQuery.carrier = undefined  
1596 this.preQuery.originstation = undefined 1632 this.preQuery.originstation = undefined
1597 - this.preQuery.flightdate = undefined 1633 + // this.preQuery.flightdate = undefined
1598 this.preQuery.destinationstation = undefined 1634 this.preQuery.destinationstation = undefined
1599 this.getList() 1635 this.getList()
1600 }, 1636 },
@@ -2023,8 +2059,8 @@ @@ -2023,8 +2059,8 @@
2023 2059
2024 // 远程查询运输工具申报是否成功 2060 // 远程查询运输工具申报是否成功
2025 transportQuery(){ 2061 transportQuery(){
2026 - if (this.preModel.flightno !== undefined && this.preModel.flightno !== ''  
2027 - && this.preModel.flightdate !== undefined && this.preModel.flightdate !== ''){ 2062 + if (this.preModel.flightno != undefined && this.preModel.flightno != ''
  2063 + && this.preModel.flightdate != undefined && this.preModel.flightdate != ''){
2028 const params = { 2064 const params = {
2029 flightNo: this.preModel.flightno, 2065 flightNo: this.preModel.flightno,
2030 flightDate: this.preModel.flightdate 2066 flightDate: this.preModel.flightdate
@@ -540,13 +540,7 @@ @@ -540,13 +540,7 @@
540 pageSize: 1, 540 pageSize: 1,
541 limitSize: 10, 541 limitSize: 10,
542 awba: undefined, 542 awba: undefined,
543 - carrier: undefined,  
544 - flightno: undefined,  
545 - flightdate: undefined,  
546 - originstation: undefined,  
547 - destinationstation: undefined,  
548 - customcode: undefined,  
549 - rcfdep: "5202" 543 + rcfdep: "MT5202"
550 } 544 }
551 } 545 }
552 let username = loginedUserInfo().username 546 let username = loginedUserInfo().username