Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
45979ec1 1 parent 6b345724

modify

Inline Side-by-side
Showing 2 changed files with 35 additions and 37 deletions
...@@ -498,7 +498,7 @@ export default { ...@@ -498,7 +498,7 @@ export default {
498 */ 498 */
499 if (item.status == "3" || (item.status == "1" && item.ruleDate)) { 499 if (item.status == "3" || (item.status == "1" && item.ruleDate)) {
500 return true; 500 return true;
501 - } else if (item.status == "1" && this.$route.query.querySpecifyData) { 501 + } else if (item.status == "1" && this.$route.query.querySpecifyData == "2") {
502 // 航班配舱设置非日期级别情况下 502 // 航班配舱设置非日期级别情况下
503 return true; 503 return true;
504 } else if (item.status == "2") { 504 } else if (item.status == "2") {
......
...@@ -107,18 +107,18 @@ export default { ...@@ -107,18 +107,18 @@ export default {
107 let queryCondition = { 107 let queryCondition = {
108 // 航班配舱设置 108 // 航班配舱设置
109 flightAllocConfig: { 109 flightAllocConfig: {
110 - querySpecifyData: this.$route.query.querySpecifyData, 110 + querySpecifyData: _this.$route.query.querySpecifyData,
111 noDateParmas: { 111 noDateParmas: {
112 flightDate: "", 112 flightDate: "",
113 flightRoute: "", 113 flightRoute: "",
114 - purposeOfFlightNo: this.$route.query.purposeOfFlightNo, 114 + purposeOfFlightNo: _this.$route.query.purposeOfFlightNo,
115 status: "", 115 status: "",
116 }, 116 },
117 dateParmas: { 117 dateParmas: {
118 - flightDate: this.$route.query.flightDate, 118 + flightDate: _this.$route.query.flightDate,
119 flightRoute: "", 119 flightRoute: "",
120 flightRouteListStr: "", 120 flightRouteListStr: "",
121 - purposeOfFlightNo: this.$route.query.purposeOfFlightNo, 121 + purposeOfFlightNo: _this.$route.query.purposeOfFlightNo,
122 status: "", 122 status: "",
123 }, 123 },
124 queryParmas: function () { 124 queryParmas: function () {
...@@ -142,6 +142,7 @@ export default { ...@@ -142,6 +142,7 @@ export default {
142 return item1; // 没有的返回当前的 142 return item1; // 没有的返回当前的
143 } 143 }
144 }); 144 });
145 +
145 // 处理属性 146 // 处理属性
146 result.map((item) => { 147 result.map((item) => {
147 if (item.config) { 148 if (item.config) {
...@@ -154,7 +155,6 @@ export default { ...@@ -154,7 +155,6 @@ export default {
154 } 155 }
155 }); 156 });
156 _this.routesInfo = result; 157 _this.routesInfo = result;
157 - console.log("非日期级别：", result);
158 }); 158 });
159 } 159 }
160 // 日期级别 160 // 日期级别
...@@ -204,7 +204,6 @@ export default { ...@@ -204,7 +204,6 @@ export default {
204 } 204 }
205 }); 205 });
206 _this.routesInfo = dateList; 206 _this.routesInfo = dateList;
207 - console.log(dateList);
208 }); 207 });
209 } 208 }
210 }); 209 });
...@@ -213,48 +212,47 @@ export default { ...@@ -213,48 +212,47 @@ export default {
213 }, 212 },
214 // 航班信息维护 213 // 航班信息维护
215 flightInformationMaintenance: { 214 flightInformationMaintenance: {
216 - queryParmas: () => { 215 + noDateParmas: {
217 - // White Tail 216 + purposeOfFlightNo: _this.$route.query.purposeOfFlightNo,
218 - if (this.$route.query.flightKindName == "White Tail") { 217 + flightRouteListStr: _this.$route.query.flightRouteListStr,
219 - let noDateParmas = {
220 - purposeOfFlightNo: this.$route.query.purposeOfFlightNo,
221 - flightRouteListStr: this.$route.query.flightRouteListStr,
222 status: "", 218 status: "",
223 - }; 219 + },
224 - this.noDateLevelRoute(noDateParmas); 220 + dateParmas: {
221 + purposeOfFlightNo: _this.$route.query.purposeOfFlightNo,
222 + flightDate: _this.$route.query.flightDate,
223 + flightRouteListStr: _this.$route.query.flightRouteListStr,
224 + status: "",
225 + },
226 + queryParmas: function () {
227 + // White Tail
228 + if (_this.$route.query.flightKindName == "White Tail") {
229 + _this.noDateLevelRoute(this.noDateParmas);
225 } 230 }
226 // Purple Tail 231 // Purple Tail
227 - if (this.$route.query.flightKindName == "Purple Tail") { 232 + if (_this.$route.query.flightKindName == "Purple Tail") {
228 - let dateParmas = { 233 + _this.dateLevelRoute(this.dateParmas);
229 - purposeOfFlightNo: this.$route.query.purposeOfFlightNo,
230 - flightDate: this.$route.query.flightDate,
231 - flightRouteListStr: this.$route.query.flightRouteListStr,
232 - status: "",
233 - };
234 - this.dateLevelRoute(dateParmas);
235 } 234 }
236 }, 235 },
237 }, 236 },
238 // 航班顺位设置 237 // 航班顺位设置
239 flightRandConfig: { 238 flightRandConfig: {
240 - queryParmas: () => { 239 + noDateParmas: {
241 - // 普通级别
242 - if (this.$route.query.pageName == "flightRandConfig") {
243 - let noDateParmas = {
244 - flightDate: this.$route.query.flightDate,
245 flightRoute: "", 240 flightRoute: "",
246 - purposeOfFlightNo: this.$route.query.purposeOfFlightNo, 241 + flightRouteListStr: "",
242 + purposeOfFlightNo: _this.$route.query.purposeOfFlightNo,
247 status: "", 243 status: "",
248 - }; 244 + },
249 - // 日期级别 245 + dateParmas: {
250 - let dateParmas = { 246 + flightDate: _this.$route.query.flightDate,
251 flightRoute: "", 247 flightRoute: "",
252 - flightRouteListStr: "", 248 + purposeOfFlightNo: _this.$route.query.purposeOfFlightNo,
253 - purposeOfFlightNo: this.$route.query.purposeOfFlightNo,
254 status: "", 249 status: "",
255 - }; 250 + },
256 - this.noDateLevelRoute(noDateParmas); 251 + queryParmas: function () {
257 - this.dateLevelRoute(dateParmas); 252 + // 普通级别
253 + if (_this.$route.query.pageName == "flightRandConfig") {
254 + _this.noDateLevelRoute(this.noDateParmas);
255 + _this.dateLevelRoute(this.dateParmas);
258 } 256 }
259 }, 257 },
260 }, 258 },
......