Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
0bd7c07a 1 parent 6b952416

version:0.5.7.2,图标添加，新增航班删除，表格排序更新，表格重量计算更新，货物查询更新

Inline Side-by-side
Showing 16 changed files with 755 additions and 463 deletions
...@@ -26,6 +26,14 @@ export function findFltById(data) { ...@@ -26,6 +26,14 @@ export function findFltById(data) {
26 26
27 }) 27 })
28 } 28 }
29 +//删除航班
30 +export function delFlight(data) {
31 + return request({
32 + url: '/FlightPreserveController/delFlight/'+ data,
33 + method: 'post'
34 +
35 + })
36 +}
29 //新增修改 37 //新增修改
30 export function saveOrUpdate(data) { 38 export function saveOrUpdate(data) {
31 return request({ 39 return request({
......
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1640932660027" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="9915" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M682.496 420.864V597.333333a42.666667 42.666667 0 0 0 85.333333 0V388.565333l128-48.469333v436.736l-341.333333 124.245333V469.333333l128-48.469333zM415.957333 161.834667L511.829333 128l362.666667 128-113.450667 40.021333L416 161.834667z m-102.229333 36.096l345.088 134.186666L511.829333 384l-362.666666-128 164.565333-58.069333z m212.736 799.402666l426.624-155.136a42.666667 42.666667 0 0 0 28.074667-40.106666V243.2a42.666667 42.666667 0 0 0-28.074667-40.106667L526.506667 48.042667a42.666667 42.666667 0 0 0-29.354667 0.085333L70.570667 205.397333A42.666667 42.666667 0 0 0 42.666667 245.674667l3.285333 556.714666a42.666667 42.666667 0 0 0 27.989333 39.808l423.253334 155.093334a42.666667 42.666667 0 0 0 29.269333 0.042666zM469.162667 469.333333v429.226667l-341.333334-124.202667V337.621333l341.333334 131.712z" p-id="9916"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 -<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" fill="#333333" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" fill="#333333" p-id="3064"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1569915748289" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="3062" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M768.35456 416a256 256 0 1 0-512 0 192 192 0 1 0 0 384v64a256 256 0 0 1-58.88-505.216 320.128 320.128 0 0 1 629.76 0A256.128 256.128 0 0 1 768.35456 864v-64a192 192 0 0 0 0-384z m-512 384h64v64H256.35456v-64z m448 0h64v64h-64v-64z" p-id="3063"></path><path d="M539.04256 845.248V512.192a32.448 32.448 0 0 0-32-32.192c-17.664 0-32 14.912-32 32.192v333.056l-36.096-36.096a32.192 32.192 0 0 0-45.056 0.192 31.616 31.616 0 0 0-0.192 45.056l90.88 90.944a31.36 31.36 0 0 0 22.528 9.088 30.08 30.08 0 0 0 22.4-9.088l90.88-90.88a32.192 32.192 0 0 0-0.192-45.12 31.616 31.616 0 0 0-45.056-0.192l-36.096 36.096z" p-id="3064"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
......
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1645581110679" class="icon" viewBox="0 0 1024 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="2204" xmlns:xlink="http://www.w3.org/1999/xlink" width="200" height="200"><defs><style type="text/css"></style></defs><path d="M950.555 411.291l-380.258-300.594c-32.737-25.963-84.018-25.963-116.754 0l-380.097 300.594c-13.062 10.321-15.158 29.189-4.999 42.090s28.705 15.158 41.768 4.999l11.772-9.676v363.326c0 51.443 54.346 89.985 101.918 89.985h599.899c47.089 0 78.052-36.123 78.052-89.985v-362.036l10.966 8.386c5.483 4.354 12.256 6.451 18.868 6.451 8.87 0 17.739-3.87 23.706-11.45 10.321-12.901 8.225-31.769-4.838-42.090zM481.924 842.025v-166.424c0-8.225 14.997-12.417 29.995-12.417s29.995 4.192 29.995 12.417v166.263l-59.99 0.161zM842.025 812.030c0 19.836-5.483 29.995-18.062 29.995h-221.414c0-0.484-0.645-0.806-0.645-1.29v-165.133c0-34.833-28.059-72.407-89.985-72.407s-89.985 37.574-89.985 72.407v165.133c0 0.484 0.806 0.806 0.806 1.29h-198.676c-18.868 0-41.929-16.287-41.929-29.995v-410.899l308.174-243.346c11.127-8.708 31.124-8.708 42.090 0l309.464 244.797v409.447z" p-id="2205"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 +<?xml version="1.0" standalone="no"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg t="1640932917338" class="icon" viewBox="0 0 1333 1024" version="1.1" xmlns="http://www.w3.org/2000/svg" p-id="16956" xmlns:xlink="http://www.w3.org/1999/xlink" width="260.3515625" height="200"><defs><style type="text/css"></style></defs><path d="M 1101.48 342.52 a 155.844 155.844 0 1 0 -226.753 0 a 244.675 244.675 0 0 0 -53.7662 38.1818 A 197.922 197.922 0 0 0 484.34 373.688 a 243.896 243.896 0 0 0 -63.1169 -48.3117 a 155.844 155.844 0 1 0 -226.753 0 A 245.454 245.454 0 0 0 62.003 544.337 a 38.961 38.961 0 0 0 77.9221 0 a 168.311 168.311 0 0 1 298.441 -105.974 a 38.1818 38.1818 0 0 0 17.1428 13.2468 a 190.909 190.909 0 0 0 66.2337 180.78 a 319.48 319.48 0 0 0 -189.351 290.649 a 38.961 38.961 0 0 0 77.9221 0 a 241.559 241.559 0 0 1 482.337 0 a 38.961 38.961 0 0 0 77.9221 0 a 319.48 319.48 0 0 0 -189.351 -290.649 a 197.922 197.922 0 0 0 69.3506 -149.61 a 196.363 196.363 0 0 0 0 -28.052 a 37.4026 37.4026 0 0 0 17.922 -10.1299 a 166.753 166.753 0 0 1 123.117 -52.9869 A 168.311 168.311 0 0 1 1152.9 559.143 a 38.961 38.961 0 0 0 77.9221 0 a 245.454 245.454 0 0 0 -129.351 -216.623 Z M 308.236 295.767 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 77.9221 Z m 342.857 311.688 a 120.779 120.779 0 1 1 121.558 -124.675 A 121.558 121.558 0 0 1 651.093 607.454 Z m 336.623 -290.649 a 77.9221 77.9221 0 1 1 77.9221 -77.9221 a 77.9221 77.9221 0 0 1 -77.9221 74.8052 Z" p-id="16957"></path></svg>
...\ No newline at end of file ...\ No newline at end of file
1 +var en = {
2 + "common": {
3 + "risk": "risk",
4 + "exit": "exit",
5 + "index":"index"
6 + }
7 +
8 +}
9 +export default en
1 +var zh = {
2 + "common": {
3 + "risk": "风险",
4 + "exit": "退出",
5 + "index":"首页"
6 + }
7 +
8 +}
9 +export default zh
...@@ -229,6 +229,7 @@ export default { ...@@ -229,6 +229,7 @@ export default {
229 if (this.shiftKey) { 229 if (this.shiftKey) {
230 const sum = Math.abs(this.start - end); 230 const sum = Math.abs(this.start - end);
231 const min = Math.min(this.start, end); 231 const min = Math.min(this.start, end);
232 + const max = Math.max(this.start, end);
232 let i; 233 let i;
233 if (this.start === -1 && selection.includes(this.data[row.index])) { 234 if (this.start === -1 && selection.includes(this.data[row.index])) {
234 for (i = 0; i < sum; i++) { 235 for (i = 0; i < sum; i++) {
...@@ -238,15 +239,19 @@ export default { ...@@ -238,15 +239,19 @@ export default {
238 } else if (selection.includes(this.data[row.index])) { 239 } else if (selection.includes(this.data[row.index])) {
239 if (!selection.includes(this.data[this.start])) { 240 if (!selection.includes(this.data[this.start])) {
240 this.$refs.tables.toggleRowSelection(this.data[this.start], true); 241 this.$refs.tables.toggleRowSelection(this.data[this.start], true);
241 - this.selectTable.push(this.data[this.start]); 242 + if(this.selectTable.includes(this.data[this.start])){
243 + this.selectTable.push(this.data[this.start]);
244 + }
242 } 245 }
243 - for (i = this.start + 1; i <= this.start + sum; i++) { 246 + for (i = min; i <= sum + min; i++) {
244 this.$refs.tables.toggleRowSelection(this.data[i], true); 247 this.$refs.tables.toggleRowSelection(this.data[i], true);
245 - this.selectTable.push(this.data[i]); 248 + if(!this.selectTable.includes(this.data[i])){
249 + this.selectTable.push(this.data[i]);
250 + }
246 } 251 }
247 } else if (!selection.includes(this.data[row.index])) { 252 } else if (!selection.includes(this.data[row.index])) {
248 - this.selectTable.splice(end - 1, sum + 1); 253 + this.selectTable.splice(min > 1 ? min - 2 : min, sum + 1);
249 - for (i = end; i <= this.start; i++) { 254 + for (i = min; i <= max; i++) {
250 this.$refs.tables.toggleRowSelection(this.data[i], false); 255 this.$refs.tables.toggleRowSelection(this.data[i], false);
251 } 256 }
252 } 257 }
...@@ -254,7 +259,7 @@ export default { ...@@ -254,7 +259,7 @@ export default {
254 } else { 259 } else {
255 this.start = end; 260 this.start = end;
256 if (selection.includes(this.data[end])) { 261 if (selection.includes(this.data[end])) {
257 - this.selectTable.push(row); 262 + this.selectTable = selection;
258 } else { 263 } else {
259 for (let i = 0; i < this.selectTable.length; i++) { 264 for (let i = 0; i < this.selectTable.length; i++) {
260 if (this.selectTable[i].index == row.index) { 265 if (this.selectTable[i].index == row.index) {
...@@ -263,10 +268,11 @@ export default { ...@@ -263,10 +268,11 @@ export default {
263 } 268 }
264 } 269 }
265 } 270 }
266 - selection = this.selectTable; 271 + selection = this.selectTable.sort(this.compare('index','ascending'));
267 this.$emit("tableSelect", { selection, row }); 272 this.$emit("tableSelect", { selection, row });
268 }, 273 },
269 tableSelectAll(selection) { 274 tableSelectAll(selection) {
275 + this.selectTable = selection;
270 this.$emit("tableSelectAll", selection); 276 this.$emit("tableSelectAll", selection);
271 }, 277 },
272 SelectChange(selection) { 278 SelectChange(selection) {
...@@ -289,7 +295,7 @@ export default { ...@@ -289,7 +295,7 @@ export default {
289 // console.log(val); 295 // console.log(val);
290 // }, 296 // },
291 sortChange({ column, prop, order }) { 297 sortChange({ column, prop, order }) {
292 - this.$emit("sortChange",{prop:prop, order:order}) 298 + this.$emit("sortChange", { prop: prop, order: order });
293 }, 299 },
294 compare(propertyName, sort) { 300 compare(propertyName, sort) {
295 return function (obj1, obj2) { 301 return function (obj1, obj2) {
......
...@@ -66,20 +66,6 @@ export const constantRoutes = [ ...@@ -66,20 +66,6 @@ export const constantRoutes = [
66 } 66 }
67 ] 67 ]
68 }, 68 },
69 - // {
70 - // path: '/user',
71 - // component: Layout,
72 - // hidden: true,
73 - // redirect: 'noredirect',
74 - // children: [
75 - // {
76 - // path: 'profile',
77 - // component: (resolve) => require(['@/views/systemConfig/userConfig/profile/index'], resolve),
78 - // name: 'Profile',
79 - // meta: { title: '个人中心', icon: 'user' }
80 - // }
81 - // ]
82 - // },
83 { 69 {
84 path: '/', 70 path: '/',
85 component: Layout, 71 component: Layout,
...@@ -89,13 +75,13 @@ export const constantRoutes = [ ...@@ -89,13 +75,13 @@ export const constantRoutes = [
89 { 75 {
90 path: '/flightAllocConfig/:handle/:id', 76 path: '/flightAllocConfig/:handle/:id',
91 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 77 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
92 - name: 'flightAllocConfigInfo', 78 + name: 'FlightAllocConfigInfo',
93 meta: { title: '航班配舱', icon: 'user', breadcrumb: true } 79 meta: { title: '航班配舱', icon: 'user', breadcrumb: true }
94 }, 80 },
95 { 81 {
96 path: '/flightAllocConfig/:handle', 82 path: '/flightAllocConfig/:handle',
97 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve), 83 component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
98 - name: 'flightAllocConfigAdd', 84 + name: 'FlightAllocConfigInfo',
99 meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false } 85 meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false }
100 } 86 }
101 ] 87 ]
......
...@@ -42,5 +42,5 @@ module.exports = { ...@@ -42,5 +42,5 @@ module.exports = {
42 /** 42 /**
43 * 版本号 43 * 版本号
44 */ 44 */
45 - version:'version：0.5.7' 45 + version:'version：0.5.7.2'
46 } 46 }
......
...@@ -231,7 +231,9 @@ ...@@ -231,7 +231,9 @@
231 <el-form-item label="Handling Code"> 231 <el-form-item label="Handling Code">
232 <el-empty 232 <el-empty
233 description="暂无数据" 233 description="暂无数据"
234 - v-if="!selectData.HandlingCode || selectData.HandlingCode.length == 0" 234 + v-if="
235 + !selectData.HandlingCode || selectData.HandlingCode.length == 0
236 + "
235 ></el-empty> 237 ></el-empty>
236 <el-checkbox-group v-model="handingCodes" v-else> 238 <el-checkbox-group v-model="handingCodes" v-else>
237 <el-checkbox 239 <el-checkbox
...@@ -247,7 +249,9 @@ ...@@ -247,7 +249,9 @@
247 <el-form-item label="Sub Category"> 249 <el-form-item label="Sub Category">
248 <el-empty 250 <el-empty
249 description="暂无数据" 251 description="暂无数据"
250 - v-if="!selectData.SubCategory || selectData.SubCategory.length == 0" 252 + v-if="
253 + !selectData.SubCategory || selectData.SubCategory.length == 0
254 + "
251 ></el-empty> 255 ></el-empty>
252 <el-checkbox-group v-model="subCategorys" v-else> 256 <el-checkbox-group v-model="subCategorys" v-else>
253 <el-checkbox 257 <el-checkbox
...@@ -334,7 +338,7 @@ import { downLoadXlsx } from "@/utils/zipdownload"; ...@@ -334,7 +338,7 @@ import { downLoadXlsx } from "@/utils/zipdownload";
334 import { upCase } from "@/utils/FedEx"; 338 import { upCase } from "@/utils/FedEx";
335 339
336 export default { 340 export default {
337 - name:"CargoAllocation", 341 + name: "CargoAllocation",
338 components: { 342 components: {
339 Dialog, 343 Dialog,
340 }, 344 },
...@@ -344,7 +348,7 @@ export default { ...@@ -344,7 +348,7 @@ export default {
344 fltDateStart: null, 348 fltDateStart: null,
345 fltDateEnd: null, 349 fltDateEnd: null,
346 typeId: null, 350 typeId: null,
347 - portName:null, 351 + portName: null,
348 statusId: null, 352 statusId: null,
349 kindToAllocFlightId: null, 353 kindToAllocFlightId: null,
350 serviceTypeId: null, 354 serviceTypeId: null,
...@@ -854,18 +858,20 @@ export default { ...@@ -854,18 +858,20 @@ export default {
854 } else { 858 } else {
855 reject(res.msg); 859 reject(res.msg);
856 } 860 }
857 - resolve(obj) 861 + resolve(obj);
858 }) 862 })
859 .catch(() => {}); 863 .catch(() => {});
860 this.select(); 864 this.select();
861 - }).then(res=>{ 865 + })
862 - this.selectData = res 866 + .then((res) => {
863 - }).catch((err) => { 867 + this.selectData = res;
864 - this.$message({ 868 + })
865 - message: "查询条件不存在", 869 + .catch((err) => {
866 - type: "warning", 870 + this.$message({
871 + message: "查询条件不存在",
872 + type: "warning",
873 + });
867 }); 874 });
868 - });
869 }, 875 },
870 mounted() { 876 mounted() {
871 window.addEventListener("keydown", (code) => { 877 window.addEventListener("keydown", (code) => {
...@@ -1015,29 +1021,27 @@ export default { ...@@ -1015,29 +1021,27 @@ export default {
1015 this.select(); 1021 this.select();
1016 }, 1022 },
1017 //排序 1023 //排序
1018 - sortChange(val){ 1024 + sortChange(val) {
1019 - this.tableData.sort(this.$refs.newTables.compare(val.prop,val.order)); 1025 + let data = [];
1020 - }, 1026 + let nullData = [];
1021 - //添加到航班 1027 + this.tableData.forEach((item) => {
1022 - addFit() { 1028 + if (item[val.prop]) {
1023 - let open = true; 1029 + data.push(item);
1024 - this.tableSelection.forEach((item) => { 1030 + } else {
1025 - if (item.statusId != 107966) { 1031 + nullData.push(item);
1026 - open = false;
1027 } 1032 }
1028 }); 1033 });
1029 - if (open) { 1034 + data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
1030 - this.dialogVisible = open; 1035 + if (val.order != "ascending") {
1036 + this.tableData = nullData.concat(data);
1031 } else { 1037 } else {
1032 - this.$message({ 1038 + this.tableData = data.concat(nullData);
1033 - message: "包含不可手动配舱货物",
1034 - type: "warning",
1035 - });
1036 - this.tableSelection = [];
1037 - this.cargoTotal();
1038 - this.$refs.newTables.clearTable();
1039 } 1039 }
1040 }, 1040 },
1041 + //添加到航班
1042 + addFit() {
1043 + this.dialogVisible = true;
1044 + },
1041 //关闭弹框 1045 //关闭弹框
1042 dialogBeforeClose(val) { 1046 dialogBeforeClose(val) {
1043 this.dialogVisible = val.close; 1047 this.dialogVisible = val.close;
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
8 > 8 >
9 <el-form-item label="航班号"> 9 <el-form-item label="航班号">
10 <el-input 10 <el-input
11 - v-model.trim="queryParams.purposeOfFlightNo" 11 + v-model.trim="purposeOfFlightNo"
12 placeholder="航班号" 12 placeholder="航班号"
13 @keyup.enter.native="getList" 13 @keyup.enter.native="getList"
14 ></el-input> 14 ></el-input>
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
34 type="primary" 34 type="primary"
35 icon="el-icon-plus" 35 icon="el-icon-plus"
36 size="mini" 36 size="mini"
37 - @click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })" 37 + @click="$router.push({ name: 'FlightAllocConfigInfo', params: { handle: 'add' } })"
38 >添加</el-button 38 >添加</el-button
39 > 39 >
40 <el-table :data="flyList" v-loading="loading" size="small"> 40 <el-table :data="flyList" v-loading="loading" size="small">
...@@ -169,7 +169,7 @@ export default { ...@@ -169,7 +169,7 @@ export default {
169 //跳转到查看，修改页面 169 //跳转到查看，修改页面
170 handleClick(flightiId, handle) { 170 handleClick(flightiId, handle) {
171 this.$router.push({ 171 this.$router.push({
172 - name: "flightAllocConfigInfo", 172 + name: "FlightAllocConfigInfo",
173 params: { handle: handle, id: flightiId }, 173 params: { handle: handle, id: flightiId },
174 }); 174 });
175 }, 175 },
...@@ -218,6 +218,16 @@ export default { ...@@ -218,6 +218,16 @@ export default {
218 }, 218 },
219 created() { 219 created() {
220 this.getList(); 220 this.getList();
221 + },
222 + computed:{
223 + purposeOfFlightNo: {
224 + get: function () {
225 + return this.queryParams.purposeOfFlightNo;
226 + },
227 + set: function (val) {
228 + this.queryParams.purposeOfFlightNo = val.toUpperCase()
229 + },
230 + },
221 } 231 }
222 }; 232 };
223 </script> 233 </script>
......
...@@ -277,6 +277,7 @@ import { ...@@ -277,6 +277,7 @@ import {
277 } from "@/api/destinationFlight"; 277 } from "@/api/destinationFlight";
278 278
279 export default { 279 export default {
280 + name:"",
280 data() { 281 data() {
281 return { 282 return {
282 form: { 283 form: {
...@@ -355,6 +356,7 @@ export default { ...@@ -355,6 +356,7 @@ export default {
355 this.formHandlingCode = this.form.handlingCode; 356 this.formHandlingCode = this.form.handlingCode;
356 this.formSubCategory = this.form.subCategory; 357 this.formSubCategory = this.form.subCategory;
357 this.form.isNeedRequired = this.isNeedRequired; 358 this.form.isNeedRequired = this.isNeedRequired;
359 + this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
358 if (this.isLocation == 1) { 360 if (this.isLocation == 1) {
359 this.form.notLocation = ""; 361 this.form.notLocation = "";
360 } else { 362 } else {
......
...@@ -237,7 +237,7 @@ ...@@ -237,7 +237,7 @@
237 //跳转到查看，修改页面 237 //跳转到查看，修改页面
238 handleClick(flightiId, handle) { 238 handleClick(flightiId, handle) {
239 this.$router.push({ 239 this.$router.push({
240 - name: "flightAllocConfigInfo", 240 + name: "FlightAllocConfigInfo",
241 params: { 241 params: {
242 handle: handle, 242 handle: handle,
243 id: flightiId 243 id: flightiId
......
...@@ -51,8 +51,11 @@ ...@@ -51,8 +51,11 @@
51 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button> 51 <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
52 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button> 52 <el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
53 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button> 53 <el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
54 + <el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
55 + </el-button>
54 <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button> 56 <el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button>
55 <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button> 57 <el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button>
58 +
56 </el-form> 59 </el-form>
57 <!-- <el-row :gutter="10" class="mb8"> 60 <!-- <el-row :gutter="10" class="mb8">
58 <el-col :span="1.5"> 61 <el-col :span="1.5">
...@@ -112,7 +115,7 @@ ...@@ -112,7 +115,7 @@
112 class-name="small-padding fixed-width" width="130" fixed="right"> 115 class-name="small-padding fixed-width" width="130" fixed="right">
113 <template slot-scope="scope"> 116 <template slot-scope="scope">
114 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button> 117 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
115 - <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')"> 118 + <!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row,'删除')">
116 删除</el-button> --> 119 删除</el-button> -->
117 </template> 120 </template>
118 </el-table-column> 121 </el-table-column>
...@@ -264,10 +267,19 @@ ...@@ -264,10 +267,19 @@
264 <el-button @click="cancel">取 消</el-button> 267 <el-button @click="cancel">取 消</el-button>
265 </div> 268 </div>
266 </el-dialog> 269 </el-dialog>
270 +
271 + <el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible">
272 + <el-table :data="gridData">
273 + <el-table-column property="fltNo" label="航班号" width="150"></el-table-column>
274 + <el-table-column property="fltDate" label="航班日期" width="200"></el-table-column>
275 + <el-table-column property="alloctedWeight" label="已配重量" width="200"></el-table-column>
276 + </el-table>
277 + </el-dialog>
267 </div> 278 </div>
268 </template> 279 </template>
269 <script> 280 <script>
270 import { 281 import {
282 + delFlight,
271 findFltConditionDataApi, 283 findFltConditionDataApi,
272 findAllFltDataApi, 284 findAllFltDataApi,
273 findFltById, 285 findFltById,
...@@ -280,6 +292,8 @@ ...@@ -280,6 +292,8 @@
280 name: "FlightInformationMaintenance", 292 name: "FlightInformationMaintenance",
281 data() { 293 data() {
282 return { 294 return {
295 + gridData:[],
296 + dialogTableVisible: false,
283 //高价百分比是否打开 297 //高价百分比是否打开
284 ishighPriceWeightPercent:true, 298 ishighPriceWeightPercent:true,
285 //form属性禁用状态 299 //form属性禁用状态
...@@ -624,40 +638,34 @@ ...@@ -624,40 +638,34 @@
624 638
625 }); 639 });
626 }, 640 },
627 - /** 删除 启用 停用按钮操作 */ 641 + /** 删除按钮操作 */
628 - handleDeleteorPlayorpause(row, status, statusText) { 642 + handleDelete(row) {
629 - 643 + const fIds =this.ids;
630 - //删除前需要停用 644 + this.$confirm('是否确认删除所选数据?', "警告", {
631 - if (status === 0 && row.status != '3') { 645 + confirmButtonText: "确定",
632 - this.$message({ 646 + cancelButtonText: "取消",
633 - message: '请停用后删除', 647 + type: "warning"
634 - type: 'warning' 648 + }).then(function() {
635 - }); 649 + return delFlight(fIds);
636 - return; 650 + }).then(response => {
637 - } 651 + this.findAllFltData();
638 - 652 + if(response.data.length>0){
639 - this.$confirm('是否确认' + statusText + '此数据项?', "警告", { 653 + this.gridData=response.data;
640 - confirmButtonText: "确定", 654 + this.$confirm(response.msg, '提示', {
641 - cancelButtonText: "取消", 655 + confirmButtonText: '查看删除失败航班信息',
642 - type: "warning" 656 + cancelButtonText: '取消',
643 - }).then(function() { 657 + type: 'warning',
644 - 658 + center: true
645 - let disable = { 659 + }).then(() => {
646 - id: row.id, 660 + this.dialogTableVisible=true;
647 - status: status 661 + }).catch(function() { });
648 - };
649 662
650 - return delOrEnableORDisableApi(disable); 663 + }else{
651 - }).then(response => { 664 + this.msgSuccess(response.msg);
652 - if (response.code == 200) { 665 + }
653 - this.findAllFltData(); 666 + }).catch(function() {});
654 - this.msgSuccess(statusText + "成功"); 667 + },
655 - } else {
656 - this.msgError(response.msg);
657 - }
658 668
659 - }).catch(function() {});
660 - },
661 /** 提交按钮 */ 669 /** 提交按钮 */
662 submitForm: function() { 670 submitForm: function() {
663 this.$refs["form"].validate(valid => { 671 this.$refs["form"].validate(valid => {
......
...@@ -3,15 +3,14 @@ ...@@ -3,15 +3,14 @@
3 <el-form 3 <el-form
4 ref="cargoForm" 4 ref="cargoForm"
5 class="form-header" 5 class="form-header"
6 + label-position="right"
7 + label-width="auto"
6 size="small" 8 size="small"
7 :model="formData" 9 :model="formData"
8 - label-position="top"
9 - label-width="auto"
10 - style="margin: 10px; width: 100%"
11 > 10 >
12 - <el-row type="flex" style="flexWrap: wrap !important"> 11 + <el-row type="flex" style="flexWrap: wrap!important">
13 <el-col :span="6"> 12 <el-col :span="6">
14 - <el-form-item label="配舱航班日期:"> 13 + <el-form-item label="配舱航班日期">
15 <el-date-picker 14 <el-date-picker
16 class="formItem" 15 class="formItem"
17 v-model="cargoPlaneTime" 16 v-model="cargoPlaneTime"
...@@ -25,18 +24,12 @@ ...@@ -25,18 +24,12 @@
25 </el-form-item> 24 </el-form-item>
26 </el-col> 25 </el-col>
27 <el-col :span="6"> 26 <el-col :span="6">
28 - <el-form-item label="配载航班号:"> 27 + <el-form-item label="配载航班号">
29 - <el-input 28 + <el-input type="textarea" v-model="cargoPlaneNo" class="formItem" placeholder="AC001;AC002" rows="1"></el-input>
30 - type="textarea"
31 - v-model="cargoPlaneNo"
32 - class="formItem"
33 - placeholder="AC001;AC002"
34 - rows="1"
35 - ></el-input>
36 </el-form-item> 29 </el-form-item>
37 </el-col> 30 </el-col>
38 <el-col :span="6"> 31 <el-col :span="6">
39 - <el-form-item label="海关回执状态:"> 32 + <el-form-item label="海关回执状态">
40 <el-select 33 <el-select
41 placeholder="不限" 34 placeholder="不限"
42 v-model="formData.customsReceiptStatusId" 35 v-model="formData.customsReceiptStatusId"
...@@ -55,7 +48,7 @@ ...@@ -55,7 +48,7 @@
55 </el-form-item> 48 </el-form-item>
56 </el-col> 49 </el-col>
57 <el-col :span="6"> 50 <el-col :span="6">
58 - <el-form-item label="运单号:"> 51 + <el-form-item label="运单号">
59 <el-input 52 <el-input
60 type="textarea" 53 type="textarea"
61 v-model.trim="formData.waybillNo" 54 v-model.trim="formData.waybillNo"
...@@ -66,25 +59,25 @@ ...@@ -66,25 +59,25 @@
66 </el-form-item> 59 </el-form-item>
67 </el-col> 60 </el-col>
68 <el-col :span="6"> 61 <el-col :span="6">
69 - <el-form-item label="申报类别:"> 62 + <el-form-item label="申报类别">
70 - <el-select 63 + <el-select
71 - placeholder="不限" 64 + placeholder="不限"
72 - v-model="formData.typeId" 65 + v-model="formData.typeId"
73 - class="formItem" 66 + class="formItem"
74 - clearable 67 + clearable
68 + >
69 + <el-option
70 + v-for="item in findConditionData.cargoType"
71 + :label="item.chineseName"
72 + :value="item.id"
73 + :key="item.id"
75 > 74 >
76 - <el-option 75 + </el-option>
77 - v-for="item in findConditionData.cargoType" 76 + </el-select>
78 - :label="item.chineseName"
79 - :value="item.id"
80 - :key="item.id"
81 - >
82 - </el-option>
83 - </el-select>
84 </el-form-item> 77 </el-form-item>
85 </el-col> 78 </el-col>
86 <el-col :span="6"> 79 <el-col :span="6">
87 - <el-form-item label="服务类型:"> 80 + <el-form-item label="服务类型">
88 <el-select 81 <el-select
89 placeholder="不限" 82 placeholder="不限"
90 v-model="formData.serviceTypeId" 83 v-model="formData.serviceTypeId"
...@@ -103,7 +96,7 @@ ...@@ -103,7 +96,7 @@
103 </el-form-item> 96 </el-form-item>
104 </el-col> 97 </el-col>
105 <el-col :span="6"> 98 <el-col :span="6">
106 - <el-form-item label="URSA:"> 99 + <el-form-item label="URSA">
107 <el-input 100 <el-input
108 type="textarea" 101 type="textarea"
109 v-model="ursa" 102 v-model="ursa"
...@@ -114,7 +107,7 @@ ...@@ -114,7 +107,7 @@
114 </el-form-item> 107 </el-form-item>
115 </el-col> 108 </el-col>
116 <el-col :span="6"> 109 <el-col :span="6">
117 - <el-form-item label="站点:"> 110 + <el-form-item label="站点">
118 <el-input 111 <el-input
119 type="textarea" 112 type="textarea"
120 v-model="siteName" 113 v-model="siteName"
...@@ -125,9 +118,9 @@ ...@@ -125,9 +118,9 @@
125 </el-form-item> 118 </el-form-item>
126 </el-col> 119 </el-col>
127 <el-col :span="24" v-show="formShow"> 120 <el-col :span="24" v-show="formShow">
128 - <el-row type="flex" style="flexWrap: wrap !important"> 121 + <el-row type="flex" style="flexWrap: wrap!important">
129 <el-col :span="6"> 122 <el-col :span="6">
130 - <el-form-item label="ACCS原航班日期:"> 123 + <el-form-item label="ACCS原航班日期">
131 <el-date-picker 124 <el-date-picker
132 class="formItem" 125 class="formItem"
133 v-model="flightTime" 126 v-model="flightTime"
...@@ -138,21 +131,17 @@ ...@@ -138,21 +131,17 @@
138 :value-format="valueFormat" 131 :value-format="valueFormat"
139 > 132 >
140 </el-date-picker> 133 </el-date-picker>
141 - </el-form-item> 134 + </el-form-item>
142 </el-col> 135 </el-col>
143 <el-col :span="6"> 136 <el-col :span="6">
144 - <el-form-item label="ACCS原航班号:"> 137 + <el-form-item label="ACCS原航班号">
145 - <el-input 138 + <el-input type="text" v-model="fltNo" class="formItem" placeholder="请输入ACCS航班号"></el-input>
146 - type="text"
147 - v-model="fltNo"
148 - class="formItem"
149 - placeholder="请输入ACCS航班号"
150 - ></el-input>
151 </el-form-item> 139 </el-form-item>
152 </el-col> 140 </el-col>
153 <el-col :span="6"> 141 <el-col :span="6">
154 - <el-form-item label="取件日期:"> 142 + <el-form-item label="取件日期">
155 <el-date-picker 143 <el-date-picker
144 + class="formItem"
156 v-model="formData.pickUpDate" 145 v-model="formData.pickUpDate"
157 type="date" 146 type="date"
158 placeholder="选择日期" 147 placeholder="选择日期"
...@@ -162,7 +151,7 @@ ...@@ -162,7 +151,7 @@
162 </el-form-item> 151 </el-form-item>
163 </el-col> 152 </el-col>
164 <el-col :span="6"> 153 <el-col :span="6">
165 - <el-form-item label="创建日期:"> 154 + <el-form-item label="创建日期">
166 <el-date-picker 155 <el-date-picker
167 class="formItem" 156 class="formItem"
168 v-model="createDate" 157 v-model="createDate"
...@@ -176,7 +165,7 @@ ...@@ -176,7 +165,7 @@
176 </el-form-item> 165 </el-form-item>
177 </el-col> 166 </el-col>
178 <el-col :span="6"> 167 <el-col :span="6">
179 - <el-form-item label="货物状态:"> 168 + <el-form-item label="货物状态">
180 <el-select 169 <el-select
181 placeholder="不限" 170 placeholder="不限"
182 v-model="formData.statusId" 171 v-model="formData.statusId"
...@@ -195,22 +184,42 @@ ...@@ -195,22 +184,42 @@
195 </el-form-item> 184 </el-form-item>
196 </el-col> 185 </el-col>
197 <el-col :span="6"> 186 <el-col :span="6">
198 - <el-form-item label="是否自动:"> 187 + <el-form-item label="是否自动">
199 <el-select 188 <el-select
200 placeholder="不限" 189 placeholder="不限"
201 v-model="formData.allocationTypeId" 190 v-model="formData.allocationTypeId"
202 class="formItem" 191 class="formItem"
203 clearable 192 clearable
204 > 193 >
205 - <el-option label="手动" value="1"> </el-option> 194 + <el-option
206 - <el-option label="自动" value="2"> </el-option> 195 + label="手动"
196 + value="1"
197 + >
198 + </el-option>
199 + <el-option
200 + label="自动"
201 + value="2"
202 + >
203 + </el-option>
207 </el-select> 204 </el-select>
208 </el-form-item> 205 </el-form-item>
209 </el-col> 206 </el-col>
207 + <!-- <el-col :span="6">
208 + <el-form-item label="口岸代码">
209 + <el-select
210 + placeholder="不限"
211 + v-model="formData.portName"
212 + class="formItem"
213 + clearable
214 + >
215 +
216 + </el-select>
217 + </el-form-item>
218 + </el-col> -->
210 </el-row> 219 </el-row>
211 </el-col> 220 </el-col>
212 </el-row> 221 </el-row>
213 - <div style="paddingLeft: 10px; marginTop: 20px"> 222 + <div style="paddingLeft: 10px;marginTop:20px">
214 <el-button 223 <el-button
215 type="primary" 224 type="primary"
216 icon="el-icon-search" 225 icon="el-icon-search"
...@@ -222,99 +231,47 @@ ...@@ -222,99 +231,47 @@
222 <!-- <el-button type="primary" size="small" @click="checks(tableData)" 231 <!-- <el-button type="primary" size="small" @click="checks(tableData)"
223 >全选/全否</el-button 232 >全选/全否</el-button
224 > --> 233 > -->
225 - <el-button 234 + <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(0)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
226 - :type="downLoadingTip.downloading ? 'warning' : 'primary'" 235 + >{{downLoadingTip.downloading?downLoadingTip.tip:"导出本页查询结果"}}</el-button
227 - size="small"
228 - @click="xlse(0)"
229 - :disabled="tableData.length == 0"
230 - :loading="downLoadingTip.downloading"
231 - >{{
232 - downLoadingTip.downloading ? downLoadingTip.tip : "导出本页查询结果"
233 - }}</el-button
234 > 236 >
235 - <el-button 237 + <el-button :type="downLoadingTip.downloading?'warning':'primary'" size="small" @click="xlse(1)" :disabled="tableData.length==0" :loading="downLoadingTip.downloading"
236 - :type="downLoadingTip.downloading ? 'warning' : 'primary'" 238 + >{{downLoadingTip.downloading?downLoadingTip.tip:"导出全部查询结果"}}</el-button
237 - size="small"
238 - @click="xlse(1)"
239 - :disabled="tableData.length == 0"
240 - :loading="downLoadingTip.downloading"
241 - >{{
242 - downLoadingTip.downloading ? downLoadingTip.tip : "导出全部查询结果"
243 - }}</el-button
244 > 239 >
245 - <span style="marginLeft: 20px; color: #ffba00" 240 + <span style="marginLeft:20px;color:#ffba00">全部导出上限80000条数据</span>
246 - >全部导出上限80000条数据</span 241 + <el-progress v-if="progress!=0" class="progress" :stroke-width="12" :show-text="true" :percentage="progress" :status="progress == 100?'success':'warning'"></el-progress>
247 - >
248 - <el-progress
249 - v-if="progress != 0"
250 - class="progress"
251 - :stroke-width="12"
252 - :show-text="true"
253 - :percentage="progress"
254 - :status="progress == 100 ? 'success' : 'warning'"
255 - ></el-progress>
256 <div class="tips"> 242 <div class="tips">
257 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span> 243 <span style="paddingRight: 50px">总重量:{{ allWeight }}</span>
258 <span>总件数:{{ allQty }}</span> 244 <span>总件数:{{ allQty }}</span>
259 </div> 245 </div>
260 - <div class="formShow" @click="formShow = !formShow"> 246 + <!-- <RightToolbar :showSearch.sync="formShow" size="small"></RightToolbar> -->
261 - <i class="el-icon-s-tools"></i 247 + <div class="formShow" @click="formShow = !formShow"><i class="el-icon-s-tools"></i>{{formShow?'收起条件':'更多条件'}}</div>
262 - >{{ formShow ? "收起条件" : "更多条件" }}
263 - </div>
264 </div> 248 </div>
265 </el-form> 249 </el-form>
266 - <el-table 250 + <Tables
267 - ref="cargoTable" 251 + ref="newTables"
268 :data="tableData" 252 :data="tableData"
269 - v-loading="tableLoading" 253 + :headerData="tableHeader"
270 - highlight-current-row 254 + :totalCount="totalCount"
271 - border 255 + :loading="tableLoading"
272 - stripe 256 + :limitSize="limitSize"
273 - height="430" 257 + :limitStart="limitStart"
274 - size="mini" 258 + :shiftKey="shiftKey"
275 - @select="cheacked" 259 + height="550"
276 - @select-all="selectAll" 260 + @tableSelect="tableSelect"
277 - @sort-change="sortChange" 261 + @tableSelectAll="tableSelectAll"
278 - > 262 + @currentChange="currentChange"
279 - <el-table-column type="selection" width="55" fixed align="center"> 263 + @sortChange="sortChange"
280 - </el-table-column> 264 + ></Tables>
281 - <el-table-column type="index" label="序号" align="center">
282 - <template slot-scope="scope">{{ scope.$index + 1 }}</template>
283 - </el-table-column>
284 - <el-table-column
285 - v-for="item in tableHeader"
286 - :prop="item.value"
287 - :label="item.name"
288 - :key="item.name"
289 - header-align="center"
290 - align="center"
291 - :show-overflow-tooltip="true"
292 - :width="item.value == 'bigPretrialOpinion' ? '300' : '170'"
293 - :formatter="formatter"
294 - sortable
295 - >
296 - </el-table-column>
297 - </el-table>
298 - <el-pagination
299 - :total="totalCount"
300 - :page-size.sync="limitSize"
301 - background
302 - style="marginTop: 40px; textAlign: right"
303 - @next-click="nextClick"
304 - @prev-click="prevClick"
305 - @current-change="currentChange"
306 - >
307 - </el-pagination>
308 </div> 265 </div>
309 </template> 266 </template>
310 267
311 <script> 268 <script>
312 import { findConditionData, findCargoData } from "@/api/cargoSelect"; 269 import { findConditionData, findCargoData } from "@/api/cargoSelect";
313 import { downLoadXlsx } from "@/utils/zipdownload"; 270 import { downLoadXlsx } from "@/utils/zipdownload";
314 -import { upCase } from "@/utils/FedEx"; 271 +import { upCase } from "@/utils/FedEx"
315 272
316 export default { 273 export default {
317 - name: "QueryCargo", 274 + name:"QueryCargo",
318 data() { 275 data() {
319 return { 276 return {
320 formData: { 277 formData: {
...@@ -339,81 +296,468 @@ export default { ...@@ -339,81 +296,468 @@ export default {
339 dataSources: "", 296 dataSources: "",
340 customsReceiptStatusId: null, 297 customsReceiptStatusId: null,
341 big: null, 298 big: null,
342 - cargoPlaneNo: null, 299 + cargoPlaneNo:null,
343 - cargoPlaneStart: null, 300 + cargoPlaneStart:null,
344 - cargoPlaneEnd: null, 301 + cargoPlaneEnd:null,
302 + limitStart: 1,
303 + limitSize:100,
345 }, //表单数据 304 }, //表单数据
346 tableHeader: [ 305 tableHeader: [
347 - { name: "口岸代码", value: "portName" },
348 - { name: "取件日期", value: "pickUpDate" },
349 - { name: "取件扫描号", value: "pickUpScanNo" },
350 - { name: "站点", value: "siteName" },
351 - { name: "运单号", value: "waybillNo" },
352 - { name: "服务类型", value: "serviceTypeName" },
353 - { name: "URSA", value: "ursa" },
354 - { name: "申报类型", value: "typeName" },
355 - { name: "HandlingCode", value: "handingCode" },
356 - { name: "subcategory", value: "subCategory" },
357 - { name: "件数", value: "qty" },
358 - { name: "实际重量", value: "actualWeight" },
359 - { name: "收件人国家代码", value: "consigneeCountry" },
360 - { name: "品名描述", value: "nameDescription" },
361 - { name: "海关回执状态", value: "customsReceiptStatusName" },
362 - { name: "总单号", value: "totalWaybillNo" },
363 - { name: "预审状态", value: "preQualificationStatus" },
364 - { name: "航班预审意见", value: "caPretrialOpinion" },
365 - { name: "货物状态", value: "statusName" },
366 - { name: "终配航班号", value: "finalFlightNo" },
367 - { name: "终配航班日期", value: "finalFlightTime" },
368 - { name: "二配航班号", value: "twoMatchFlightNo" },
369 - { name: "二配航班日期", value: "twoMatchFlightTime" },
370 - { name: "预配航班号", value: "preplanFlightNo" },
371 - { name: "预配航班日期", value: "preplanFlightTime" },
372 - { name: "ACCS原航班号", value: "fltNoAccs" },
373 - { name: "ACCS原航班日期", value: "fltDateAccs" },
374 - { name: "ACCS原航线", value: "accsFlightRoute" },
375 - { name: "是否RDE手工录入", value: "manualRde" },
376 - { name: "是否自动", value: "cargoRulesStatus" },
377 - { name: "发件人账号", value: "shipperAccount" },
378 - { name: "发件公司中文名称", value: "shipperCompany" },
379 - { name: "始发地城市名称", value: "originCity" },
380 - { name: "收件地", value: "destinationSiteName" },
381 - { name: "尺寸", value: "sizeStr" },
382 { 306 {
307 + type: "selection",
308 + name: "",
309 + value: "",
310 + width: "50",
311 + align: "center",
312 + sorTable: false,
313 + slot: null,
314 + fixed:true,
315 + },
316 + {
317 + type: "index",
318 + name: "",
319 + value: "",
320 + width: "50",
321 + align: "center",
322 + sorTable: false,
323 + slot: null,
324 + fixed:false,
325 + },
326 + {
327 + type: "",
328 + name: "口岸代码",
329 + value: "portName",
330 + width: "150",
331 + align: "center",
332 + sorTable: true,
333 + slot: null,
334 + fixed:false,
335 + },
336 + {
337 + type: "",
338 + name: "取件日期",
339 + value: "pickUpDate",
340 + width: "150",
341 + align: "center",
342 + sorTable: true,
343 + slot: null,
344 + fixed:false,
345 + },
346 + {
347 + type: "",
348 + name: "取件扫描号",
349 + value: "pickUpScanNo",
350 + width: "150",
351 + align: "center",
352 + sorTable: true,
353 + slot: null,
354 + fixed:false,
355 + },
356 + {
357 + type: "",
358 + name: "站点",
359 + value: "siteName",
360 + width: "150",
361 + align: "center",
362 + sorTable: true,
363 + slot: null,
364 + fixed:false,
365 + },
366 + {
367 + type: "",
368 + name: "运单号",
369 + value: "waybillNo",
370 + width: "150",
371 + align: "center",
372 + sorTable: true,
373 + slot: null,
374 + fixed:false,
375 + },
376 + {
377 + type: "",
378 + name: "总单号",
379 + value: "totalWaybillNo",
380 + width: "150",
381 + align: "center",
382 + sorTable: true,
383 + slot: null,
384 + fixed:false,
385 + },
386 + {
387 + type: "",
388 + name: "服务类型",
389 + value: "serviceTypeName",
390 + width: "150",
391 + align: "center",
392 + sorTable: true,
393 + slot: null,
394 + fixed:false,
395 + },
396 + {
397 + type: "",
398 + name: "URSA",
399 + value: "ursa",
400 + width: "150",
401 + align: "center",
402 + sorTable: true,
403 + slot: null,
404 + fixed:false,
405 + },
406 + {
407 + type: "",
408 + name: "申报类型",
409 + value: "typeName",
410 + width: "150",
411 + align: "center",
412 + sorTable: true,
413 + slot: null,
414 + fixed:false,
415 + },
416 + {
417 + type: "",
418 + name: "HandlingCode",
419 + value: "handingCode",
420 + width: "150",
421 + align: "center",
422 + sorTable: true,
423 + slot: null,
424 + fixed:false,
425 + },
426 + {
427 + type: "",
428 + name: "subcategory",
429 + value: "subCategory",
430 + width: "150",
431 + align: "center",
432 + sorTable: true,
433 + slot: null,
434 + fixed:false,
435 + },
436 + {
437 + type: "",
438 + name: "件数",
439 + value: "qty",
440 + width: "150",
441 + align: "center",
442 + sorTable: true,
443 + slot: null,
444 + fixed:false,
445 + },
446 + {
447 + type: "",
448 + name: "实际重量",
449 + value: "actualWeight",
450 + width: "150",
451 + align: "center",
452 + sorTable: true,
453 + slot: null,
454 + fixed:false,
455 + },
456 + {
457 + type: "",
458 + name: "收件人国家代码",
459 + value: "consigneeCountry",
460 + width: "150",
461 + align: "center",
462 + sorTable: true,
463 + slot: null,
464 + fixed:false,
465 + },
466 + {
467 + type: "",
468 + name: "品名描述",
469 + value: "nameDescription",
470 + width: "150",
471 + align: "center",
472 + sorTable: false,
473 + slot: null,
474 + fixed:false,
475 + },
476 + {
477 + type: "",
478 + name: "海关回执状态",
479 + value: "customsReceiptStatusName",
480 + width: "150",
481 + align: "center",
482 + sorTable: true,
483 + slot: null,
484 + fixed:false,
485 + },
486 + {
487 + type: "",
488 + name: "预审状态",
489 + value: "preQualificationStatus",
490 + width: "150",
491 + align: "center",
492 + sorTable: true,
493 + slot: null,
494 + fixed:false,
495 + },
496 + {
497 + type: "",
498 + name: "航班预审意见",
499 + value: "caPretrialOpinion",
500 + width: "150",
501 + align: "center",
502 + sorTable: false,
503 + slot: null,
504 + fixed:false,
505 + },
506 + {
507 + type: "",
508 + name: "货物状态",
509 + value: "statusName",
510 + width: "150",
511 + align: "center",
512 + sorTable: true,
513 + slot: null,
514 + fixed:false,
515 + },
516 + {
517 + type: "",
518 + name: "终配航班号",
519 + value: "finalFlightNo",
520 + width: "150",
521 + align: "center",
522 + sorTable: true,
523 + slot: null,
524 + fixed:false,
525 + },
526 + {
527 + type: "",
528 + name: "终配航班日期",
529 + value: "finalFlightTime",
530 + width: "150",
531 + align: "center",
532 + sorTable: true,
533 + slot: null,
534 + fixed:false,
535 + },
536 + {
537 + type: "",
538 + name: "二配航班号",
539 + value: "twoMatchFlightNo",
540 + width: "150",
541 + align: "center",
542 + sorTable: true,
543 + slot: null,
544 + fixed:false,
545 + },
546 + {
547 + type: "",
548 + name: "二配航班日期",
549 + value: "twoMatchFlightTime",
550 + width: "150",
551 + align: "center",
552 + sorTable: true,
553 + slot: null,
554 + fixed:false,
555 + },
556 + {
557 + type: "",
558 + name: "预配航班号",
559 + value: "preplanFlightNo",
560 + width: "150",
561 + align: "center",
562 + sorTable: true,
563 + slot: null,
564 + fixed:false,
565 + },
566 + {
567 + type: "",
568 + name: "预配航班日期",
569 + value: "preplanFlightTime",
570 + width: "150",
571 + align: "center",
572 + sorTable: true,
573 + slot: null,
574 + fixed:false,
575 + },
576 + {
577 + type: "",
578 + name: "ACCS原航班号",
579 + value: "fltNoAccs",
580 + width: "150",
581 + align: "center",
582 + sorTable: true,
583 + slot: null,
584 + fixed:false,
585 + },
586 + {
587 + type: "",
588 + name: "ACCS原航班日期",
589 + value: "fltDateAccs",
590 + width: "150",
591 + align: "center",
592 + sorTable: true,
593 + slot: null,
594 + fixed:false,
595 + },
596 + {
597 + type: "",
598 + name: "ACCS原航线",
599 + value: "accsFlightRoute",
600 + width: "150",
601 + align: "center",
602 + sorTable: true,
603 + slot: null,
604 + fixed:false,
605 + },
606 + {
607 + type: "",
608 + name: "是否RDE手工录入",
609 + value: "manualRde",
610 + width: "170",
611 + align: "center",
612 + sorTable: true,
613 + slot: null,
614 + fixed:false,
615 + },
616 + {
617 + type: "",
618 + name: "是否自动",
619 + value: "cargoRulesStatus",
620 + width: "150",
621 + align: "center",
622 + sorTable: true,
623 + slot: null,
624 + fixed:false,
625 + },
626 + {
627 + type: "",
628 + name: "发件人账号",
629 + value: "shipperAccount",
630 + width: "150",
631 + align: "center",
632 + sorTable: false,
633 + slot: null,
634 + fixed:false,
635 + },
636 + {
637 + type: "",
638 + name: "发件公司中文名称",
639 + value: "shipperCompany",
640 + width: "150",
641 + align: "center",
642 + sorTable: false,
643 + slot: null,
644 + fixed:false,
645 + },
646 + {
647 + type: "",
648 + name: "始发地城市名称",
649 + value: "originCity",
650 + width: "150",
651 + align: "center",
652 + sorTable: false,
653 + slot: null,
654 + fixed:false,
655 + },
656 + {
657 + type: "",
658 + name: "收件地",
659 + value: "destinationSiteName",
660 + width: "150",
661 + align: "center",
662 + sorTable: false,
663 + slot: null,
664 + fixed:false,
665 + },
666 + {
667 + type: "",
668 + name: "尺寸",
669 + value: "sizeStr",
670 + width: "150",
671 + align: "center",
672 + sorTable: true,
673 + slot: null,
674 + fixed:false,
675 + },
676 + {
677 + type: "",
383 name: "大货预审意见（是否可以配置航班）", 678 name: "大货预审意见（是否可以配置航班）",
384 value: "bigPretrialOpinion", 679 value: "bigPretrialOpinion",
680 + width: "300",
681 + align: "center",
682 + sorTable: false,
683 + slot: null,
684 + fixed:false,
685 + },
686 + {
687 + type: "",
688 + name: "大货预审时间",
689 + value: "bigPretrialTime",
690 + width: "150",
691 + align: "center",
692 + sorTable: false,
693 + slot: null,
694 + fixed:false,
695 + },
696 + {
697 + type: "",
698 + name: "海关回执时间",
699 + value: "customsReceiptTime",
700 + width: "150",
701 + align: "center",
702 + sorTable: true,
703 + slot: null,
704 + fixed:false,
705 + },
706 + {
707 + type: "",
708 + name: "航班预审时间",
709 + value: "caPretrialTime",
710 + width: "150",
711 + align: "center",
712 + sorTable: true,
713 + slot: null,
714 + fixed:false,
715 + },
716 + {
717 + type: "",
718 + name: "创建人",
719 + value: "createUserName",
720 + width: "150",
721 + align: "center",
722 + sorTable: true,
723 + slot: null,
724 + fixed:false,
725 + },
726 + {
727 + type: "",
728 + name: "创建时间",
729 + value: "createTime",
730 + width: "150",
731 + align: "center",
732 + sorTable: true,
733 + slot: null,
734 + fixed:false,
385 }, 735 },
386 - { name: "大货预审时间", value: "bigPretrialTime" },
387 - { name: "海关回执时间", value: "customsReceiptTime" },
388 - { name: "航班预审时间", value: "caPretrialTime" },
389 - { name: "创建人", value: "createUserName" },
390 - { name: "创建时间", value: "createTime" },
391 ], //表头数据 736 ], //表头数据
392 findConditionData: {}, //货物查询条件 737 findConditionData: {}, //货物查询条件
393 tableData: [], //表格数据 738 tableData: [], //表格数据
394 allWeight: 0, 739 allWeight: 0,
395 allQty: 0, 740 allQty: 0,
396 shiftKey: false, 741 shiftKey: false,
397 - start: -1,
398 valueFormat: "yyyy-MM-dd", 742 valueFormat: "yyyy-MM-dd",
399 tableLoading: false, 743 tableLoading: false,
400 - downLoadingTip: { 744 + downLoadingTip:{
401 - tip: "", 745 + tip:"",
402 - downloading: false, 746 + downloading:false,
403 }, 747 },
404 totalCount: 0, 748 totalCount: 0,
405 selectTable: [], 749 selectTable: [],
406 flightTime: [], 750 flightTime: [],
407 prepalyFlightTime: [], 751 prepalyFlightTime: [],
408 - cargoPlaneTime: [], 752 + cargoPlaneTime:[],
409 createDate: [], 753 createDate: [],
410 limitStart: 1, 754 limitStart: 1,
411 limitSize: 100, //无限制-1 755 limitSize: 100, //无限制-1
412 - progress: 0, 756 + page:1,
413 - selecetALL: false, 757 + progress:0,
758 + formShow:false,
414 }; 759 };
415 }, 760 },
416 -
417 created() { 761 created() {
418 //查询条件 762 //查询条件
419 findConditionData().then((res) => { 763 findConditionData().then((res) => {
...@@ -450,46 +794,9 @@ export default { ...@@ -450,46 +794,9 @@ export default {
450 this.tableData = []; 794 this.tableData = [];
451 this.allWeight = 0; 795 this.allWeight = 0;
452 this.allQty = 0; 796 this.allQty = 0;
453 - this.checks();
454 this.tableLoading = true; 797 this.tableLoading = true;
455 - if ( 798 + this.dataInfo();
456 - this.formData.customsReceiptStatusId != null && 799 + findCargoData(this.formData).then((res) => {
457 - this.formData.customsReceiptStatusId.length < 1
458 - ) {
459 - this.formData.customsReceiptStatusId = null;
460 - }
461 - if (this.createDate != null && this.createDate.length > 0) {
462 - this.formData.createTimeStart = this.createDate[0];
463 - this.formData.createTimeEnd = this.createDate[1];
464 - } else {
465 - this.formData.createTimeStart = null;
466 - this.formData.createTimeEnd = null;
467 - }
468 - if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
469 - this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
470 - this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
471 - } else {
472 - this.formData.prematchFltDateStart = "";
473 - this.formData.prematchFltDateEnd = "";
474 - }
475 - if (this.flightTime != null && this.flightTime.length > 0) {
476 - this.formData.fltDateStart = this.flightTime[0];
477 - this.formData.fltDateEnd = this.flightTime[1];
478 - } else {
479 - this.formData.fltDateStart = "";
480 - this.formData.fltDateEnd = "";
481 - }
482 - if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) {
483 - this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
484 - this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
485 - } else {
486 - this.formData.cargoPlaneStart = null;
487 - this.formData.cargoPlaneEnd = null;
488 - }
489 - this.formData.limitStart = this.limitStart;
490 - this.formData.limitSize = this.limitSize;
491 - findCargoData(this.formData)
492 - .then((res) => {
493 if (res.code == 200) { 800 if (res.code == 200) {
494 if (res.data.list.length > 0) { 801 if (res.data.list.length > 0) {
495 this.tableData = res.data.list; 802 this.tableData = res.data.list;
...@@ -510,195 +817,135 @@ export default { ...@@ -510,195 +817,135 @@ export default {
510 }); 817 });
511 } 818 }
512 this.tableLoading = false; 819 this.tableLoading = false;
513 - }) 820 + }).catch(()=>{
514 - .catch(() => {
515 this.tableLoading = false; 821 this.tableLoading = false;
516 }); 822 });
823 + this.$refs.newTables.clearTable();
824 + this.cargoTotal();
517 }, 825 },
518 - //全选反选 826 + //数据初始化
519 - checks(rows) { 827 + dataInfo(){
520 - if (rows && !this.selecetALL) { 828 + if(this.formData.customsReceiptStatusId != null && this.formData.customsReceiptStatusId.length < 1){
521 - rows.forEach((row) => {
522 - this.$refs.cargoTable.toggleRowSelection(row);
523 - this.allQty = row.qty + this.allQty;
524 - this.allWeight = row.actualWeight + this.allWeight;
525 - });
526 - this.selecetALL = true;
527 - this.allWeight = this.allWeight.toFixed(1);
528 - this.allQty = this.allQty.toFixed(0);
529 - } else {
530 - this.$refs.cargoTable.clearSelection();
531 - this.allWeight = 0;
532 - this.allQty = 0;
533 - this.selecetALL = false;
534 - }
535 - },
536 - selectAll(selection) {
537 - if (selection.length > 0) {
538 - selection.forEach((item) => {
539 - this.allWeight = item.actualWeight + this.allWeight;
540 - this.allQty = item.qty + this.allQty;
541 - });
542 - this.allWeight = this.allWeight.toFixed(1);
543 - this.allQty = this.allQty.toFixed(0);
544 - } else {
545 - this.allWeight = 0;
546 - this.allQty = 0;
547 - }
548 - },
549 - //下一页
550 - nextClick() {
551 - this.limitStart = this.limitStart + 100;
552 - },
553 - //上一页
554 - prevClick() {
555 - this.limitStart = this.limitStart - 100;
556 - },
557 - //指定页数
558 - currentChange(page) {
559 - this.limitStart = (page - 1) * 100;
560 - this.select();
561 - },
562 - //表单项选中操作
563 - cheacked(sl, row) {
564 - let end = row.index;
565 - if (this.shiftKey) {
566 - const sum = Math.abs(this.start - end);
567 - const min = Math.min(this.start, end);
568 - let i;
569 - if (this.start === -1 && sl.includes(this.tableData[row.index])) {
570 - for (i = 0; i < sum; i++) {
571 - this.$refs.cargoTable.toggleRowSelection(this.tableData[i], true);
572 - this.selectTable.push(this.tableData[i]);
573 - }
574 - } else if (sl.includes(this.tableData[row.index])) {
575 - for (i = this.start + 1; i <= end; i++) {
576 - this.$refs.cargoTable.toggleRowSelection(this.tableData[i], true);
577 - this.selectTable.push(this.tableData[i]);
578 - }
579 - } else if (!sl.includes(this.tableData[row.index])) {
580 - this.selectTable.splice(end - 1, sum + 1);
581 - for (i = end; i <= this.start; i++) {
582 - this.$refs.cargoTable.toggleRowSelection(this.tableData[i], false);
583 - }
584 - }
585 - this.start = end;
586 - } else {
587 - this.start = end;
588 - if (sl.includes(this.tableData[end])) {
589 - this.selectTable.push(row);
590 - } else {
591 - for (let i = 0; i < this.selectTable.length; i++) {
592 - if (this.selectTable[i].index == row.index) {
593 - this.selectTable.splice(i, 1);
594 - }
595 - }
596 - }
597 - }
598 -
599 - this.allWeight = 0;
600 - this.allQty = 0;
601 - for (let i = 0; i < this.selectTable.length; i++) {
602 - this.allWeight = this.allWeight + this.selectTable[i].actualWeight;
603 - this.allQty = this.allQty + this.selectTable[i].qty;
604 - }
605 - this.allQty = this.allQty.toFixed();
606 - this.allWeight = this.allWeight.toFixed(2);
607 - },
608 - // 导出表格
609 - xlse(page) {
610 - this.progress = 1;
611 - this.downLoadingTip.downloading = true;
612 - let cargoXlse = { title: "货物导出表", cargoConditionDto: {} };
613 - if (
614 - this.formData.customsReceiptStatusId != null &&
615 - this.formData.customsReceiptStatusId.length < 1
616 - ) {
617 this.formData.customsReceiptStatusId = null; 829 this.formData.customsReceiptStatusId = null;
618 } 830 }
619 if (this.createDate != null && this.createDate.length > 0) { 831 if (this.createDate != null && this.createDate.length > 0) {
620 this.formData.createTimeStart = this.createDate[0]; 832 this.formData.createTimeStart = this.createDate[0];
621 this.formData.createTimeEnd = this.createDate[1]; 833 this.formData.createTimeEnd = this.createDate[1];
622 - } else { 834 + }else{
623 this.formData.createTimeStart = null; 835 this.formData.createTimeStart = null;
624 this.formData.createTimeEnd = null; 836 this.formData.createTimeEnd = null;
625 } 837 }
626 if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) { 838 if (this.prepalyFlightTime != null && this.prepalyFlightTime.length > 0) {
627 this.formData.prematchFltDateStart = this.prepalyFlightTime[0]; 839 this.formData.prematchFltDateStart = this.prepalyFlightTime[0];
628 this.formData.prematchFltDateEnd = this.prepalyFlightTime[1]; 840 this.formData.prematchFltDateEnd = this.prepalyFlightTime[1];
629 - } else { 841 + }else{
630 - this.formData.prematchFltDateStart = ""; 842 + this.formData.prematchFltDateStart ="";
631 this.formData.prematchFltDateEnd = ""; 843 this.formData.prematchFltDateEnd = "";
632 } 844 }
633 if (this.flightTime != null && this.flightTime.length > 0) { 845 if (this.flightTime != null && this.flightTime.length > 0) {
634 this.formData.fltDateStart = this.flightTime[0]; 846 this.formData.fltDateStart = this.flightTime[0];
635 this.formData.fltDateEnd = this.flightTime[1]; 847 this.formData.fltDateEnd = this.flightTime[1];
636 - } else { 848 + }else{
637 this.formData.fltDateStart = ""; 849 this.formData.fltDateStart = "";
638 this.formData.fltDateEnd = ""; 850 this.formData.fltDateEnd = "";
639 } 851 }
640 - if (this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0) { 852 + if(this.cargoPlaneTime != null && this.cargoPlaneTime.length > 0){
641 this.formData.cargoPlaneStart = this.cargoPlaneTime[0]; 853 this.formData.cargoPlaneStart = this.cargoPlaneTime[0];
642 this.formData.cargoPlaneEnd = this.cargoPlaneTime[1]; 854 this.formData.cargoPlaneEnd = this.cargoPlaneTime[1];
643 - } else { 855 + }else{
644 this.formData.cargoPlaneStart = null; 856 this.formData.cargoPlaneStart = null;
645 this.formData.cargoPlaneEnd = null; 857 this.formData.cargoPlaneEnd = null;
646 } 858 }
859 + },
860 + //总和
861 + cargoTotal(){
862 + this.allWeight = 0;
863 + this.allQty = 0;
864 + if(this.selectTable.length > 0){
865 + this.selectTable.forEach(item=>{
866 + this.allWeight = this.allWeight + item.actualWeight;
867 + this.allQty = this.allQty + item.qty;
868 + })
869 + this.allWeight = this.allWeight.toFixed(2);
870 + this.allQty = this.allQty.toFixed();
871 + }
872 + },
873 + //表格多选
874 + tableSelect(val){
875 + this.selectTable = val.selection;
876 + this.cargoTotal();
877 + },
878 + //表格全选
879 + tableSelectAll(val){
880 + this.selectTable = val;
881 + this.cargoTotal();
882 + },
883 + //分页
884 + currentChange(val){
885 + this.formData.limitStart = val.start;
886 + this.page = val.page;
887 + this.select()
888 + },
889 + //排序
890 + sortChange(val){
891 + let data = []
892 + let nullData = []
893 + this.tableData.forEach(item=>{
894 + if(item[val.prop]){
895 + data.push(item)
896 + }else{
897 + nullData.push(item)
898 + }
899 + })
900 + data = data.sort(this.$refs.newTables.compare(val.prop,val.order))
901 + if(val.order != "ascending"){
902 + this.tableData = nullData.concat(data)
903 + }else{
904 + this.tableData = data.concat(nullData)
905 + }
906 + },
907 + // 导出表格
908 + xlse(page) {
909 + this.progress = 1;
910 + this.downLoadingTip.downloading = true;
911 + let cargoXlse = {title:"货物导出表",cargoConditionDto:{}};
912 + this.dataInfo();
647 cargoXlse.cargoConditionDto = this.formData; 913 cargoXlse.cargoConditionDto = this.formData;
648 cargoXlse.cargoConditionDto.limitSize = this.limitSize; 914 cargoXlse.cargoConditionDto.limitSize = this.limitSize;
649 915
650 if (page == 0) { 916 if (page == 0) {
651 - this.downLoadingTip.tip = "正在导出本页结果集"; 917 + this.downLoadingTip.tip = "正在导出本页结果集"
652 cargoXlse.cargoConditionDto.limitStart = this.limitStart; 918 cargoXlse.cargoConditionDto.limitStart = this.limitStart;
653 - downLoadXlsx("/cargo/excel", cargoXlse, "货物查询表") 919 + downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
654 - .then(() => { 920 + this.downLoadingTip.downloading = false;
655 - this.downLoadingTip.downloading = false; 921 + this.downLoadingTip.tip = ""
656 - this.downLoadingTip.tip = ""; 922 + this.progress = 100;
657 - this.progress = 100; 923 + }).catch(()=>{
658 - }) 924 + this.downLoadingTip.downloading = false;
659 - .catch(() => { 925 + this.downLoadingTip.tip = "";
660 - this.downLoadingTip.downloading = false; 926 + })
661 - this.downLoadingTip.tip = "";
662 - });
663 } else { 927 } else {
664 - if (this.totalCount < 80000) { 928 + if(this.totalCount < 80000){
665 - this.downLoadingTip.tip = "正在导出全部结果集"; 929 + this.downLoadingTip.tip = "正在导出全部结果集请耐心等待"
666 cargoXlse.cargoConditionDto.limitStart = 0; 930 cargoXlse.cargoConditionDto.limitStart = 0;
667 cargoXlse.cargoConditionDto.limitSize = -1; 931 cargoXlse.cargoConditionDto.limitSize = -1;
668 - downLoadXlsx("/cargo/excel", cargoXlse, "货物查询表") 932 + downLoadXlsx("/cargo/excel",cargoXlse,"货物表").then(()=>{
669 - .then(() => { 933 + this.downLoadingTip.downloading = false;
670 - this.downLoadingTip.downloading = false; 934 + this.downLoadingTip.tip = ""
671 - this.downLoadingTip.tip = ""; 935 + this.progress = 100;
672 - this.progress = 100; 936 + }).catch(()=>{
673 - }) 937 + this.downLoadingTip.downloading = false;
674 - .catch(() => { 938 + this.downLoadingTip.tip = ""
675 - this.downLoadingTip.downloading = false; 939 + })
676 - this.downLoadingTip.tip = ""; 940 + }else{
677 - });
678 - } else {
679 this.downLoadingTip.downloading = false; 941 this.downLoadingTip.downloading = false;
680 this.$message({ 942 this.$message({
681 - message: "数据量过大无法导出", 943 + message: "导出数据量过大，请不要超过8万条",
682 type: "warning", 944 type: "warning",
683 }); 945 });
684 } 946 }
685 } 947 }
686 }, 948 },
687 - //排序
688 - sortChange() {
689 - this.tableData.sort();
690 - },
691 - //表格格式化
692 - formatter(row, column, cellValue, index) {
693 - if (column.property == "cargoRulesStatus") {
694 - if (cellValue == 1) {
695 - return (cellValue = "手动");
696 - } else if (cellValue == 2) {
697 - return (cellValue = "自动");
698 - }
699 - }
700 - return cellValue;
701 - },
702 }, 949 },
703 computed: { 950 computed: {
704 fltNo: { 951 fltNo: {
...@@ -725,14 +972,14 @@ export default { ...@@ -725,14 +972,14 @@ export default {
725 this.formData.ursa = upCase(val); 972 this.formData.ursa = upCase(val);
726 }, 973 },
727 }, 974 },
728 - cargoPlaneNo: { 975 + cargoPlaneNo:{
729 get: function () { 976 get: function () {
730 return this.formData.cargoPlaneNo; 977 return this.formData.cargoPlaneNo;
731 }, 978 },
732 set: function (val) { 979 set: function (val) {
733 this.formData.cargoPlaneNo = upCase(val); 980 this.formData.cargoPlaneNo = upCase(val);
734 }, 981 },
735 - }, 982 + }
736 }, 983 },
737 }; 984 };
738 </script> 985 </script>
...@@ -745,19 +992,19 @@ export default { ...@@ -745,19 +992,19 @@ export default {
745 margin-top: 10px; 992 margin-top: 10px;
746 margin-left: 50px; 993 margin-left: 50px;
747 } 994 }
748 -.progress { 995 +.progress{
749 - width: 200px; 996 + width:200px;
750 display: inline-block; 997 display: inline-block;
751 - margin: 0 0 0 20px; 998 + margin:0 0 0 20px;
752 } 999 }
753 -.formShow { 1000 +.formShow{
754 width: max-content; 1001 width: max-content;
755 - height: 48px; 1002 + height:48px;
756 line-height: 48px; 1003 line-height: 48px;
757 font-weight: 900; 1004 font-weight: 900;
758 color: rgb(64, 158, 255); 1005 color: rgb(64, 158, 255);
759 font-size: 14px; 1006 font-size: 14px;
760 float: right; 1007 float: right;
761 - margin-right: 20px; 1008 + margin-right:20px;
762 } 1009 }
763 </style> 1010 </style>
...\ No newline at end of file ...\ No newline at end of file
......