Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
d878f6c5 1 parent 58ae9ddc

modify

Inline Side-by-side
Showing 6 changed files with 14 additions and 55 deletions
...@@ -25,8 +25,8 @@ export const formConfig = [ ...@@ -25,8 +25,8 @@ export const formConfig = [
25 { 25 {
26 label: "航线", 26 label: "航线",
27 type: "Input", 27 type: "Input",
28 - name: "flightRouteListStr", 28 + name: "routesStr",
29 - prop: "flightRouteListStr", 29 + prop: "routesStr",
30 placeholder: "", 30 placeholder: "",
31 span: 6, 31 span: 6,
32 labelWidth: "40px", 32 labelWidth: "40px",
......
...@@ -69,8 +69,7 @@ import { ...@@ -69,8 +69,7 @@ import {
69 enableOrDisable, // 开启/停用航线规则设置 69 enableOrDisable, // 开启/停用航线规则设置
70 batchUpdateOrAddFlight, // 航班航线优先级更新 70 batchUpdateOrAddFlight, // 航班航线优先级更新
71 queryRouteByFltNo, // 通过航班号查询航线 71 queryRouteByFltNo, // 通过航班号查询航线
72 -} from "@/api/destinationFlight"; 72 +} from "@/api/destinationFlight"
73 -// import { findAllFltDataApi } from "@/api/findAllFltData";
74 import indexMixins from "../mixins"; 73 import indexMixins from "../mixins";
75 export default { 74 export default {
76 components: { 75 components: {
...@@ -114,25 +113,17 @@ export default { ...@@ -114,25 +113,17 @@ export default {
114 purposeOfFlightNo: this.$route.query.purposeOfFlightNo || "", // 航班号 113 purposeOfFlightNo: this.$route.query.purposeOfFlightNo || "", // 航班号
115 flightDate: this.$route.query.flightDate || "", // 飞行日期 114 flightDate: this.$route.query.flightDate || "", // 飞行日期
116 flightRouteListStr: this.$route.query.flightRouteListStr || "", // 飞行航线集合 115 flightRouteListStr: this.$route.query.flightRouteListStr || "", // 飞行航线集合
116 + routesStr: this.$route.query.routesStr || "", // 从航班信息维护查看维度过来作为接收回显
117 status: this.$route.query.status || "", // 状态：0 无效、1 有效、2 配置中、3 停用 117 status: this.$route.query.status || "", // 状态：0 无效、1 有效、2 配置中、3 停用
118 dataStatus: this.$route.query.dataStatus || "", // add 、edit、view 118 dataStatus: this.$route.query.dataStatus || "", // add 、edit、view
119 flightKindName: this.$route.query.flightKindName || "", // 航班种类White Tail 、Purple Tail 119 flightKindName: this.$route.query.flightKindName || "", // 航班种类White Tail 、Purple Tail
120 pageName: this.$route.query.pageName || "", // flightAllocConfig、flightInformationMaintenance、flightRandConfig、dmLog 120 pageName: this.$route.query.pageName || "", // flightAllocConfig、flightInformationMaintenance、flightRandConfig、dmLog
121 id: this.$route.query.id || "", 121 id: this.$route.query.id || "",
122 }; 122 };
123 - this.getAllDictData(); // 获取全部字典 123 + this.queryForm = this.$route.query;
124 - // this.queryFindAllFltDataApi({
125 - // fltNo: parmas.purposeOfFlightNo,
126 - // fltDateEnd: parmas.flightDate,
127 - // fltDateStart: parmas.flightDate,
128 - // limitSize: 20,
129 - // limitStart: 0,
130 - // pageNum: 1,
131 - // start: 0,
132 - // }); // 通过航班号查询航线
133 // 指定隐藏或显示From表单域 124 // 指定隐藏或显示From表单域
134 this.hiddenFormItem(parmas); 125 this.hiddenFormItem(parmas);
135 - // queryCondition只负责接收参数和接口调用 126 + // 只负责接收参数和接口调用
136 this.queryCondition(parmas); 127 this.queryCondition(parmas);
137 }, 128 },
138 mounted() {}, 129 mounted() {},
......
...@@ -95,12 +95,10 @@ export default { ...@@ -95,12 +95,10 @@ export default {
95 queryParmas: function () { 95 queryParmas: function () {
96 // 非日期级别 96 // 非日期级别
97 if (parmas.querySpecifyData == "2") { 97 if (parmas.querySpecifyData == "2") {
98 - _this.queryForm = _this.$route.query; // 获取跳转过来的参数
99 _this.noDateLevelData(this.noDateParmas); 98 _this.noDateLevelData(this.noDateParmas);
100 } 99 }
101 // 日期级别 100 // 日期级别
102 if (parmas.querySpecifyData == "1") { 101 if (parmas.querySpecifyData == "1") {
103 - _this.queryForm = _this.$route.query; // 获取跳转过来的参数
104 _this.dateLevelData({ 102 _this.dateLevelData({
105 dateParmas: this.dateParmas, 103 dateParmas: this.dateParmas,
106 noDateParmas: this.noDateParmas, 104 noDateParmas: this.noDateParmas,
...@@ -488,21 +486,8 @@ export default { ...@@ -488,21 +486,8 @@ export default {
488 if (this.$route.query.flightKindName == "White Tail") { 486 if (this.$route.query.flightKindName == "White Tail") {
489 // White Tail只展示当前查询的一条 487 // White Tail只展示当前查询的一条
490 const route = this.$route.query.flightRouteListStr; 488 const route = this.$route.query.flightRouteListStr;
491 - let noDateRouteInfo, result, byFlightRouteListSort; 489 + let noDateRouteInfo, result;
492 - // byFlightRouteListSort = dateRouteList
493 - // .filter((item2) => {
494 - // return this.flightRouteList.some((item1) => {
495 - // return item1.route === item2.route;
496 - // });
497 - // })
498 - // .sort((a, b) => {
499 - // return (
500 - // this.flightRouteList.findIndex((item) => item.route === a.route) -
501 - // this.flightRouteList.findIndex((item) => item.route === b.route)
502 - // );
503 - // });
504 this.routeList = dateRouteList; 490 this.routeList = dateRouteList;
505 - // this.routeList = byFlightRouteListSort;
506 // 从日期取 491 // 从日期取
507 if (dateListHas.length) { 492 if (dateListHas.length) {
508 const dateRouteInfo = dateListHas.filter( 493 const dateRouteInfo = dateListHas.filter(
...@@ -581,15 +566,12 @@ export default { ...@@ -581,15 +566,12 @@ export default {
581 ); 566 );
582 }); 567 });
583 if (this.$route.query.flightKindName == "Purple Tail") { 568 if (this.$route.query.flightKindName == "Purple Tail") {
584 - let flightRouteListStr = 569 + let routesStr = this.$route.query.routesStr.split(";"); // 跳转传过来的航线
585 - this.$route.query.flightRouteListStr.split(";"); // 跳转传过来的航线
586 // 查找跳转传过来的对应的航线把包含的航线并且按照dateDataLists航线排序 570 // 查找跳转传过来的对应的航线把包含的航线并且按照dateDataLists航线排序
587 let inRoutes = dateDataLists 571 let inRoutes = dateDataLists
588 - .filter((item) => flightRouteListStr.includes(item.route)) 572 + .filter((item) => routesStr.includes(item.route))
589 .sort( 573 .sort(
590 - (a, b) => 574 + (a, b) => routesStr.indexOf(a.route) - routesStr.indexOf(b.route)
591 - flightRouteListStr.indexOf(a.route) -
592 - flightRouteListStr.indexOf(b.route)
593 ); 575 );
594 // 处理航线优先级展示ET86 576 // 处理航线优先级展示ET86
595 let routes = []; 577 let routes = [];
...@@ -601,24 +583,7 @@ export default { ...@@ -601,24 +583,7 @@ export default {
601 } 583 }
602 }); 584 });
603 // 把处理ET86航线优先级展示 585 // 把处理ET86航线优先级展示
604 - this.queryForm.flightRouteListStr = routes.join(";"); 586 + this.queryForm.routesStr = routes.join(";");
605 - // // 跳转传过来的对应的航线把ET86航线的过滤掉
606 - // let noEtesRoutes = inRoutes.filter((item) => item.etesRule == "N");
607 - // let noRoutes = dateList.filter((item) => {
608 - // return noEtesRoutes.some((el) => el.route === item.route);
609 - // });
610 - // const result = noRoutes
611 - // .filter((item2) => {
612 - // return noEtesRoutes.some((item1) => {
613 - // return item1.route === item2.route;
614 - // });
615 - // })
616 - // .sort((a, b) => {
617 - // return (
618 - // noEtesRoutes.findIndex((item) => item.route === a.route) -
619 - // noEtesRoutes.findIndex((item) => item.route === b.route)
620 - // );
621 - // });
622 // this.defaultRouteData(result) // 默认航线配置信息数据; 587 // this.defaultRouteData(result) // 默认航线配置信息数据;
623 this.routeList = dateRouteList; // 航线优先级 588 this.routeList = dateRouteList; // 航线优先级
624 this.routesInfo = dateList; 589 this.routesInfo = dateList;
......
...@@ -283,6 +283,7 @@ export default { ...@@ -283,6 +283,7 @@ export default {
283 flightDate: flightDate, 283 flightDate: flightDate,
284 purposeOfFlightNo: actualFlight, 284 purposeOfFlightNo: actualFlight,
285 flightRouteListStr: route, 285 flightRouteListStr: route,
286 + routesStr: route,
286 status: "", 287 status: "",
287 pageName: "flightRandConfig", 288 pageName: "flightRandConfig",
288 disable: true, 289 disable: true,
......
...@@ -1347,6 +1347,7 @@ export default { ...@@ -1347,6 +1347,7 @@ export default {
1347 flightDate: row.fltDate, 1347 flightDate: row.fltDate,
1348 purposeOfFlightNo: row.fltNo, 1348 purposeOfFlightNo: row.fltNo,
1349 flightRouteListStr: row.route, 1349 flightRouteListStr: row.route,
1350 + routesStr: row.route,
1350 status: row.status, 1351 status: row.status,
1351 flightKindName: row.flightKindName, 1352 flightKindName: row.flightKindName,
1352 pageName: "flightInformationMaintenance", 1353 pageName: "flightInformationMaintenance",
......
...@@ -279,6 +279,7 @@ export default { ...@@ -279,6 +279,7 @@ export default {
279 purposeOfFlightNo: row.flightFltNo, 279 purposeOfFlightNo: row.flightFltNo,
280 flightDate: row.flightFltDate, 280 flightDate: row.flightFltDate,
281 flightRouteListStr: row.currentFlightRoute, 281 flightRouteListStr: row.currentFlightRoute,
282 + routesStr: row.currentFlightRoute,
282 pageName: "dmLog", 283 pageName: "dmLog",
283 disable: true, 284 disable: true,
284 }, 285 },
......