Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
1f42a43a 1 parent 88d266e3

货物日志增加，文本修正，样式修正

Inline Side-by-side
Showing 11 changed files with 331 additions and 71 deletions
...@@ -28,3 +28,14 @@ export function getDmFlowInformation(data) { ...@@ -28,3 +28,14 @@ export function getDmFlowInformation(data) {
28 method: 'post', 28 method: 'post',
29 }) 29 })
30 } 30 }
31 +
32 +//运单日志查询
33 +/**
34 + * @param accsId accsid *
35 + */
36 +export function findCargoDataChangeLog(data) {
37 + return request({
38 + url: '/cargo/findCargoDataChangeLog?accsId=' + data,
39 + method: 'post',
40 + })
41 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -8,6 +8,20 @@ let ductLabels = { ...@@ -8,6 +8,20 @@ let ductLabels = {
8 "1": "正在释放" 8 "1": "正在释放"
9 }, 9 },
10 }, 10 },
11 + "cargoLog": {//运单日志
12 + "operatorSource": {
13 + "1": "数据入库",
14 + "2": "自动配舱",
15 + "3": "手动配舱",
16 + "4": "预审不通过释放舱位",
17 + "5": "cutoff释放舱位",
18 + "6": "手动释放舱位",
19 + "7": "预审导出",
20 + "8": "预审导入",
21 + "9": "航班不推送修改为待推送",
22 + "10": "回推ACCS"
23 + }
24 + },
11 "menu": {//菜单设置 25 "menu": {//菜单设置
12 "menuType": { 26 "menuType": {
13 "M": "菜单", 27 "M": "菜单",
...@@ -82,6 +96,14 @@ let ductLabels = { ...@@ -82,6 +96,14 @@ let ductLabels = {
82 // "5": "处理失败(系统异常)", 96 // "5": "处理失败(系统异常)",
83 "9": "处理中", 97 "9": "处理中",
84 }, 98 },
99 + "status": {
100 + "0": "未处理",
101 + "1": "处理成功",
102 + "2": "无需处理",
103 + "3": "处理失败",
104 + "4": "校验不通过",
105 + "9": "处理中"
106 + },
85 "weatherGenerateWater": { 107 "weatherGenerateWater": {
86 "1": "是", 108 "1": "是",
87 "0": "否" 109 "0": "否"
...@@ -91,14 +113,6 @@ let ductLabels = { ...@@ -91,14 +113,6 @@ let ductLabels = {
91 "1": "推送成功", 113 "1": "推送成功",
92 "2": "推送失败" 114 "2": "推送失败"
93 }, 115 },
94 - "status": {
95 - "0": "未处理",
96 - "1": "已处理",
97 - "2": "无需处理",
98 - "3": "处理失败",
99 - "4": "校验不通过",
100 - "9": "处理中"
101 - }
102 }, 116 },
103 "weatherTable": { 117 "weatherTable": {
104 "highLowPriceFlg": { 118 "highLowPriceFlg": {
......
1 let tableHeaders = { 1 let tableHeaders = {
2 + "index": [
3 + {
4 + columnChineseName: "航班号",
5 + columnName: "fltNo",
6 + columnWidth: "",
7 + status: 1
8 + },
9 + {
10 + columnChineseName: "航班日期",
11 + columnName: "fltDate",
12 + columnWidth: "",
13 + status: 1
14 + },
15 + {
16 + columnChineseName: "总重量（KG）",
17 + columnName: "totalWeight",
18 + columnWidth: "",
19 + status: 1
20 + },
21 + {
22 + columnChineseName: "已配重量（KG）",
23 + columnName: "allocationWeight",
24 + columnWidth: "",
25 + status: 1
26 + },
27 + {
28 + columnChineseName: "总体积（cm³）",
29 + columnName: "totalVolumn",
30 + columnWidth: "",
31 + status: 1
32 + },
33 + {
34 + columnChineseName: "已配体积（cm³）",
35 + columnName: "allocationVolumn",
36 + columnWidth: "",
37 + status: 1
38 + },
39 + {
40 + columnChineseName: "配舱进度",
41 + columnName: "percentage",
42 + columnWidth: "830",
43 + ext1: 'slot',
44 + align: 'left',
45 + status: 1
46 + },
47 + ],
2 //货物查询 48 //货物查询
3 "cargo": [ 49 "cargo": [
4 { 50 {
...@@ -315,6 +361,94 @@ let tableHeaders = { ...@@ -315,6 +361,94 @@ let tableHeaders = {
315 status: 1 361 status: 1
316 }, 362 },
317 ], 363 ],
364 + //货物日志
365 + "cargoLog": [
366 + {
367 + columnChineseName: "口岸代码",
368 + columnName: "port",
369 + columnWidth: "80",
370 + status: 1
371 + },
372 + {
373 + columnChineseName: "操作人",
374 + columnName: "operatorUserName",
375 + columnWidth: "80",
376 + status: 1
377 + },
378 + {
379 + columnChineseName: "操作时间",
380 + columnName: "createTime",
381 + columnWidth: "150",
382 + status: 1
383 + },
384 + {
385 + columnChineseName: "操作来源",
386 + columnName: "operatorSource",
387 + columnWidth: "200",
388 + status: 1
389 + },
390 + {
391 + columnChineseName: "ACCS Pool",
392 + columnName: "accsPool",
393 + columnWidth: "100",
394 + status: 1
395 + },
396 + {
397 + columnChineseName: "当前配载航班日期",
398 + columnName: "flightDate",
399 + columnWidth: "140",
400 + status: 1
401 + },
402 + {
403 + columnChineseName: "当前配载航班号",
404 + columnName: "flightNo",
405 + columnWidth: "140",
406 + status: 1
407 + },
408 + {
409 + columnChineseName: "ACCS原航班日期",
410 + columnName: "accsFlightDate",
411 + columnWidth: "140",
412 + status: 1
413 + },
414 + {
415 + columnChineseName: "ACCS原航班号",
416 + columnName: "accsFlightNo",
417 + columnWidth: "140",
418 + status: 1
419 + },
420 + {
421 + columnChineseName: "货物状态",
422 + columnName: "cargoStatus",
423 + columnWidth: "80",
424 + status: 1
425 + },
426 + {
427 + columnChineseName: "推送状态",
428 + columnName: "pushStatus",
429 + columnWidth: "80",
430 + status: 1
431 + },
432 + {
433 + columnChineseName: "预审状态",
434 + columnName: "preQualificationStatus",
435 + columnWidth: "120",
436 + status: 1
437 + },
438 + {
439 + columnChineseName: "ENTCode",
440 + columnName: "entCode",
441 + columnWidth: "80",
442 + status: 1
443 + },
444 + {
445 + columnChineseName: "操作备注",
446 + columnName: "remark",
447 + columnWidth: "300",
448 + align: 'left',
449 + status: 1
450 + },
451 + ],
318 //航班信息维护 452 //航班信息维护
319 "FlightInformation": [ 453 "FlightInformation": [
320 { 454 {
...@@ -789,7 +923,7 @@ let tableHeaders = { ...@@ -789,7 +923,7 @@ let tableHeaders = {
789 { 923 {
790 columnChineseName: "原航班", 924 columnChineseName: "原航班",
791 columnName: "sourceFlightNo", 925 columnName: "sourceFlightNo",
792 - columnWidth: "", 926 + columnWidth: "100",
793 status: 1 927 status: 1
794 }, 928 },
795 { 929 {
...@@ -801,37 +935,37 @@ let tableHeaders = { ...@@ -801,37 +935,37 @@ let tableHeaders = {
801 { 935 {
802 columnChineseName: "周期", 936 columnChineseName: "周期",
803 columnName: "dayOfWeek", 937 columnName: "dayOfWeek",
804 - columnWidth: "", 938 + columnWidth: "150",
805 status: 1 939 status: 1
806 }, 940 },
807 { 941 {
808 columnChineseName: "状态", 942 columnChineseName: "状态",
809 columnName: "status", 943 columnName: "status",
810 - columnWidth: "", 944 + columnWidth: "70",
811 status: 1 945 status: 1
812 }, 946 },
813 { 947 {
814 columnChineseName: "开始时间", 948 columnChineseName: "开始时间",
815 columnName: "startDate", 949 columnName: "startDate",
816 - columnWidth: "", 950 + columnWidth: "100",
817 status: 1 951 status: 1
818 }, 952 },
819 { 953 {
820 columnChineseName: "结束时间", 954 columnChineseName: "结束时间",
821 columnName: "endDate", 955 columnName: "endDate",
822 - columnWidth: "", 956 + columnWidth: "100",
823 status: 1 957 status: 1
824 }, 958 },
825 { 959 {
826 columnChineseName: "最后修改人", 960 columnChineseName: "最后修改人",
827 columnName: "updateUserName", 961 columnName: "updateUserName",
828 - columnWidth: "", 962 + columnWidth: "100",
829 status: 1 963 status: 1
830 }, 964 },
831 { 965 {
832 columnChineseName: "最后修改时间", 966 columnChineseName: "最后修改时间",
833 columnName: "updateTime", 967 columnName: "updateTime",
834 - columnWidth: "", 968 + columnWidth: "100",
835 status: 1 969 status: 1
836 }, 970 },
837 ], 971 ],
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
10 10
11 .wid95 { 11 .wid95 {
12 width: 95% !important; 12 width: 95% !important;
13 -} 13 + }
14 14
15 .wid90 { 15 .wid90 {
16 width: 90% !important; 16 width: 90% !important;
...@@ -84,9 +84,9 @@ ...@@ -84,9 +84,9 @@
84 margin-left: 20px; 84 margin-left: 20px;
85 } 85 }
86 86
87 -// .el-dialog:not(.is-fullscreen) { 87 + // .el-dialog:not(.is-fullscreen) {
88 -// margin-top: 6vh !important; 88 + // margin-top: 6vh !important;
89 -// } 89 + // }
90 90
91 .el-table { 91 .el-table {
92 92
...@@ -115,7 +115,6 @@ ...@@ -115,7 +115,6 @@
115 // border-bottom: 1px solid #ddd; 115 // border-bottom: 1px solid #ddd;
116 margin: 8px 10px 15px 10px; 116 margin: 8px 10px 15px 10px;
117 padding-top: 15px; 117 padding-top: 15px;
118 - padding-bottom: 5px;
119 118
120 .formItem { 119 .formItem {
121 width: 95%; 120 width: 95%;
...@@ -281,3 +280,13 @@ ...@@ -281,3 +280,13 @@
281 .dialogColumn .el-tooltip { 280 .dialogColumn .el-tooltip {
282 white-space: pre-line !important; 281 white-space: pre-line !important;
283 } 282 }
283 +
284 + .el-progress-bar {
285 + padding-right: 70px;
286 + }
287 +
288 + .el-progress__text {
289 + font-size: 12px !important;
290 + margin-left: 0px;
291 + font-weight: 700 !important;
292 + }
...\ No newline at end of file ...\ No newline at end of file
......
1 +<template>
2 + <div>
3 + <el-dialog title="查看日志" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
4 + :show-close="false" :append-to-body="true" top="2vh">
5 + <el-form class="form-header" label-position="right" label-width="auto" size="small">
6 + <el-row>
7 + <el-col :span="4">
8 + <el-form-item label="运单号">
9 + <span>{{ data.waybillNo }}</span>
10 + </el-form-item>
11 + </el-col>
12 + <el-col :span="4">
13 + <el-form-item label="ACCSID">
14 + <span>{{ data.accsId }}</span>
15 + </el-form-item>
16 + </el-col>
17 + </el-row>
18 + </el-form>
19 + <Tables ref="cargoLog" ductName="cargoLog" :order="false" :data="data.tableData" :headerData="tableHeader"
20 + tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectData.page"
21 + :limitSize="selectData.size" :pageSizes="[100]" :pagination="false" :loading="loading"
22 + @currentChange="currentChange">
23 + </Tables>
24 + <div slot="footer" class="dialog-footer">
25 + <el-button @click="close">关 闭</el-button>
26 + </div>
27 + </el-dialog>
28 + </div>
29 +</template>
30 +
31 +<script>
32 +import { findCargoDataChangeLog } from "@/api/system/logConfig.js";
33 +
34 +export default {
35 + name: "Log",
36 + props: {
37 + dialogVisible: {
38 + type: Boolean,
39 + default: false
40 + },
41 + cargoData: {
42 + type: Object,
43 + default: null
44 + }
45 + },
46 + data() {
47 + return {
48 + data: {
49 + tableData: []
50 + },
51 + selectData: {
52 + page: 1,
53 + size: 100
54 + },
55 + tableHeader: this.tableHeaders['cargoLog'],
56 + tableHeight: 600,
57 + loading: false
58 + }
59 + },
60 + watch: {
61 + dialogVisible(val) {
62 + if (val) {
63 + this.data.waybillNo = this.cargoData.waybillNo
64 + this.data.accsId = this.cargoData.accsId
65 + this.getLog(this.cargoData.accsId)
66 + }
67 + }
68 + },
69 + methods: {
70 + //通过accsid获取运单日志
71 + getLog(val) {
72 + this.loading = true
73 + findCargoDataChangeLog(val).then(res => {
74 + this.loading = false
75 + if (res.code === 200) {
76 + this.data.tableData = res.data.list
77 + } else {
78 + this.msgWarning(res.msg)
79 + }
80 + }).catch(err => {
81 + this.loading = false
82 + console.log(err)
83 + })
84 + },
85 + //关闭
86 + close() {
87 + this.$emit('close')
88 + },
89 + currentChange(val) { },
90 + }
91 +
92 +}
93 +</script>
94 +
95 +<style scoped>
96 +</style>
...\ No newline at end of file ...\ No newline at end of file
...@@ -166,7 +166,14 @@ ...@@ -166,7 +166,14 @@
166 <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true" 166 <Tables ref="newTables" ductName="cargo" :data="tableData" :headerData="tableHeader" :selection="true" :order="true"
167 :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page" 167 :totalCount="totalCount" :loading="tableLoading" :limitSize="limitSize" :limitStart="limitStart" :page="page"
168 :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect" 168 :shiftKey="shiftKey" :pageSizes="[100]" :height="tableHeight" @sizeChange="sizeChange" @tableSelect="tableSelect"
169 - @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange"></Tables> 169 + @tableSelectAll="tableSelectAll" @currentChange="currentChange" @sortChange="sortChange">
170 + <template v-slot:waybillNo="scope">
171 + <el-link type="primary" @click="logView(scope.row)">
172 + {{
173 + scope.row.waybillNo
174 + }}<i class="el-icon-link"></i> </el-link>
175 + </template>
176 + </Tables>
170 <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false" 177 <el-dialog title="舱位释放结果" width="80%" :visible.sync="dialogVisible" :close-on-click-modal="false"
171 :show-close="false" :append-to-body="true"> 178 :show-close="false" :append-to-body="true">
172 <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%"> 179 <el-table :data="selectTable" size="mini" border stripe highlight-current-row style="width: 100%">
...@@ -180,15 +187,20 @@ ...@@ -180,15 +187,20 @@
180 <el-button type="primary" @click="close">确 定</el-button> 187 <el-button type="primary" @click="close">确 定</el-button>
181 </div> 188 </div>
182 </el-dialog> 189 </el-dialog>
190 + <Dialog :dialogVisible="openView" :cargoData="cargoLog" @close="viewClose" />
183 </div> 191 </div>
184 </template> 192 </template>
185 193
186 <script> 194 <script>
187 import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect"; 195 import { findConditionData, findCargoData, releaseCargo } from "@/api/cargoSelect";
188 import { downLoadXlsx } from "@/utils/zipdownload"; 196 import { downLoadXlsx } from "@/utils/zipdownload";
197 +import Dialog from "./dialog.vue";
189 198
190 export default { 199 export default {
191 name: "QueryCargo", 200 name: "QueryCargo",
201 + components: {
202 + Dialog
203 + },
192 data() { 204 data() {
193 return { 205 return {
194 formData: { 206 formData: {
...@@ -273,6 +285,7 @@ export default { ...@@ -273,6 +285,7 @@ export default {
273 ], 285 ],
274 findConditionData: {}, //货物查询条件 286 findConditionData: {}, //货物查询条件
275 tableData: [], //表格数据 287 tableData: [], //表格数据
288 + cargoLog: {},
276 allWeight: 0, 289 allWeight: 0,
277 allQty: 0, 290 allQty: 0,
278 shiftKey: false, 291 shiftKey: false,
...@@ -294,6 +307,7 @@ export default { ...@@ -294,6 +307,7 @@ export default {
294 progress: 0, 307 progress: 0,
295 tableHeight: null, 308 tableHeight: null,
296 dialogVisible: false, 309 dialogVisible: false,
310 + openView: false,
297 formShow: true, //菜单隐藏 311 formShow: true, //菜单隐藏
298 }; 312 };
299 }, 313 },
...@@ -307,6 +321,9 @@ export default { ...@@ -307,6 +321,9 @@ export default {
307 }, 321 },
308 322
309 activated() { 323 activated() {
324 + this.selectTable = []
325 + this.cargoTotal()
326 + //否则请求原页面缓存状态
310 if (this.$store.state.tagsView.cachedViews.length > 0) { 327 if (this.$store.state.tagsView.cachedViews.length > 0) {
311 this.$store.state.tagsView.cachedViews.forEach(item => { 328 this.$store.state.tagsView.cachedViews.forEach(item => {
312 if (item === 'QueryCargo') { 329 if (item === 'QueryCargo') {
...@@ -337,7 +354,7 @@ export default { ...@@ -337,7 +354,7 @@ export default {
337 watch: { 354 watch: {
338 formShow(val, oldVal) { 355 formShow(val, oldVal) {
339 this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120 356 this.tableHeight = window.innerHeight - this.$refs.cargoForm.$el.offsetHeight - 120
340 - } 357 + },
341 }, 358 },
342 methods: { 359 methods: {
343 clear() { 360 clear() {
...@@ -398,6 +415,7 @@ export default { ...@@ -398,6 +415,7 @@ export default {
398 releaseCargo(idList).then(res => { 415 releaseCargo(idList).then(res => {
399 if (res.code === 200) { 416 if (res.code === 200) {
400 this.msgSuccess(res.msg) 417 this.msgSuccess(res.msg)
418 + this.select()
401 } else if (res.code === 201) { 419 } else if (res.code === 201) {
402 this.selectTable.map(item => { 420 this.selectTable.map(item => {
403 res.data['success'].map(val => { 421 res.data['success'].map(val => {
...@@ -576,6 +594,15 @@ export default { ...@@ -576,6 +594,15 @@ export default {
576 } 594 }
577 } 595 }
578 }, 596 },
597 + //查看日志
598 + logView(val) {
599 + this.cargoLog = val
600 + this.openView = true
601 + },
602 + //关闭日志
603 + viewClose() {
604 + this.openView = false
605 + },
579 //设置关闭 606 //设置关闭
580 headerSetClose(val) { 607 headerSetClose(val) {
581 if (val == 1) { 608 if (val == 1) {
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
2 <div></div> 2 <div></div>
3 </template> 3 </template>
4 <script> 4 <script>
5 -import { delUser } from "@/api/system/user";
6 5
7 export default { 6 export default {
8 props: { 7 props: {
...@@ -12,16 +11,10 @@ export default { ...@@ -12,16 +11,10 @@ export default {
12 }, 11 },
13 data() { 12 data() {
14 return { 13 return {
15 - // 表单校验
16 }; 14 };
17 }, 15 },
18 methods: { 16 methods: {
19 - submit() { 17 +
20 - this.msgSuccess("修改成功");
21 - delUser("112").then((response) => {
22 - this.msgSuccess("修改成功");
23 - });
24 - },
25 }, 18 },
26 }; 19 };
27 </script> 20 </script>
......
...@@ -5,7 +5,7 @@ export default { ...@@ -5,7 +5,7 @@ export default {
5 const { path } = params 5 const { path } = params
6 this.$router.replace({ path: '/' + path, query }) 6 this.$router.replace({ path: '/' + path, query })
7 }, 7 },
8 - render: function(h) { 8 + render: function (h) {
9 return h() // avoid warning message 9 return h() // avoid warning message
10 } 10 }
11 } 11 }
......
...@@ -116,18 +116,20 @@ ...@@ -116,18 +116,20 @@
116 <template slot="optionColumn"> 116 <template slot="optionColumn">
117 <el-table-column label="操作" align="center" class-name="small-padding fixed-width"> 117 <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
118 <template slot-scope="scope"> 118 <template slot-scope="scope">
119 + <div v-hasPermi="['system:dictionary:add']">
119 <el-button class="mr5" v-if="scope.row.serviceCodeMapperList" size="mini" type="text" 120 <el-button class="mr5" v-if="scope.row.serviceCodeMapperList" size="mini" type="text"
120 icon="el-icon-plus" 121 icon="el-icon-plus"
121 - @click="addDic({ status: 'childrenAdd', data: scope.row.chineseName })" 122 + @click="addDic({ status: 'childrenAdd', data: scope.row.chineseName })">新增子集
122 - v-hasPermi="['system:dictionary:add']">新增子集
123 </el-button> 123 </el-button>
124 + </div>
124 <!-- <el-button class="mr5" size="mini" type="text" icon="el-icon-edit" 125 <!-- <el-button class="mr5" size="mini" type="text" icon="el-icon-edit"
125 @click="upDate({ status: 'update', data: scope.row })">修改 126 @click="upDate({ status: 'update', data: scope.row })">修改
126 </el-button> --> 127 </el-button> -->
128 + <div v-hasPermi="['system:dictionary:delete']">
127 <el-button v-if="!scope.row.serviceCodeMapperList" size="mini" type="text" 129 <el-button v-if="!scope.row.serviceCodeMapperList" size="mini" type="text"
128 - style="color:#ff4949" icon="el-icon-delete" @click="delDict(scope.row)" 130 + style="color:#ff4949" icon="el-icon-delete" @click="delDict(scope.row)">删除
129 - v-hasPermi="['system:dictionary:delete']">删除
130 </el-button> 131 </el-button>
132 + </div>
131 </template> 133 </template>
132 </el-table-column> 134 </el-table-column>
133 </template> 135 </template>
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
22 <el-col :span="24"> 22 <el-col :span="24">
23 <el-form-item label="角色权限:" prop="menuIdList"> 23 <el-form-item label="角色权限:" prop="menuIdList">
24 <el-tree ref="tree" :data="treeData" node-key="id" :props="defaultProps" :show-checkbox="true" 24 <el-tree ref="tree" :data="treeData" node-key="id" :props="defaultProps" :show-checkbox="true"
25 - :default-checked-keys="roleData.menuIds" accordion> 25 + :default-checked-keys="roleData.menuIds" accordion v-loading="treeLoading">
26 </el-tree> 26 </el-tree>
27 </el-form-item> 27 </el-form-item>
28 </el-col> 28 </el-col>
...@@ -65,6 +65,7 @@ export default { ...@@ -65,6 +65,7 @@ export default {
65 }, 65 },
66 treeData: [], 66 treeData: [],
67 loading: false, 67 loading: false,
68 + treeLoading: false,
68 defaultProps: { 69 defaultProps: {
69 children: "children", 70 children: "children",
70 label: "title", 71 label: "title",
...@@ -96,8 +97,10 @@ export default { ...@@ -96,8 +97,10 @@ export default {
96 methods: { 97 methods: {
97 //权限列表 98 //权限列表
98 allAuth() { 99 allAuth() {
100 + this.treeLoading = true
99 getAllAuth() 101 getAllAuth()
100 .then((res) => { 102 .then((res) => {
103 + this.treeLoading = false
101 if (res.code === 200) { 104 if (res.code === 200) {
102 this.treeData = this.treeDataInfo(res.data); 105 this.treeData = this.treeDataInfo(res.data);
103 } else { 106 } else {
...@@ -105,6 +108,7 @@ export default { ...@@ -105,6 +108,7 @@ export default {
105 } 108 }
106 }) 109 })
107 .catch((err) => { 110 .catch((err) => {
111 + this.treeLoading = false
108 console.log(err); 112 console.log(err);
109 }); 113 });
110 }, 114 },
......
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 ref="dmLogForm" class="form-header" :model="selectForm" label-width="auto" size="small"
4 + @submit.native.prevent>
4 <el-row type="flex" style="flex-wrap: wrap !important"> 5 <el-row type="flex" style="flex-wrap: wrap !important">
5 <el-col :span="6"> 6 <el-col :span="6">
6 <el-form-item label="ACCS原航班号"> 7 <el-form-item label="ACCS原航班号">
...@@ -24,8 +25,9 @@ ...@@ -24,8 +25,9 @@
24 <el-select v-model="selectForm.status" class="formItem" placeholder="不限" clearable> 25 <el-select v-model="selectForm.status" class="formItem" placeholder="不限" clearable>
25 <el-option label="未处理" value="0"></el-option> 26 <el-option label="未处理" value="0"></el-option>
26 <el-option label="处理成功" value="1"></el-option> 27 <el-option label="处理成功" value="1"></el-option>
27 - <el-option label="已处理" value="2"></el-option> 28 + <el-option label="无需处理" value="2"></el-option>
28 <el-option label="处理失败" value="3"></el-option> 29 <el-option label="处理失败" value="3"></el-option>
30 + <el-option label="校验不通过" value="4"></el-option>
29 <el-option label="处理中" value="9"></el-option> 31 <el-option label="处理中" value="9"></el-option>
30 </el-select> 32 </el-select>
31 </el-form-item> 33 </el-form-item>
...@@ -37,14 +39,6 @@ ...@@ -37,14 +39,6 @@
37 </el-date-picker> 39 </el-date-picker>
38 </el-form-item> 40 </el-form-item>
39 </el-col> 41 </el-col>
40 - <!-- <el-col :span="6">
41 - <el-form-item label="口岸代码">
42 - <el-select v-model="selectForm.portName" class="formItem" placeholder="不限" clearable>
43 - <el-option v-for="item in portList" :label="item.englishName" :value="item.englishName" :key="item.id">
44 - </el-option>
45 - </el-select>
46 - </el-form-item>
47 - </el-col> -->
48 <el-col :span="6"> 42 <el-col :span="6">
49 <el-form-item label="回推ACCS结果"> 43 <el-form-item label="回推ACCS结果">
50 <el-select v-model="selectForm.sendLogSendResult" class="formItem" placeholder="不限" clearable> 44 <el-select v-model="selectForm.sendLogSendResult" class="formItem" placeholder="不限" clearable>
...@@ -66,7 +60,7 @@ ...@@ -66,7 +60,7 @@
66 <Tables ref="dmLogTables" ductName="logDmData" :order="true" :data="data" :headerData="tableHeader" 60 <Tables ref="dmLogTables" ductName="logDmData" :order="true" :data="data" :headerData="tableHeader"
67 tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectForm.page" 61 tableAlign="center" :showOverflowTooltip="false" :height="tableHeight" :page="selectForm.page"
68 :limitSize="selectForm.size" :pageSizes="[100]" :totalCount="total" :loading="loading" 62 :limitSize="selectForm.size" :pageSizes="[100]" :totalCount="total" :loading="loading"
69 - @currentChange="currentChange" @sortChange="sortChange"> 63 + @currentChange="currentChange">
70 <template v-slot:awbNbr="scope"> 64 <template v-slot:awbNbr="scope">
71 <el-link type="primary" @click="gotoWeatherTable(scope.row)"> 65 <el-link type="primary" @click="gotoWeatherTable(scope.row)">
72 {{ 66 {{
...@@ -86,8 +80,6 @@ ...@@ -86,8 +80,6 @@
86 </template> 80 </template>
87 81
88 <script> 82 <script>
89 -import dictLabels from "../../../assets/languages/dictLabels.js";
90 -import { portNameList } from "@/api/system/user.js";
91 import { getDmDataList, getDmFlowInformation } from "@/api/system/logConfig.js"; 83 import { getDmDataList, getDmFlowInformation } from "@/api/system/logConfig.js";
92 84
93 export default { 85 export default {
...@@ -123,7 +115,6 @@ export default { ...@@ -123,7 +115,6 @@ export default {
123 }, 115 },
124 created() { 116 created() {
125 this.selectForm.createTime = this.nowDate(); 117 this.selectForm.createTime = this.nowDate();
126 - this.getPort()
127 }, 118 },
128 activated() { 119 activated() {
129 this.selectDMData(); 120 this.selectDMData();
...@@ -136,19 +127,6 @@ export default { ...@@ -136,19 +127,6 @@ export default {
136 window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130; 127 window.innerHeight - this.$refs.dmLogForm.$el.offsetHeight - 130;
137 }, 128 },
138 methods: { 129 methods: {
139 - //获取口岸
140 - async getPort() {
141 - portNameList().then((res) => {
142 - if (res.code === 200) {
143 - this.portList = res.data;
144 - } else {
145 - this.msgWarning('查询条件' + res.msg)
146 - }
147 - });
148 - if (this.$store.state.tagsView.cachedViews.length == 0) {
149 - this.selectDMData();
150 - }
151 - },
152 //数据查询 130 //数据查询
153 async selectDMData(val) { 131 async selectDMData(val) {
154 this.data = []; 132 this.data = [];
...@@ -191,14 +169,6 @@ export default { ...@@ -191,14 +169,6 @@ export default {
191 this.selectForm.page = val.page; 169 this.selectForm.page = val.page;
192 this.selectDMData(); 170 this.selectDMData();
193 }, 171 },
194 - //数据处理
195 - statusData(val) {
196 - if (dictLabels["logDmData"]["status"][val]) {
197 - return dictLabels["logDmData"]["status"][val];
198 - } else {
199 - return val;
200 - }
201 - },
202 //排序 172 //排序
203 sortChange(val) { 173 sortChange(val) {
204 let data = []; 174 let data = [];
......