Fedex / imac-vue

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

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

Expand all
Inline Side-by-side
Showing 16 changed files with 125 additions and 80 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);
242 + if(this.selectTable.includes(this.data[this.start])){
241 this.selectTable.push(this.data[this.start]); 243 this.selectTable.push(this.data[this.start]);
242 } 244 }
243 - for (i = this.start + 1; i <= this.start + sum; i++) { 245 + }
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);
248 + if(!this.selectTable.includes(this.data[i])){
245 this.selectTable.push(this.data[i]); 249 this.selectTable.push(this.data[i]);
246 } 250 }
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,13 +858,15 @@ export default { ...@@ -854,13 +858,15 @@ 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;
868 + })
869 + .catch((err) => {
864 this.$message({ 870 this.$message({
865 message: "查询条件不存在", 871 message: "查询条件不存在",
866 type: "warning", 872 type: "warning",
...@@ -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') {
632 - this.$message({
633 - message: '请停用后删除',
634 - type: 'warning'
635 - });
636 - return;
637 - }
638 -
639 - this.$confirm('是否确认' + statusText + '此数据项?', "警告", {
640 confirmButtonText: "确定", 645 confirmButtonText: "确定",
641 cancelButtonText: "取消", 646 cancelButtonText: "取消",
642 type: "warning" 647 type: "warning"
643 }).then(function() { 648 }).then(function() {
644 - 649 + return delFlight(fIds);
645 - let disable = {
646 - id: row.id,
647 - status: status
648 - };
649 -
650 - return delOrEnableORDisableApi(disable);
651 }).then(response => { 650 }).then(response => {
652 - if (response.code == 200) {
653 this.findAllFltData(); 651 this.findAllFltData();
654 - this.msgSuccess(statusText + "成功"); 652 + if(response.data.length>0){
655 - } else { 653 + this.gridData=response.data;
656 - this.msgError(response.msg); 654 + this.$confirm(response.msg, '提示', {
657 - } 655 + confirmButtonText: '查看删除失败航班信息',
656 + cancelButtonText: '取消',
657 + type: 'warning',
658 + center: true
659 + }).then(() => {
660 + this.dialogTableVisible=true;
661 + }).catch(function() { });
658 662
663 + }else{
664 + this.msgSuccess(response.msg);
665 + }
659 }).catch(function() {}); 666 }).catch(function() {});
660 }, 667 },
668 +
661 /** 提交按钮 */ 669 /** 提交按钮 */
662 submitForm: function() { 670 submitForm: function() {
663 this.$refs["form"].validate(valid => { 671 this.$refs["form"].validate(valid => {
......