Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
238b8b32 1 parent ad5086ee

样式更新，字段修改

Inline Side-by-side
Showing 6 changed files with 114 additions and 108 deletions
...@@ -7,16 +7,16 @@ let ductLabels = { ...@@ -7,16 +7,16 @@ let ductLabels = {
7 "releasing": { 7 "releasing": {
8 "1": "正在释放" 8 "1": "正在释放"
9 }, 9 },
10 - "cargoAllocationDataStatus": { 10 + // "cargoAllocationDataStatus": {
11 - "已推送": "已推送", 11 + // "已推送": "已推送",
12 - "不推送": "不推送", 12 + // "不推送": "不推送",
13 - "已配": " ", 13 + // "已配": " ",
14 - "待推送": "待推送", 14 + // "待推送": "待推送",
15 - "手动配舱": ' ', 15 + // "手动配舱": ' ',
16 - "已释放": ' ', 16 + // "已释放": ' ',
17 - "原航班配舱": ' ', 17 + // "原航班配舱": ' ',
18 - "顺位配舱": ' ', 18 + // "顺位配舱": ' ',
19 - }, 19 + // },
20 }, 20 },
21 "menu": {//菜单设置 21 "menu": {//菜单设置
22 "menuType": { 22 "menuType": {
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
3 * Copyright (c) 2019 FedEx 3 * Copyright (c) 2019 FedEx
4 */ 4 */
5 5
6 - const baseURL = process.env.VUE_APP_BASE_API 6 +const baseURL = process.env.VUE_APP_BASE_API
7 7
8 - // 日期格式化 8 +// 日期格式化
9 - export function parseTime(time, pattern) { 9 +export function parseTime(time, pattern) {
10 //debugger 10 //debugger
11 if (arguments.length === 0 || !time) { 11 if (arguments.length === 0 || !time) {
12 return null 12 return null
...@@ -45,17 +45,17 @@ ...@@ -45,17 +45,17 @@
45 return value || 0 45 return value || 0
46 }) 46 })
47 return time_str 47 return time_str
48 - } 48 +}
49 49
50 - // 表单重置 50 +// 表单重置
51 - export function resetForm(refName) { 51 +export function resetForm(refName) {
52 if (this.$refs[refName]) { 52 if (this.$refs[refName]) {
53 this.$refs[refName].resetFields(); 53 this.$refs[refName].resetFields();
54 } 54 }
55 - } 55 +}
56 56
57 - // 添加日期范围 57 +// 添加日期范围
58 - export function addDateRange(params, dateRange, propName) { 58 +export function addDateRange(params, dateRange, propName) {
59 var search = params; 59 var search = params;
60 search.params = {}; 60 search.params = {};
61 if (null != dateRange && '' != dateRange) { 61 if (null != dateRange && '' != dateRange) {
...@@ -68,10 +68,10 @@ ...@@ -68,10 +68,10 @@
68 } 68 }
69 } 69 }
70 return search; 70 return search;
71 - } 71 +}
72 72
73 - // 回显数据字典 73 +// 回显数据字典
74 - export function selectDictLabel(datas, value) { 74 +export function selectDictLabel(datas, value) {
75 var actions = []; 75 var actions = [];
76 Object.keys(datas).some((key) => { 76 Object.keys(datas).some((key) => {
77 if (datas[key].dictValue == ('' + value)) { 77 if (datas[key].dictValue == ('' + value)) {
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
80 } 80 }
81 }) 81 })
82 return actions.join(''); 82 return actions.join('');
83 - } 83 +}
84 84
85 - // 回显数据字典（字符串数组） 85 +// 回显数据字典（字符串数组）
86 - export function selectDictLabels(datas, value, separator) { 86 +export function selectDictLabels(datas, value, separator) {
87 var actions = []; 87 var actions = [];
88 var currentSeparator = undefined === separator ? "," : separator; 88 var currentSeparator = undefined === separator ? "," : separator;
89 var temp = value.split(currentSeparator); 89 var temp = value.split(currentSeparator);
...@@ -95,15 +95,15 @@ ...@@ -95,15 +95,15 @@
95 }) 95 })
96 }) 96 })
97 return actions.join('').substring(0, actions.join('').length - 1); 97 return actions.join('').substring(0, actions.join('').length - 1);
98 - } 98 +}
99 99
100 - // 通用下载方法 100 +// 通用下载方法
101 - export function download(fileName) { 101 +export function download(fileName) {
102 window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true; 102 window.location.href = baseURL + "/common/download?fileName=" + encodeURI(fileName) + "&delete=" + true;
103 - } 103 +}
104 104
105 - // 字符串格式化(%s ) 105 +// 字符串格式化(%s )
106 - export function sprintf(str) { 106 +export function sprintf(str) {
107 var args = arguments, flag = true, i = 1; 107 var args = arguments, flag = true, i = 1;
108 str = str.replace(/%s/g, function () { 108 str = str.replace(/%s/g, function () {
109 var arg = args[i++]; 109 var arg = args[i++];
...@@ -114,24 +114,24 @@ ...@@ -114,24 +114,24 @@
114 return arg; 114 return arg;
115 }); 115 });
116 return flag ? str : ''; 116 return flag ? str : '';
117 - } 117 +}
118 118
119 - // 转换字符串，undefined,null等转化为"" 119 +// 转换字符串，undefined,null等转化为""
120 - export function praseStrEmpty(str) { 120 +export function praseStrEmpty(str) {
121 if (!str || str == "undefined" || str == "null") { 121 if (!str || str == "undefined" || str == "null") {
122 return ""; 122 return "";
123 } 123 }
124 return str; 124 return str;
125 - } 125 +}
126 126
127 - /** 127 +/**
128 * 构造树型结构数据 128 * 构造树型结构数据
129 * @param {*} data 数据源 129 * @param {*} data 数据源
130 * @param {*} id id字段 默认 'id' 130 * @param {*} id id字段 默认 'id'
131 * @param {*} parentId 父节点字段 默认 'parentId' 131 * @param {*} parentId 父节点字段 默认 'parentId'
132 * @param {*} children 孩子节点字段 默认 'children' 132 * @param {*} children 孩子节点字段 默认 'children'
133 */ 133 */
134 - export function handleTree(data, id, parentId, children) { 134 +export function handleTree(data, id, parentId, children) {
135 let config = { 135 let config = {
136 id: id || 'id', 136 id: id || 'id',
137 parentId: parentId || 'parentId', 137 parentId: parentId || 'parentId',
...@@ -173,10 +173,16 @@ ...@@ -173,10 +173,16 @@
173 } 173 }
174 } 174 }
175 return tree; 175 return tree;
176 - } 176 +}
177 177
178 - //字符串英文转大写，；转英文; 178 +//字符串英文转大写，；转英文;
179 - export function upCase(str){ 179 +export function upCase(str) {
180 - let newStr = str.replace(/；/g,";").toUpperCase(); 180 + let newStr = str.replace(/；/g, ";").toUpperCase();
181 return newStr; 181 return newStr;
182 - }
...\ No newline at end of file ...\ No newline at end of file
182 +}
183 +
184 +//当前日期
185 +export function nowDate() {
186 + let date = new Date()
187 + return `${date.getFullYear()}-${(date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${(date.getDate()) > 9 ? date.getDate() : '0' + (date.getDate())}`
188 +}
...\ No newline at end of file ...\ No newline at end of file
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
16 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span> 16 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
17 </div> 17 </div>
18 <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border> 18 <el-table ref="filterTable" :data="tableData" v-loading="loading" style="width: 100%; margin-top: 20px" size="small" border>
19 - <el-table-column label="行号" prop="line" fixed width="50" align="center"> 19 + <el-table-column label="行号" prop="line" width="50" align="center">
20 </el-table-column> 20 </el-table-column>
21 - <el-table-column label="错误信息" prop="errorMessage" fixed width="300"> 21 + <el-table-column label="错误信息" prop="errorMessage" width="300">
22 <template slot-scope="scope"> 22 <template slot-scope="scope">
23 <div v-for="(m, key) in scope.row.errorMessage" :key="key"> 23 <div v-for="(m, key) in scope.row.errorMessage" :key="key">
24 {{ m }} 24 {{ m }}
......
...@@ -3,50 +3,30 @@ ...@@ -3,50 +3,30 @@
3 <el-form :inline="true" :model="form" class="demo-form-inline" size="small"> 3 <el-form :inline="true" :model="form" class="demo-form-inline" size="small">
4 <el-form-item label="航班种类"> 4 <el-form-item label="航班种类">
5 <el-select v-model="form.type" placeholder="航班种类"> 5 <el-select v-model="form.type" placeholder="航班种类">
6 - <el-option 6 + <el-option v-for="item in flightType" :key="item.id" :label="item.englishName" :value="item.code">{{
7 - v-for="item in flightType" 7 + item.englishName
8 - :key="item.id" 8 + }}</el-option>
9 - :label="item.englishName"
10 - :value="item.code"
11 - >{{ item.englishName }}</el-option
12 - >
13 </el-select> 9 </el-select>
14 </el-form-item> 10 </el-form-item>
15 <el-form-item> 11 <el-form-item>
16 - <el-upload 12 + <el-upload action="/flightInfoImport/importFlight" name="file" :http-request="uploadExcel"
17 - action="/flightInfoImport/importFlight" 13 + :on-remove="handleRemove" :limit="1" :on-exceed="handleExceed" :file-list="fileList" accept=".xlsx"
18 - name="file" 14 + class="upload-demo" v-hasPermi="['base:flightImport:importFlight']">
19 - :http-request="uploadExcel"
20 - :on-remove="handleRemove"
21 - :limit="1"
22 - :on-exceed="handleExceed"
23 - :file-list="fileList"
24 - accept=".xlsx"
25 - class="upload-demo"
26 - v-hasPermi="['base:flightImport:importFlight']"
27 - >
28 <el-button type="primary">点击上传</el-button> 15 <el-button type="primary">点击上传</el-button>
29 </el-upload> 16 </el-upload>
30 </el-form-item> 17 </el-form-item>
31 <el-form-item> 18 <el-form-item>
32 - <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']" 19 + <el-button type="primary" @click="downloadTempleate" v-hasPermi="['base:flightImport:exportExcel']">下载模板
33 - >下载模板</el-button 20 + </el-button>
34 - >
35 </el-form-item> 21 </el-form-item>
36 </el-form> 22 </el-form>
37 <div style="font-size: 12px; font-weight: 700"> 23 <div style="font-size: 12px; font-weight: 700">
38 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span> 24 提示：<span style="color: #1890ff">以下为所提交的数据或出错信息</span>
39 </div> 25 </div>
40 - <el-table 26 + <el-table ref="filterTable" :data="tableData" style="margin-top: 20px" size="small" border>
41 - ref="filterTable" 27 + <el-table-column label="行号" prop="line" width="50" align="center">
42 - :data="tableData"
43 - style="margin-top: 20px"
44 - size="small"
45 - border
46 - >
47 - <el-table-column label="行号" prop="line" fixed width="50" align="center">
48 </el-table-column> 28 </el-table-column>
49 - <el-table-column label="错误信息" prop="errorMessage" fixed width="200"> 29 + <el-table-column label="错误信息" prop="errorMessage" width="200">
50 <template slot-scope="scope"> 30 <template slot-scope="scope">
51 <div v-for="(m, key) in scope.row.errorMessage" :key="key"> 31 <div v-for="(m, key) in scope.row.errorMessage" :key="key">
52 {{ m }} 32 {{ m }}
...@@ -54,13 +34,8 @@ ...@@ -54,13 +34,8 @@
54 </template> 34 </template>
55 </el-table-column> 35 </el-table-column>
56 <el-table-column v-if="tableData.length == 0"></el-table-column> 36 <el-table-column v-if="tableData.length == 0"></el-table-column>
57 - <el-table-column 37 + <el-table-column v-for="(value, key) in this.tableData[0]" :key="key"
58 - v-for="(value, key) in this.tableData[0]" 38 + v-if="key != 'errorMessage' && key != 'line'" :label="key" :prop="key"></el-table-column>
59 - :key="key"
60 - v-if="key != 'errorMessage' && key != 'line'"
61 - :label="key"
62 - :prop="key"
63 - ></el-table-column>
64 </el-table> 39 </el-table>
65 </div> 40 </div>
66 </template> 41 </template>
...@@ -72,7 +47,7 @@ import { ...@@ -72,7 +47,7 @@ import {
72 importFlight, 47 importFlight,
73 } from "@/api/flightInfoImport"; 48 } from "@/api/flightInfoImport";
74 export default { 49 export default {
75 - name:"FlightInformationImport", 50 + name: "FlightInformationImport",
76 data() { 51 data() {
77 return { 52 return {
78 flightType: [], 53 flightType: [],
...@@ -128,11 +103,11 @@ export default { ...@@ -128,11 +103,11 @@ export default {
128 importFlight(file, this.form.type).then((res) => { 103 importFlight(file, this.form.type).then((res) => {
129 if (res.code != 200) { 104 if (res.code != 200) {
130 if (res.code == 603) { 105 if (res.code == 603) {
131 - this.$alert(res.msg , "提示", { 106 + this.$alert(res.msg, "提示", {
132 confirmButtonText: "确定", 107 confirmButtonText: "确定",
133 type: "warning", 108 type: "warning",
134 }); 109 });
135 - }else { 110 + } else {
136 this.$message.error(res.msg); 111 this.$message.error(res.msg);
137 this.tableData = res.data; 112 this.tableData = res.data;
138 } 113 }
...@@ -175,6 +150,7 @@ export default { ...@@ -175,6 +150,7 @@ export default {
175 .upload-demo { 150 .upload-demo {
176 float: right; 151 float: right;
177 } 152 }
153 +
178 .el-upload-list { 154 .el-upload-list {
179 display: inline-block; 155 display: inline-block;
180 margin-left: 10px; 156 margin-left: 10px;
......
...@@ -99,8 +99,8 @@ ...@@ -99,8 +99,8 @@
99 <el-row> 99 <el-row>
100 <el-col :span="12"> 100 <el-col :span="12">
101 <el-form-item label="CutOff时间" prop="cutOffTime"> 101 <el-form-item label="CutOff时间" prop="cutOffTime">
102 - <el-select class="wid80" v-model="form.cutOffTime" clearable placeholder="选择时间(hh:mm:ss)" type="string" 102 + <el-select class="wid80" v-model="form.cutOffTime" clearable placeholder="选择时间(可查找)" type="string"
103 - filterable allow-create default-first-option> 103 + filterable>
104 <el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item"> 104 <el-option v-for="item in selectOption.cutOffTime" :key="item" :label="item" :value="item">
105 </el-option> 105 </el-option>
106 </el-select> 106 </el-select>
...@@ -249,6 +249,7 @@ import { ...@@ -249,6 +249,7 @@ import {
249 updateStatusBatch, 249 updateStatusBatch,
250 updateAutoPushBatch, 250 updateAutoPushBatch,
251 } from "@/api/findAllFltData"; 251 } from "@/api/findAllFltData";
252 +import { nowDate } from "@/utils/FedEx.js"
252 export default { 253 export default {
253 name: "FlightInformationMaintenance", 254 name: "FlightInformationMaintenance",
254 data() { 255 data() {
...@@ -411,6 +412,24 @@ export default { ...@@ -411,6 +412,24 @@ export default {
411 disabled: true, 412 disabled: true,
412 }, 413 },
413 { 414 {
415 + name: "总体积(cm³)",
416 + value: "totalVolume",
417 + width: "100",
418 + align: "center",
419 + sorTable: false,
420 + fixed: false,
421 + disabled: true,
422 + },
423 + {
424 + name: "已配体积(cm³)",
425 + value: "alloctedVolume",
426 + width: "120",
427 + align: "center",
428 + sorTable: false,
429 + fixed: false,
430 + disabled: true,
431 + },
432 + {
414 name: "是否需要预审", 433 name: "是否需要预审",
415 value: "needRequired", 434 value: "needRequired",
416 width: "130", 435 width: "130",
...@@ -465,24 +484,6 @@ export default { ...@@ -465,24 +484,6 @@ export default {
465 disabled: true, 484 disabled: true,
466 }, 485 },
467 { 486 {
468 - name: "总体积(cm³)",
469 - value: "totalVolume",
470 - width: "100",
471 - align: "center",
472 - sorTable: false,
473 - fixed: false,
474 - disabled: true,
475 - },
476 - {
477 - name: "已配体积(cm³)",
478 - value: "alloctedVolume",
479 - width: "120",
480 - align: "center",
481 - sorTable: false,
482 - fixed: false,
483 - disabled: true,
484 - },
485 - {
486 name: "航班优先级", 487 name: "航班优先级",
487 value: "priorityName", 488 value: "priorityName",
488 width: "100", 489 width: "100",
...@@ -565,29 +566,53 @@ export default { ...@@ -565,29 +566,53 @@ export default {
565 //cutOffTime数据 566 //cutOffTime数据
566 cutOffTime: [ 567 cutOffTime: [
567 "00:00:00", 568 "00:00:00",
569 + "00:30:00",
568 "01:00:00", 570 "01:00:00",
571 + "01:30:00",
569 "02:00:00", 572 "02:00:00",
573 + "02:30:00",
570 "03:00:00", 574 "03:00:00",
575 + "03:30:00",
571 "04:00:00", 576 "04:00:00",
577 + "04:30:00",
572 "05:00:00", 578 "05:00:00",
579 + "05:30:00",
573 "06:00:00", 580 "06:00:00",
581 + "06:30:00",
574 "07:00:00", 582 "07:00:00",
583 + "07:30:00",
575 "08:00:00", 584 "08:00:00",
585 + "08:30:00",
576 "09:00:00", 586 "09:00:00",
587 + "09:30:00",
577 "10:00:00", 588 "10:00:00",
589 + "10:30:00",
578 "11:00:00", 590 "11:00:00",
591 + "11:30:00",
579 "12:00:00", 592 "12:00:00",
593 + "12:30:00",
580 "13:00:00", 594 "13:00:00",
595 + "13:30:00",
581 "14:00:00", 596 "14:00:00",
597 + "14:30:00",
582 "15:00:00", 598 "15:00:00",
599 + "15:30:00",
583 "16:00:00", 600 "16:00:00",
601 + "16:30:00",
584 "17:00:00", 602 "17:00:00",
603 + "17:30:00",
585 "18:00:00", 604 "18:00:00",
605 + "18:30:00",
586 "19:00:00", 606 "19:00:00",
607 + "19:30:00",
587 "20:00:00", 608 "20:00:00",
609 + "20:30:00",
588 "21:00:00", 610 "21:00:00",
611 + "21:30:00",
589 "22:00:00", 612 "22:00:00",
613 + "22:30:00",
590 "23:00:00", 614 "23:00:00",
615 + "23:30:00",
591 ], 616 ],
592 }, 617 },
593 //选中数组 618 //选中数组
...@@ -618,8 +643,7 @@ export default { ...@@ -618,8 +643,7 @@ export default {
618 }, 643 },
619 created() { 644 created() {
620 //查询条件数据源 645 //查询条件数据源
621 - let date = new Date() 646 + this.queryParams.fltDateStart = nowDate()
622 - this.queryParams.fltDateStart = `${date.getFullYear()}-${(date.getMonth() + 1) > 9 ? (date.getMonth() + 1) : '0' + (date.getMonth() + 1)}-${(date.getDate()) > 9 ? date.getDate() : '0' + (date.getDate())}`
623 this.findFltConditionData(); 647 this.findFltConditionData();
624 if (this.$store.state.tagsView.cachedViews.length == 0) { 648 if (this.$store.state.tagsView.cachedViews.length == 0) {
625 this.findAllFltData(); 649 this.findAllFltData();
......
...@@ -297,7 +297,7 @@ export default { ...@@ -297,7 +297,7 @@ export default {
297 }, 297 },
298 { 298 {
299 name: "推送状态", 299 name: "推送状态",
300 - value: "cargoAllocationDataStatus", 300 + value: "cargoPushStatus",
301 width: "100", 301 width: "100",
302 align: "center", 302 align: "center",
303 sorTable: true, 303 sorTable: true,
......