Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
0ed373c6 1 parent 6b5f5c57

modify

Expand all
Inline Side-by-side
Showing 15 changed files with 344 additions and 345 deletions
...@@ -121,15 +121,12 @@ export function saveOrUpdateSpecifyDateRoute(data) { ...@@ -121,15 +121,12 @@ export function saveOrUpdateSpecifyDateRoute(data) {
121 } 121 }
122 122
123 // id查询目的航班 123 // id查询目的航班
124 -export function findByFlightId(id) { 124 +export function findByFlightId(data) {
125 - const data = {
126 - id
127 - }
128 return request({ 125 return request({
129 - url: '/destinationFlight/findByFlightId', 126 + url: "/destinationFlight/findByFlightId",
130 - method: 'post', 127 + method: "post",
131 - data: data 128 + data: data,
132 - }) 129 + });
133 } 130 }
134 131
135 //航班号查航班 132 //航班号查航班
......
...@@ -2,12 +2,35 @@ ...@@ -2,12 +2,35 @@
2 <el-card> 2 <el-card>
3 <div class="row"> 3 <div class="row">
4 <div class="col-6"> 4 <div class="col-6">
5 - <draggable class="list-group" tag="ul" v-model="routeList" v-bind="dragOptions" @start="dragStart" @end="dragEnd"> 5 + <draggable
6 + class="list-group"
7 + tag="ul"
8 + v-model="routeList"
9 + v-bind="dragOptions"
10 + @start="dragStart"
11 + @end="dragEnd"
12 + >
6 <transition-group type="transition" name="flip-list"> 13 <transition-group type="transition" name="flip-list">
7 - <li class="list-group-item" v-for="item in routeList" :key="item.routePriority"> 14 + <li
8 - <i :class="item.fixed ? 'fa fa-anchor' : 'glyphicon glyphicon-pushpin' 15 + class="list-group-item"
9 - " @click="item.fixed = !item.fixed" aria-hidden="true"></i> 16 + v-for="(item, i) in routeList"
10 - {{ item.route }} 17 + :key="item.route"
18 + >
19 + <i
20 + :class="
21 + item.fixed ? 'fa fa-anchor' : 'glyphicon glyphicon-pushpin'
22 + "
23 + @click="item.fixed = !item.fixed"
24 + aria-hidden="true"
25 + ></i>
26 + <span v-if="item.isEtesRoute == 'Y' || item.etesRule == 'Y'"
27 + ><i class="route-count">{{ ++i }}</i
28 + >{{ item.route }}【ET86航线】</span
29 + >
30 + <span v-else
31 + ><i class="route-count">{{ ++i }}</i
32 + >{{ item.route }}</span
33 + >
11 </li> 34 </li>
12 </transition-group> 35 </transition-group>
13 </draggable> 36 </draggable>
...@@ -34,13 +57,13 @@ export default { ...@@ -34,13 +57,13 @@ export default {
34 animation: 200, 57 animation: 200,
35 group: "description", 58 group: "description",
36 disabled: false, 59 disabled: false,
37 - ghostClass: "ghost" 60 + ghostClass: "ghost",
38 - } 61 + };
39 }, 62 },
40 }, 63 },
41 }, 64 },
42 components: { 65 components: {
43 - draggable 66 + draggable,
44 }, 67 },
45 data() { 68 data() {
46 return {}; 69 return {};
...@@ -49,12 +72,12 @@ export default { ...@@ -49,12 +72,12 @@ export default {
49 methods: { 72 methods: {
50 // 排序 73 // 排序
51 sort() { 74 sort() {
52 - this.routeList = this.routeList.sort((a, b) => a.routePriority - b.routePriority); 75 + this.routeList = this.routeList.sort(
76 + (a, b) => a.routePriority - b.routePriority
77 + );
53 }, 78 },
54 // 开始拖拽 79 // 开始拖拽
55 - dragStart() { 80 + dragStart() {},
56 -
57 - },
58 // 结束拖拽 81 // 结束拖拽
59 dragEnd() { 82 dragEnd() {
60 this.$emit("dragEnd", this.routeList); 83 this.$emit("dragEnd", this.routeList);
...@@ -62,48 +85,44 @@ export default { ...@@ -62,48 +85,44 @@ export default {
62 }, 85 },
63 }; 86 };
64 </script> 87 </script>
65 -
66 <style lang="scss"> 88 <style lang="scss">
67 .el-card__body { 89 .el-card__body {
68 padding: 15px 10px 0px 10px !important; 90 padding: 15px 10px 0px 10px !important;
69 } 91 }
70 -
71 .list-group { 92 .list-group {
72 min-height: 20px; 93 min-height: 20px;
73 max-height: 150px; 94 max-height: 150px;
74 overflow: auto; 95 overflow: auto;
75 margin-top: 0; 96 margin-top: 0;
76 padding: 0; 97 padding: 0;
77 -
78 &::-webkit-scrollbar { 98 &::-webkit-scrollbar {
79 width: 7px; 99 width: 7px;
80 height: 7px; 100 height: 7px;
81 } 101 }
82 -
83 &::-webkit-scrollbar-track { 102 &::-webkit-scrollbar-track {
84 background-color: #fff; 103 background-color: #fff;
85 } 104 }
86 -
87 &::-webkit-scrollbar-thumb { 105 &::-webkit-scrollbar-thumb {
88 background-color: #ccc; 106 background-color: #ccc;
89 border-radius: 20px; 107 border-radius: 20px;
90 } 108 }
91 -
92 &::-webkit-scrollbar-thumb:hover { 109 &::-webkit-scrollbar-thumb:hover {
93 background-color: #409eff; 110 background-color: #409eff;
94 } 111 }
95 -
96 &::-webkit-scrollbar-track-piece { 112 &::-webkit-scrollbar-track-piece {
97 - background: #F2F6FC; 113 + background: #f2f6fc;
98 } 114 }
99 } 115 }
100 -
101 .list-group-item { 116 .list-group-item {
102 cursor: move; 117 cursor: move;
103 padding: 5px 0px; 118 padding: 5px 0px;
104 } 119 }
105 -
106 .list-group-item i { 120 .list-group-item i {
107 cursor: pointer; 121 cursor: pointer;
108 } 122 }
123 +.route-count {
124 + font-family: initial;
125 + font-style: inherit;
126 + margin-right: 15px;
127 +}
109 </style> 128 </style>
......
...@@ -20,8 +20,9 @@ ...@@ -20,8 +20,9 @@
20 :align="rowAlign" 20 :align="rowAlign"
21 :tag="rowTag" 21 :tag="rowTag"
22 > 22 >
23 + <span v-for="item in tempFormConfig" :key="item.name">
23 <el-col 24 <el-col
24 - v-for="item in tempFormConfig" 25 + v-if="!item.hidden"
25 :span="item.span" 26 :span="item.span"
26 :offset="item.offset" 27 :offset="item.offset"
27 :tag="item.tag" 28 :tag="item.tag"
...@@ -33,7 +34,6 @@ ...@@ -33,7 +34,6 @@
33 :lg="item.lg" 34 :lg="item.lg"
34 :xl="item.xl" 35 :xl="item.xl"
35 :style="{ width: item.colWidth }" 36 :style="{ width: item.colWidth }"
36 - :key="item.prop"
37 > 37 >
38 <el-form-item 38 <el-form-item
39 :label="item.label" 39 :label="item.label"
...@@ -139,7 +139,9 @@ ...@@ -139,7 +139,9 @@
139 v-model.trim="tempQueryForm[item.prop]" 139 v-model.trim="tempQueryForm[item.prop]"
140 :style="{ width: item.inputWidth }" 140 :style="{ width: item.inputWidth }"
141 :disabled="item.disable" 141 :disabled="item.disable"
142 - :placeholder="item.placeholder ? item.placeholder : '请选择日期'" 142 + :placeholder="
143 + item.placeholder ? item.placeholder : '请选择日期'
144 + "
143 :value-format="item.format" 145 :value-format="item.format"
144 clearable 146 clearable
145 > 147 >
...@@ -151,7 +153,9 @@ ...@@ -151,7 +153,9 @@
151 v-model.trim="tempQueryForm[item.prop]" 153 v-model.trim="tempQueryForm[item.prop]"
152 :style="{ width: item.inputWidth }" 154 :style="{ width: item.inputWidth }"
153 :disabled="item.disable" 155 :disabled="item.disable"
154 - :placeholder="item.placeholder ? item.placeholder : '请选择时间'" 156 + :placeholder="
157 + item.placeholder ? item.placeholder : '请选择时间'
158 + "
155 clearable 159 clearable
156 > 160 >
157 </el-time-select> 161 </el-time-select>
...@@ -162,7 +166,9 @@ ...@@ -162,7 +166,9 @@
162 type="datetime" 166 type="datetime"
163 v-model.trim="tempQueryForm[item.prop]" 167 v-model.trim="tempQueryForm[item.prop]"
164 :disabled="item.disable" 168 :disabled="item.disable"
165 - :placeholder="item.placeholder ? item.placeholder : '请选择日期'" 169 + :placeholder="
170 + item.placeholder ? item.placeholder : '请选择日期'
171 + "
166 clearable 172 clearable
167 > 173 >
168 </el-date-picker> 174 </el-date-picker>
...@@ -235,6 +241,7 @@ ...@@ -235,6 +241,7 @@
235 </template> 241 </template>
236 </el-form-item> 242 </el-form-item>
237 </el-col> 243 </el-col>
244 + </span>
238 <!-- 查询按钮 de--> 245 <!-- 查询按钮 de-->
239 <span v-show="inline & hiddenFormBtn"> 246 <span v-show="inline & hiddenFormBtn">
240 <el-form-item v-show="show"> 247 <el-form-item v-show="show">
...@@ -458,6 +465,4 @@ export default { ...@@ -458,6 +465,4 @@ export default {
458 }, 465 },
459 }; 466 };
460 </script> 467 </script>
461 -<style lang="scss" scoped> 468 +<style lang="scss" scoped></style>
462 -
463 -</style>
......
...@@ -90,7 +90,7 @@ export const constantRoutes = [ ...@@ -90,7 +90,7 @@ export const constantRoutes = [
90 path: "/routeInfo", 90 path: "/routeInfo",
91 component: (resolve) => 91 component: (resolve) =>
92 require([ 92 require([
93 - "@/views/allocationConfig/flightAllocConfig/routeInfo", 93 + "@/views/allocationConfig/flightAllocConfig/flightRouteInfo",
94 ], resolve), 94 ], resolve),
95 name: "routeInfo", 95 name: "routeInfo",
96 meta: { title: "航班配舱", icon: "user" }, 96 meta: { title: "航班配舱", icon: "user" },
......
...@@ -471,36 +471,31 @@ export function restTableHeight($refs) { ...@@ -471,36 +471,31 @@ export function restTableHeight($refs) {
471 * }) 471 * })
472 */ 472 */
473 export function removeDuplicates(arr, keys) { 473 export function removeDuplicates(arr, keys) {
474 - const dict = {}; 474 + let duplicate, dateTime;
475 - const result = {
476 - repeat: [],
477 - unique: [],
478 - };
479 - let duplicate = keys;
480 if (typeof keys == "object") { 475 if (typeof keys == "object") {
481 duplicate = keys.duplicate; 476 duplicate = keys.duplicate;
477 + dateTime = keys.dateTime;
482 } 478 }
483 // 去重 479 // 去重
484 - result.unique = arr.reduce((res, currentValue) => { 480 + let map = new Map();
485 - if (!dict[currentValue[duplicate]]) { 481 + for (let i = 0; i < arr.length; i++) {
486 - dict[currentValue[duplicate]] = true; 482 + let item = arr[i];
487 - res.push(currentValue); 483 + if (
488 - } else { 484 + !map.has(item[duplicate]) ||
489 - result.repeat.push(currentValue); 485 + new Date(map.get(item[duplicate])[dateTime]) < new Date(item[dateTime])
486 + ) {
487 + map.set(item[duplicate], item);
490 } 488 }
491 - return res; 489 + }
492 - }, []); 490 + const result = Array.from(map.values());
493 // 返回去重结果 491 // 返回去重结果
494 if (typeof keys == "string") return result; 492 if (typeof keys == "string") return result;
495 // 排序 493 // 排序
496 if (typeof keys == "object") { 494 if (typeof keys == "object") {
497 if (keys.sort) { 495 if (keys.sort) {
498 if (keys.sortType.toLowerCase().trim() == "number") { 496 if (keys.sortType.toLowerCase().trim() == "number") {
499 - if (result.repeat.length) { 497 + if (result.length) {
500 - result.repeat = sortFn("repeat"); 498 + result = sortFn();
501 - }
502 - if (result.unique.length) {
503 - result.unique = sortFn("unique");
504 } 499 }
505 // 返回排序去重结果 500 // 返回排序去重结果
506 } 501 }
...@@ -508,13 +503,13 @@ export function removeDuplicates(arr, keys) { ...@@ -508,13 +503,13 @@ export function removeDuplicates(arr, keys) {
508 return result; 503 return result;
509 } 504 }
510 // 排序方法 505 // 排序方法
511 - function sortFn(attr) { 506 + function sortFn() {
512 - if (isNaN(Number(result[attr][0][keys.sortAttr]))) { 507 + if (isNaN(Number(result[0][keys.sortAttr]))) {
513 - return result[attr].sort((a, b) => 508 + return result.sort((a, b) =>
514 a[keys.sortAttr].localeCompare(b[keys.sortAttr]) 509 a[keys.sortAttr].localeCompare(b[keys.sortAttr])
515 ); // 按字母排序 510 ); // 按字母排序
516 } else { 511 } else {
517 - return result[attr].sort((a, b) => a[keys.sortAttr] - b[keys.sortAttr]); // 按数字排序 512 + return result.sort((a, b) => a[keys.sortAttr] - b[keys.sortAttr]); // 按数字排序
518 } 513 }
519 } 514 }
520 } 515 }
......
...@@ -8,6 +8,7 @@ export const formConfig = [ ...@@ -8,6 +8,7 @@ export const formConfig = [
8 span: 5, 8 span: 5,
9 trigger: "blur", 9 trigger: "blur",
10 labelWidth: "55px", 10 labelWidth: "55px",
11 + disable: false,
11 }, 12 },
12 { 13 {
13 label: "航班日期", 14 label: "航班日期",
...@@ -18,6 +19,8 @@ export const formConfig = [ ...@@ -18,6 +19,8 @@ export const formConfig = [
18 format: "yyyy-MM-dd", 19 format: "yyyy-MM-dd",
19 colWidth: "23%", 20 colWidth: "23%",
20 inputWidth: "100%", 21 inputWidth: "100%",
22 + disable: false,
23 + hidden: false,
21 }, 24 },
22 { 25 {
23 label: "航线", 26 label: "航线",
...@@ -28,6 +31,8 @@ export const formConfig = [ ...@@ -28,6 +31,8 @@ export const formConfig = [
28 span: 5, 31 span: 5,
29 labelWidth: "40px", 32 labelWidth: "40px",
30 trigger: "blur", // 事件名 33 trigger: "blur", // 事件名
34 + disable: false,
35 + hidden: false,
31 }, 36 },
32 { 37 {
33 label: "航线优先级", 38 label: "航线优先级",
...@@ -43,8 +48,10 @@ export const formConfig = [ ...@@ -43,8 +48,10 @@ export const formConfig = [
43 // 航线规则表单 48 // 航线规则表单
44 export const routeRuleForm = { 49 export const routeRuleForm = {
45 config: true, 50 config: true,
46 - remark: true, 51 + purposeOfFlightNo: "LP001",
47 flightRoute: "", // 飞行航线 52 flightRoute: "", // 飞行航线
53 + routeSpecifyDateSeq: "", // 航线优先级
54 + declarationCategory: "",
48 location: null, // 包含始发站 55 location: null, // 包含始发站
49 notLocation: null, // 不包含始发站 56 notLocation: null, // 不包含始发站
50 destinationSite: null, // 包含目的站 57 destinationSite: null, // 包含目的站
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form ref="flightAllocForm" :model="queryParams" class="form-header" size="small" label-position="right" 3 + <el-form
4 - label-width="auto" @submit.native.prevent> 4 + ref="flightAllocForm"
5 + :model="queryParams"
6 + class="form-header"
7 + size="small"
8 + label-position="right"
9 + label-width="auto"
10 + @submit.native.prevent
11 + >
5 <el-row> 12 <el-row>
6 <el-col :span="6"> 13 <el-col :span="6">
7 <el-form-item label="航班号"> 14 <el-form-item label="航班号">
8 - <el-input class="formItem" v-model.trim="purposeOfFlightNo" placeholder="航班号" @keyup.enter.native="getList"> 15 + <el-input
16 + class="formItem"
17 + v-model.trim="purposeOfFlightNo"
18 + placeholder="航班号"
19 + @keyup.enter.native="getList"
20 + >
9 </el-input> 21 </el-input>
10 </el-form-item> 22 </el-form-item>
11 </el-col> 23 </el-col>
12 <el-col :span="6"> 24 <el-col :span="6">
13 <el-form-item label="航班日期"> 25 <el-form-item label="航班日期">
14 - <el-date-picker class="formItem" v-model="queryParams.flightDate" type="date" placeholder="选择日期" 26 + <el-date-picker
15 - value-format="yyyy-MM-dd" clearable :disabled="queryParams.querySpecifyData == '2'"> 27 + class="formItem"
28 + v-model="queryParams.flightDate"
29 + type="date"
30 + placeholder="选择日期"
31 + value-format="yyyy-MM-dd"
32 + clearable
33 + :disabled="queryParams.querySpecifyData == '2'"
34 + >
16 </el-date-picker> 35 </el-date-picker>
17 </el-form-item> 36 </el-form-item>
18 </el-col> 37 </el-col>
19 <el-col :span="4"> 38 <el-col :span="4">
20 <el-form-item label="状态"> 39 <el-form-item label="状态">
21 - <el-select class="formItem" v-model="queryParams.status" placeholder="状态"> 40 + <el-select
41 + class="formItem"
42 + v-model="queryParams.status"
43 + placeholder="状态"
44 + >
22 <el-option label="有效" value="1"></el-option> 45 <el-option label="有效" value="1"></el-option>
23 <el-option label="停用" value="3"></el-option> 46 <el-option label="停用" value="3"></el-option>
24 </el-select> 47 </el-select>
...@@ -26,34 +49,76 @@ ...@@ -26,34 +49,76 @@
26 </el-col> 49 </el-col>
27 </el-row> 50 </el-row>
28 <div> 51 <div>
29 - <el-button type="primary" icon="el-icon-search" :loading="loading" @click="getList" size="mini">查询</el-button> 52 + <el-button
30 - <el-button class="mb20" type="primary" icon="el-icon-plus" size="mini" v-hasPermi="['allocation:alloc:add']" 53 + type="primary"
31 - @click=" 54 + icon="el-icon-search"
32 - $router.push({ 55 + :loading="loading"
33 - name: 'FlightAllocConfigInfo', 56 + @click="getList"
34 - params: { handle: 'add', fltNo: 'new', fltDate: ' ', status: null, routeStatus: '' }, 57 + size="mini"
35 - }) 58 + >查询</el-button
36 - ">添加</el-button> 59 + >
37 - <el-switch style="margin-left: 10px;" v-model="queryParams.querySpecifyData" inactive-text="日期查询" active-value="1" 60 + <el-button
38 - inactive-value="2" active-color="#13ce66" inactive-color="#909399" @change="switchChange"></el-switch> 61 + class="mb20"
62 + type="primary"
63 + icon="el-icon-plus"
64 + size="mini"
65 + v-hasPermi="['allocation:alloc:add']"
66 + @click="addFlightRouteConfig"
67 + >添加</el-button
68 + >
69 + <el-switch
70 + style="margin-left: 10px"
71 + v-model="queryParams.querySpecifyData"
72 + inactive-text="日期查询"
73 + active-value="1"
74 + inactive-value="2"
75 + active-color="#13ce66"
76 + inactive-color="#909399"
77 + @change="switchChange"
78 + ></el-switch>
39 </div> 79 </div>
40 </el-form> 80 </el-form>
41 - <Tables ref="newTables" ductName="FlightAlloc" :data="flyList" :headerData="tableHeaders['flightAlloc']" :order="true" 81 + <Tables
42 - :totalCount="total" :loading="loading" :limitSize="queryParams.limit" :limitStart="queryParams.start" 82 + ref="newTables"
43 - :page="curPage" :pageSizes="[20]" :height="tableHeight" @currentChange="currentChange"> 83 + ductName="FlightAlloc"
84 + :data="flyList"
85 + :headerData="tableHeaders['flightAlloc']"
86 + :order="true"
87 + :totalCount="total"
88 + :loading="loading"
89 + :limitSize="queryParams.limit"
90 + :limitStart="queryParams.start"
91 + :page="curPage"
92 + :pageSizes="[20]"
93 + :height="tableHeight"
94 + @currentChange="currentChange"
95 + >
44 <template v-slot:ruleDate="scope"> 96 <template v-slot:ruleDate="scope">
45 - <el-link v-if="scope.row.ruleDate" type="primary" @click="toRouteOrder(scope.row)"> 97 + <el-link
46 - {{ 98 + v-if="scope.row.ruleDate"
47 - scope.row.ruleDate 99 + type="primary"
48 - }}<i class="el-icon-link"></i> </el-link> 100 + @click="toRouteOrder(scope.row)"
101 + >
102 + {{ scope.row.ruleDate }}<i class="el-icon-link"></i>
103 + </el-link>
49 </template> 104 </template>
50 <template slot="optionColumn"> 105 <template slot="optionColumn">
51 <el-table-column label="操作" align="center" width="150"> 106 <el-table-column label="操作" align="center" width="150">
52 <template slot-scope="scope"> 107 <template slot-scope="scope">
53 - <el-button type="text" size="mini" icon="el-icon-view" @click="handleClick(scope.row, 'view')">查看 108 + <el-button
109 + type="text"
110 + size="mini"
111 + icon="el-icon-view"
112 + @click="handleClick(scope.row, 'view')"
113 + >查看
54 </el-button> 114 </el-button>
55 - <el-button type="text" size="mini" icon="el-icon-edit" v-hasPermi="['allocation:alloc:update']" 115 + <el-button
56 - @click="handleClick(scope.row, 'edit')">修改 116 + type="text"
117 + size="mini"
118 + icon="el-icon-edit"
119 + v-hasPermi="['allocation:alloc:update']"
120 + @click="handleClick(scope.row, 'edit')"
121 + >修改
57 </el-button> 122 </el-button>
58 <!-- <el-button type="text" size="mini" icon="el-icon-delete" style="color:#ff4949" 123 <!-- <el-button type="text" size="mini" icon="el-icon-delete" style="color:#ff4949"
59 v-hasPermi="['allocation:alloc:delete']" @click="del(scope.row.id, scope.row.status)">删除</el-button> 124 v-hasPermi="['allocation:alloc:delete']" @click="del(scope.row.id, scope.row.status)">删除</el-button>
...@@ -70,22 +135,20 @@ ...@@ -70,22 +135,20 @@
70 </template> 135 </template>
71 136
72 <script> 137 <script>
73 -import { 138 +import { findFlightDimRuleByFlightNo } from "@/api/destinationFlight";
74 - findFlightDimRuleByFlightNo 139 +import Dialog from "./dialog.vue";
75 -} from "@/api/destinationFlight";
76 -import Dialog from './dialog.vue'
77 140
78 export default { 141 export default {
79 name: "FlightAllocConfig", 142 name: "FlightAllocConfig",
80 components: { 143 components: {
81 - Dialog 144 + Dialog,
82 }, 145 },
83 data() { 146 data() {
84 return { 147 return {
85 queryParams: { 148 queryParams: {
86 purposeOfFlightNo: null, 149 purposeOfFlightNo: null,
87 flightDate: undefined, 150 flightDate: undefined,
88 - querySpecifyData: '2', 151 + querySpecifyData: "2",
89 status: "1", 152 status: "1",
90 start: 0, 153 start: 0,
91 limit: 20, 154 limit: 20,
...@@ -113,13 +176,14 @@ export default { ...@@ -113,13 +176,14 @@ export default {
113 // }) 176 // })
114 }, 177 },
115 mounted() { 178 mounted() {
116 - this.tableHeight = window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200 179 + this.tableHeight =
180 + window.innerHeight - this.$refs.flightAllocForm.$el.offsetHeight - 200;
117 }, 181 },
118 activated() { 182 activated() {
119 - this.getList() 183 + this.getList();
120 }, 184 },
121 deactivated() { 185 deactivated() {
122 - this.flyList = [] 186 + this.flyList = [];
123 }, 187 },
124 methods: { 188 methods: {
125 getList() { 189 getList() {
...@@ -129,18 +193,35 @@ export default { ...@@ -129,18 +193,35 @@ export default {
129 this.queryParams.start = 0; 193 this.queryParams.start = 0;
130 } 194 }
131 this.loading = true; 195 this.loading = true;
132 - findFlightDimRuleByFlightNo(this.queryParams).then(res => { 196 + findFlightDimRuleByFlightNo(this.queryParams)
133 - this.loading = false 197 + .then((res) => {
198 + this.loading = false;
134 if (res.code === 200) { 199 if (res.code === 200) {
135 - this.flyList = res.data.list 200 + this.flyList = res.data.list;
136 - this.total = res.data.totalCount 201 + this.total = res.data.totalCount;
137 } else { 202 } else {
138 - this.msgWarning(res.msg) 203 + this.msgWarning(res.msg);
139 } 204 }
140 - }).catch(err => {
141 - this.loading = false
142 - console.log(err)
143 }) 205 })
206 + .catch((err) => {
207 + this.loading = false;
208 + console.log(err);
209 + });
210 + },
211 + // 添加
212 + addFlightRouteConfig() {
213 + this.$router.push({
214 + path: "/routeInfo",
215 + query: {
216 + flightDate: '', // 跳转的时候默认当天日期
217 + purposeOfFlightNo: '',
218 + flightRouteListStr: '',
219 + status: '',
220 + pageName: "flightAllocConfig",
221 + dataStatus: "add",
222 + disable: '',
223 + },
224 + });
144 }, 225 },
145 //跳转到查看，修改页面 226 //跳转到查看，修改页面
146 handleClick({ purposeOfFlightNo, ruleDate, flightRoute, status }, name) { 227 handleClick({ purposeOfFlightNo, ruleDate, flightRoute, status }, name) {
...@@ -153,7 +234,8 @@ export default { ...@@ -153,7 +234,8 @@ export default {
153 status: status, 234 status: status,
154 pageName: "flightAllocConfig", 235 pageName: "flightAllocConfig",
155 dataStatus: name, 236 dataStatus: name,
156 - querySpecifyData: this.queryParams.querySpecifyData 237 + querySpecifyData: this.queryParams.querySpecifyData,
238 + disable: true,
157 }, 239 },
158 }); 240 });
159 }, 241 },
...@@ -161,25 +243,25 @@ export default { ...@@ -161,25 +243,25 @@ export default {
161 toRouteOrder(val) { 243 toRouteOrder(val) {
162 this.colData = { 244 this.colData = {
163 fltNo: val.purposeOfFlightNo, 245 fltNo: val.purposeOfFlightNo,
164 - fltDate: val.ruleDate 246 + fltDate: val.ruleDate,
165 - } 247 + };
166 - this.open = true 248 + this.open = true;
167 }, 249 },
168 //开关改变 250 //开关改变
169 switchChange(val) { 251 switchChange(val) {
170 - if (val == '2') { 252 + if (val == "2") {
171 - this.queryParams.flightDate = undefined 253 + this.queryParams.flightDate = undefined;
172 } 254 }
173 }, 255 },
174 close() { 256 close() {
175 - this.open = false 257 + this.open = false;
176 }, 258 },
177 //翻页 259 //翻页
178 currentChange(val) { 260 currentChange(val) {
179 - this.curPage = val.page 261 + this.curPage = val.page;
180 this.queryParams.start = val.start; 262 this.queryParams.start = val.start;
181 this.getList(); 263 this.getList();
182 - } 264 + },
183 }, 265 },
184 computed: { 266 computed: {
185 purposeOfFlightNo: { 267 purposeOfFlightNo: {
...@@ -193,5 +275,3 @@ export default { ...@@ -193,5 +275,3 @@ export default {
193 }, 275 },
194 }; 276 };
195 </script> 277 </script>
196 -
197 -
......
1 -export const routeData1 = {
2 - code: 200,
3 - msg: "操作成功",
4 - data: {
5 - list: [
6 - {
7 - id: 3337,
8 - createTime: "2023-09-21 09:50:01",
9 - createUserId: "5749",
10 - createUserName: "wjh",
11 - updateTime: null,
12 - updateUserName: null,
13 - purposeOfFlightNo: "JC001",
14 - location: null,
15 - includeUrsa: "P_",
16 - notIncludeUrsa: null,
17 - minNumOfPieces: null,
18 - maxNumOfPieces: null,
19 - minWeight: null,
20 - maxWeight: null,
21 - serviceCode: null,
22 - declarationCategory: null,
23 - typeOfGoods: null,
24 - subCategory: null,
25 - status: "1",
26 - whetherHistory: "0",
27 - historyId: null,
28 - updateUserId: null,
29 - notLocation: null,
30 - handlingCode: null,
31 - portName: "PVG",
32 - puporpuxCode: null,
33 - flightRoute: "USA",
34 - routePriority: "1",
35 - ruleDate: "2023-09-21",
36 - routeSpecifyDateSeq: "USA;SEYB",
37 - destinationSite: null,
38 - notDestinationSite: null,
39 - },
40 - {
41 - id: 3338,
42 - createTime: "2023-09-21 09:50:03",
43 - createUserId: "5749",
44 - createUserName: "wjh",
45 - updateTime: null,
46 - updateUserName: null,
47 - purposeOfFlightNo: "JC001",
48 - location: null,
49 - includeUrsa: "P_",
50 - notIncludeUrsa: null,
51 - minNumOfPieces: null,
52 - maxNumOfPieces: null,
53 - minWeight: null,
54 - maxWeight: null,
55 - serviceCode: null,
56 - declarationCategory: null,
57 - typeOfGoods: null,
58 - subCategory: null,
59 - status: "1",
60 - whetherHistory: "0",
61 - historyId: null,
62 - updateUserId: null,
63 - notLocation: null,
64 - handlingCode: null,
65 - portName: "PVG",
66 - puporpuxCode: null,
67 - flightRoute: "SEYB",
68 - routePriority: "2",
69 - ruleDate: "2023-09-21",
70 - routeSpecifyDateSeq: "USA;SEYB",
71 - destinationSite: null,
72 - notDestinationSite: null,
73 - },
74 - ],
75 - routeList: [
76 - {
77 - fltNo: "JC001",
78 - route: "USA",
79 - routePriority: "1",
80 - },
81 - {
82 - fltNo: "JC001",
83 - route: "SEYB",
84 - routePriority: "2",
85 - },
86 - ],
87 - },
88 -};
89 -
90 -export const routeData2 = {
91 - code: 200,
92 - msg: "操作成功",
93 - data: {
94 - list: [
95 - {
96 - id: 3335,
97 - createTime: "2023-09-21 09:49:40",
98 - createUserId: "5749",
99 - createUserName: "wjh",
100 - updateTime: "2023-09-21 09:56:12",
101 - updateUserName: "wjh",
102 - purposeOfFlightNo: "JC001",
103 - location: null,
104 - includeUrsa: "P_",
105 - notIncludeUrsa: null,
106 - minNumOfPieces: null,
107 - maxNumOfPieces: null,
108 - minWeight: null,
109 - maxWeight: null,
110 - serviceCode: null,
111 - declarationCategory: null,
112 - typeOfGoods: null,
113 - subCategory: null,
114 - status: "1",
115 - whetherHistory: "0",
116 - historyId: null,
117 - updateUserId: 5749,
118 - notLocation: null,
119 - handlingCode: null,
120 - portName: "PVG",
121 - puporpuxCode: null,
122 - flightRoute: "USA",
123 - routePriority: "1",
124 - ruleDate: null,
125 - routeSpecifyDateSeq: "USA;SEYB;LKE",
126 - destinationSite: null,
127 - notDestinationSite: null,
128 - },
129 - {
130 - id: 3336,
131 - createTime: "2023-09-21 09:49:46",
132 - createUserId: "5749",
133 - createUserName: "wjh",
134 - updateTime: "2023-09-21 09:56:12",
135 - updateUserName: "wjh",
136 - purposeOfFlightNo: "JC001",
137 - location: null,
138 - includeUrsa: "P_",
139 - notIncludeUrsa: null,
140 - minNumOfPieces: null,
141 - maxNumOfPieces: null,
142 - minWeight: null,
143 - maxWeight: null,
144 - serviceCode: null,
145 - declarationCategory: null,
146 - typeOfGoods: null,
147 - subCategory: null,
148 - status: "1",
149 - whetherHistory: "0",
150 - historyId: null,
151 - updateUserId: 5749,
152 - notLocation: null,
153 - handlingCode: null,
154 - portName: "PVG",
155 - puporpuxCode: null,
156 - flightRoute: "SEYB",
157 - routePriority: "2",
158 - ruleDate: null,
159 - routeSpecifyDateSeq: "USA;SEYB;LKE",
160 - destinationSite: null,
161 - notDestinationSite: null,
162 - },
163 - ],
164 - routeList: [
165 - {
166 - fltNo: "JC001",
167 - route: "USA",
168 - routePriority: "1",
169 - },
170 - {
171 - fltNo: "JC001",
172 - route: "SEYB",
173 - routePriority: "2",
174 - },
175 - {
176 - fltNo: "JC001",
177 - route: "LKE",
178 - routePriority: "3",
179 - },
180 - ],
181 - },
182 -};
...@@ -285,6 +285,7 @@ export default { ...@@ -285,6 +285,7 @@ export default {
285 flightRouteListStr: route, 285 flightRouteListStr: route,
286 status: "", 286 status: "",
287 pageName: "flightRandConfig", 287 pageName: "flightRandConfig",
288 + disable: true,
288 }, 289 },
289 }); 290 });
290 }, 291 },
......
...@@ -803,10 +803,7 @@ export default { ...@@ -803,10 +803,7 @@ export default {
803 if (latestView) { 803 if (latestView) {
804 this.$router.push(latestView.fullPath); 804 this.$router.push(latestView.fullPath);
805 } else { 805 } else {
806 - // now the default is to redirect to the home page if there is no tags-view,
807 - // you can adjust it according to your needs.
808 if (view.name === "Dashboard") { 806 if (view.name === "Dashboard") {
809 - // to reload home page
810 this.$router.replace({ path: "/redirect" + view.fullPath }); 807 this.$router.replace({ path: "/redirect" + view.fullPath });
811 } else { 808 } else {
812 this.$router.push("/"); 809 this.$router.push("/");
......
1 <template> 1 <template>
2 <div> 2 <div>
3 - <el-form ref="dmLogForm" class="form-header" :model="selectForm" label-width="auto" size="small" 3 + <el-form
4 - @submit.native.prevent> 4 + ref="dmLogForm"
5 + class="form-header"
6 + :model="selectForm"
7 + label-width="auto"
8 + size="small"
9 + @submit.native.prevent
10 + >
5 <el-row type="flex" style="flex-wrap: wrap !important"> 11 <el-row type="flex" style="flex-wrap: wrap !important">
6 <el-col :span="6"> 12 <el-col :span="6">
7 <el-form-item label="ACCS原航班号"> 13 <el-form-item label="ACCS原航班号">
8 - <el-input v-model.trim="fltNo" class="formItem" placeholder="请输入航班号" clearable></el-input> 14 + <el-input
15 + v-model.trim="fltNo"
16 + class="formItem"
17 + placeholder="请输入航班号"
18 + clearable
19 + ></el-input>
9 </el-form-item> 20 </el-form-item>
10 </el-col> 21 </el-col>
11 <el-col :span="6"> 22 <el-col :span="6">
12 <el-form-item label="数据接收日期" prop="createTime"> 23 <el-form-item label="数据接收日期" prop="createTime">
13 - <el-date-picker v-model="selectForm.createTime" class="formItem" type="date" placeholder="选择日期" 24 + <el-date-picker
14 - :value-format="valueFormat" clearable> 25 + v-model="selectForm.createTime"
26 + class="formItem"
27 + type="date"
28 + placeholder="选择日期"
29 + :value-format="valueFormat"
30 + clearable
31 + >
15 </el-date-picker> 32 </el-date-picker>
16 </el-form-item> 33 </el-form-item>
17 </el-col> 34 </el-col>
18 <el-col :span="6"> 35 <el-col :span="6">
19 <el-form-item label="运单号"> 36 <el-form-item label="运单号">
20 - <el-input v-model="selectForm.awbNbr" class="formItem" placeholder="请输入运单号" clearable></el-input> 37 + <el-input
38 + v-model="selectForm.awbNbr"
39 + class="formItem"
40 + placeholder="请输入运单号"
41 + clearable
42 + ></el-input>
21 </el-form-item> 43 </el-form-item>
22 </el-col> 44 </el-col>
23 <el-col :span="6"> 45 <el-col :span="6">
24 <el-form-item label="处理状态级别"> 46 <el-form-item label="处理状态级别">
25 - <el-select v-model="selectForm.status" class="formItem" placeholder="不限" clearable> 47 + <el-select
48 + v-model="selectForm.status"
49 + class="formItem"
50 + placeholder="不限"
51 + clearable
52 + >
26 <el-option label="未处理" value="0"></el-option> 53 <el-option label="未处理" value="0"></el-option>
27 <el-option label="处理成功" value="1"></el-option> 54 <el-option label="处理成功" value="1"></el-option>
28 <el-option label="无需处理" value="2"></el-option> 55 <el-option label="无需处理" value="2"></el-option>
...@@ -34,52 +61,85 @@ ...@@ -34,52 +61,85 @@
34 </el-col> 61 </el-col>
35 <el-col :span="6"> 62 <el-col :span="6">
36 <el-form-item label="ACCS原航班日期"> 63 <el-form-item label="ACCS原航班日期">
37 - <el-date-picker v-model="selectForm.fltDate" class="formItem" type="date" placeholder="选择日期" 64 + <el-date-picker
38 - :value-format="valueFormat" clearable> 65 + v-model="selectForm.fltDate"
66 + class="formItem"
67 + type="date"
68 + placeholder="选择日期"
69 + :value-format="valueFormat"
70 + clearable
71 + >
39 </el-date-picker> 72 </el-date-picker>
40 </el-form-item> 73 </el-form-item>
41 </el-col> 74 </el-col>
42 <el-col :span="6"> 75 <el-col :span="6">
43 <el-form-item label="回推ACCS结果"> 76 <el-form-item label="回推ACCS结果">
44 - <el-select v-model="selectForm.sendLogSendResult" class="formItem" placeholder="不限" clearable> 77 + <el-select
45 - <el-option label="未推" value="0"> 78 + v-model="selectForm.sendLogSendResult"
46 - </el-option> 79 + class="formItem"
47 - <el-option label="推送成功" value="1"> 80 + placeholder="不限"
48 - </el-option> 81 + clearable
49 - <el-option label="推送失败" value="2"> 82 + >
50 - </el-option> 83 + <el-option label="未推" value="0"> </el-option>
84 + <el-option label="推送成功" value="1"> </el-option>
85 + <el-option label="推送失败" value="2"> </el-option>
51 </el-select> 86 </el-select>
52 </el-form-item> 87 </el-form-item>
53 </el-col> 88 </el-col>
54 </el-row> 89 </el-row>
55 <div class="ml20" style="display: flex"> 90 <div class="ml20" style="display: flex">
56 - <el-button type="primary" size="mini" icon="el-icon-search" :loading="loading" @click="selectDMData(0)">查询 91 + <el-button
92 + type="primary"
93 + size="mini"
94 + icon="el-icon-search"
95 + :loading="loading"
96 + @click="selectDMData(0)"
97 + >查询
57 </el-button> 98 </el-button>
58 </div> 99 </div>
59 </el-form> 100 </el-form>
60 - <Tables ref="dmLogTables" ductName="logDmData" :order="true" :data="data" :headerData="tableHeader" 101 + <Tables
61 - tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectForm.page" 102 + ref="dmLogTables"
62 - :limitSize="selectForm.size" :pageSizes="[100]" :totalCount="total" :loading="loading" 103 + ductName="logDmData"
63 - @currentChange="currentChange"> 104 + :order="true"
105 + :data="data"
106 + :headerData="tableHeader"
107 + tableAlign="center"
108 + :showOverflowTooltip="false"
109 + :height="tableHeight"
110 + :page="selectForm.page"
111 + :limitSize="selectForm.size"
112 + :pageSizes="[100]"
113 + :totalCount="total"
114 + :loading="loading"
115 + @currentChange="currentChange"
116 + >
64 <template v-slot:awbNbr="scope"> 117 <template v-slot:awbNbr="scope">
65 <el-link type="primary" @click="gotoWeatherTable(scope.row)"> 118 <el-link type="primary" @click="gotoWeatherTable(scope.row)">
66 - {{ 119 + {{ scope.row.awbNbr }}<i class="el-icon-link"></i>
67 - scope.row.awbNbr 120 + </el-link>
68 - }}<i class="el-icon-link"></i> </el-link>
69 </template> 121 </template>
70 <template v-slot:flightFltNo="scope"> 122 <template v-slot:flightFltNo="scope">
71 - <el-link v-if="scope.row.allocDimId" type="primary" 123 + <el-link
72 - @click="$router.push({ name: 'FlightAllocConfigInfo', params: { id: scope.row.allocDimId, handle: 'detail', fltNo: scope.row.flightFltNo, fltDate: scope.row.flightFltDate ? scope.row.flightFltDate : ' ', routeStatus: 'dmLog', route: scope.row.currentFlightRoute ? scope.row.currentFlightRoute : ' ', status: ' ', createStatus: 1, } })"> 124 + v-if="scope.row.allocDimId"
73 - {{ 125 + type="primary"
74 - scope.row.flightFltNo 126 + @click="viewRouteConfig(scope.row)"
75 - }}<i class="el-icon-link"></i> </el-link> 127 + >
128 + {{ scope.row.flightFltNo }}<i class="el-icon-link"></i>
129 + </el-link>
76 <span v-else>{{ scope.row.flightFltNo }}</span> 130 <span v-else>{{ scope.row.flightFltNo }}</span>
77 </template> 131 </template>
78 <template v-slot:remarksDetail="scope"> 132 <template v-slot:remarksDetail="scope">
79 - <span v-if="scope.row.remarksDetail == null || scope.row.remarksDetail == ''">{{ scope.row.remarksDetail 133 + <span
80 - }}</span> 134 + v-if="
135 + scope.row.remarksDetail == null || scope.row.remarksDetail == ''
136 + "
137 + >{{ scope.row.remarksDetail }}</span
138 + >
81 <div v-else> 139 <div v-else>
82 - <div v-for="item in scope.row.remarksDetail.split('\\r\\n')">{{ item }}</div> 140 + <div v-for="item in scope.row.remarksDetail.split('\\r\\n')">
141 + {{ item }}
142 + </div>
83 </div> 143 </div>
84 </template> 144 </template>
85 </Tables> 145 </Tables>
...@@ -100,7 +160,7 @@ export default { ...@@ -100,7 +160,7 @@ export default {
100 size: 100, 160 size: 100,
101 }, 161 },
102 data: [], 162 data: [],
103 - tableHeader: this.tableHeaders['DM'], 163 + tableHeader: this.tableHeaders["DM"],
104 portList: [], 164 portList: [],
105 rules: { 165 rules: {
106 createTime: [ 166 createTime: [
...@@ -138,7 +198,8 @@ export default { ...@@ -138,7 +198,8 @@ export default {
138 this.data = []; 198 this.data = [];
139 }, 199 },
140 mounted() { 200 mounted() {
141 - this.tableHeight = window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130; 201 + this.tableHeight =
202 + window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
142 }, 203 },
143 methods: { 204 methods: {
144 //数据查询 205 //数据查询
...@@ -151,32 +212,37 @@ export default { ...@@ -151,32 +212,37 @@ export default {
151 getDmDataList(this.selectForm).then((res) => { 212 getDmDataList(this.selectForm).then((res) => {
152 this.loading = false; 213 this.loading = false;
153 if (res.code === 200) { 214 if (res.code === 200) {
154 - this.total = res.data.total 215 + this.total = res.data.total;
155 if (res.data.total === 0) { 216 if (res.data.total === 0) {
156 - this.msgWarning('未查询到数据') 217 + this.msgWarning("未查询到数据");
157 } else { 218 } else {
158 this.data = res.data.list; 219 this.data = res.data.list;
159 } 220 }
160 } else { 221 } else {
161 - this.msgWarning(res.msg) 222 + this.msgWarning(res.msg);
162 } 223 }
163 }); 224 });
164 }, 225 },
165 //跳转流水 226 //跳转流水
166 gotoWeatherTable(val) { 227 gotoWeatherTable(val) {
167 - getDmFlowInformation('accsId=' + val.dmAccsId).then(res => { 228 + getDmFlowInformation("accsId=" + val.dmAccsId)
229 + .then((res) => {
168 if (res.code === 200) { 230 if (res.code === 200) {
169 if (res.data.list.length > 0) { 231 if (res.data.list.length > 0) {
170 - this.$router.push({ name: 'weatherTable', params: { data: res.data.list, awbNbr: val.awbNbr } }) 232 + this.$router.push({
233 + name: "weatherTable",
234 + params: { data: res.data.list, awbNbr: val.awbNbr },
235 + });
171 } else { 236 } else {
172 - this.msgWarning('未查询到该条数据的流水') 237 + this.msgWarning("未查询到该条数据的流水");
173 } 238 }
174 } else { 239 } else {
175 - this.msgWarning(res.msg) 240 + this.msgWarning(res.msg);
176 } 241 }
177 - }).catch(err => {
178 - console.log(err)
179 }) 242 })
243 + .catch((err) => {
244 + console.log(err);
245 + });
180 }, 246 },
181 //分页 247 //分页
182 currentChange(val) { 248 currentChange(val) {
...@@ -204,6 +270,20 @@ export default { ...@@ -204,6 +270,20 @@ export default {
204 item.index = index; 270 item.index = index;
205 }); 271 });
206 }, 272 },
273 + // 当前配载航班号跳转查看航线配置详情
274 + viewRouteConfig(row) {
275 + this.$router.push({
276 + path: "/routeInfo",
277 + query: {
278 + id: row.allocDimId,
279 + purposeOfFlightNo: row.flightFltNo,
280 + flightDate: row.flightFltDate,
281 + flightRouteListStr: row.currentFlightRoute,
282 + pageName: "dmLog",
283 + disable: true,
284 + },
285 + });
286 + },
207 }, 287 },
208 computed: { 288 computed: {
209 fltNo: { 289 fltNo: {
......