Elements-SY

modify

...@@ -566,27 +566,8 @@ export default { ...@@ -566,27 +566,8 @@ export default {
566 ); 566 );
567 }); 567 });
568 if (this.$route.query.flightKindName == "Purple Tail") { 568 if (this.$route.query.flightKindName == "Purple Tail") {
569 - let routesStr = this.$route.query.routesStr.split(";"); // 跳转传过来的航线
570 - // 查找跳转传过来的对应的航线把包含的航线并且按照dateDataLists航线排序
571 - let inRoutes = dateDataLists
572 - .filter((item) => routesStr.includes(item.route))
573 - .sort(
574 - (a, b) => routesStr.indexOf(a.route) - routesStr.indexOf(b.route)
575 - );
576 - // 处理航线优先级展示ET86
577 - let routes = [];
578 - dateDataLists.map((item, i, arr) => {
579 - if (arr[i].etesRule == "Y") {
580 - routes.push(`${arr[i].route}(ET86)`);
581 - } else {
582 - routes.push(arr[i].route);
583 - }
584 - });
585 - // 把处理ET86航线优先级展示
586 - this.queryForm.routesStr = routes.join(";");
587 // this.defaultRouteData(result) // 默认航线配置信息数据; 569 // this.defaultRouteData(result) // 默认航线配置信息数据;
588 this.routeList = dateRouteList; // 航线优先级 570 this.routeList = dateRouteList; // 航线优先级
589 - console.log(dateList);
590 this.routesInfo = dateList; 571 this.routesInfo = dateList;
591 this.pageLoading = false; 572 this.pageLoading = false;
592 } else { 573 } else {
......
...@@ -1341,13 +1341,29 @@ export default { ...@@ -1341,13 +1341,29 @@ export default {
1341 ); 1341 );
1342 return; 1342 return;
1343 } 1343 }
1344 + queryRouteByFltNo({ fltNo: row.fltNo })
1345 + .then((res) => {
1346 + const { code, data, msg } = res;
1347 + if (code === 200) {
1348 + if (data.list.length) {
1349 + let include = data.list.filter((item) =>
1350 + row.route.split(";").some((val) => val == item.route)
1351 + ); // 查询已被勾选的
1352 + let routes = [];
1353 + include.map((item, i, arr) => {
1354 + if (arr[i].isEtesRoute == "Y") {
1355 + routes.push(`${arr[i].route}(ET86)`);
1356 + } else {
1357 + routes.push(arr[i].route);
1358 + }
1359 + });
1344 this.$router.push({ 1360 this.$router.push({
1345 path: "/routeInfo", 1361 path: "/routeInfo",
1346 query: { 1362 query: {
1347 flightDate: row.fltDate, 1363 flightDate: row.fltDate,
1348 purposeOfFlightNo: row.fltNo, 1364 purposeOfFlightNo: row.fltNo,
1349 flightRouteListStr: row.route, 1365 flightRouteListStr: row.route,
1350 - routesStr: row.route, 1366 + routesStr: routes.join(";"),
1351 status: row.status, 1367 status: row.status,
1352 flightKindName: row.flightKindName, 1368 flightKindName: row.flightKindName,
1353 pageName: "flightInformationMaintenance", 1369 pageName: "flightInformationMaintenance",
...@@ -1355,6 +1371,17 @@ export default { ...@@ -1355,6 +1371,17 @@ export default {
1355 }, 1371 },
1356 }); 1372 });
1357 } 1373 }
1374 + if (data.list.length == 0) {
1375 + this.msgError("该航班没有设置航线");
1376 + }
1377 + } else {
1378 + this.msgWarning(res.msg);
1379 + }
1380 + })
1381 + .catch((err) => {
1382 + console.log(err);
1383 + });
1384 + }
1358 }) 1385 })
1359 .catch(() => {}); 1386 .catch(() => {});
1360 }, 1387 },
......