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 138 additions and 93 deletions
......@@ -26,6 +26,14 @@ export function findFltById(data) {
})
}
//删除航班
export function delFlight(data) {
return request({
url: '/FlightPreserveController/delFlight/'+ data,
method: 'post'
})
}
//新增修改
export function saveOrUpdate(data) {
return request({
......
<?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
<?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
<?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
......
<?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
<?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
var en = {
"common": {
"risk": "risk",
"exit": "exit",
"index":"index"
}
}
export default en
var zh = {
"common": {
"risk": "风险",
"exit": "退出",
"index":"首页"
}
}
export default zh
......@@ -229,6 +229,7 @@ export default {
if (this.shiftKey) {
const sum = Math.abs(this.start - end);
const min = Math.min(this.start, end);
const max = Math.max(this.start, end);
let i;
if (this.start === -1 && selection.includes(this.data[row.index])) {
for (i = 0; i < sum; i++) {
......@@ -238,15 +239,19 @@ export default {
} else if (selection.includes(this.data[row.index])) {
if (!selection.includes(this.data[this.start])) {
this.$refs.tables.toggleRowSelection(this.data[this.start], true);
this.selectTable.push(this.data[this.start]);
if(this.selectTable.includes(this.data[this.start])){
this.selectTable.push(this.data[this.start]);
}
}
for (i = this.start + 1; i <= this.start + sum; i++) {
for (i = min; i <= sum + min; i++) {
this.$refs.tables.toggleRowSelection(this.data[i], true);
this.selectTable.push(this.data[i]);
if(!this.selectTable.includes(this.data[i])){
this.selectTable.push(this.data[i]);
}
}
} else if (!selection.includes(this.data[row.index])) {
this.selectTable.splice(end - 1, sum + 1);
for (i = end; i <= this.start; i++) {
this.selectTable.splice(min > 1 ? min - 2 : min, sum + 1);
for (i = min; i <= max; i++) {
this.$refs.tables.toggleRowSelection(this.data[i], false);
}
}
......@@ -254,7 +259,7 @@ export default {
} else {
this.start = end;
if (selection.includes(this.data[end])) {
this.selectTable.push(row);
this.selectTable = selection;
} else {
for (let i = 0; i < this.selectTable.length; i++) {
if (this.selectTable[i].index == row.index) {
......@@ -263,10 +268,11 @@ export default {
}
}
}
selection = this.selectTable;
selection = this.selectTable.sort(this.compare('index','ascending'));
this.$emit("tableSelect", { selection, row });
},
tableSelectAll(selection) {
this.selectTable = selection;
this.$emit("tableSelectAll", selection);
},
SelectChange(selection) {
......@@ -289,7 +295,7 @@ export default {
// console.log(val);
// },
sortChange({ column, prop, order }) {
this.$emit("sortChange",{prop:prop, order:order})
this.$emit("sortChange", { prop: prop, order: order });
},
compare(propertyName, sort) {
return function (obj1, obj2) {
......
......@@ -66,20 +66,6 @@ export const constantRoutes = [
}
]
},
// {
// path: '/user',
// component: Layout,
// hidden: true,
// redirect: 'noredirect',
// children: [
// {
// path: 'profile',
// component: (resolve) => require(['@/views/systemConfig/userConfig/profile/index'], resolve),
// name: 'Profile',
// meta: { title: '个人中心', icon: 'user' }
// }
// ]
// },
{
path: '/',
component: Layout,
......@@ -89,13 +75,13 @@ export const constantRoutes = [
{
path: '/flightAllocConfig/:handle/:id',
component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
name: 'flightAllocConfigInfo',
name: 'FlightAllocConfigInfo',
meta: { title: '航班配舱', icon: 'user', breadcrumb: true }
},
{
path: '/flightAllocConfig/:handle',
component: (resolve) => require(['@/views/allocationConfig/flightAllocConfig/info'], resolve),
name: 'flightAllocConfigAdd',
name: 'FlightAllocConfigInfo',
meta: { title: '添加航班配舱', icon: 'user', breadcrumb: false }
}
]
......
......@@ -42,5 +42,5 @@ module.exports = {
/**
* 版本号
*/
version:'version：0.5.7'
version:'version：0.5.7.2'
}
......
......@@ -231,7 +231,9 @@
<el-form-item label="Handling Code">
<el-empty
description="暂无数据"
v-if="!selectData.HandlingCode || selectData.HandlingCode.length == 0"
v-if="
!selectData.HandlingCode || selectData.HandlingCode.length == 0
"
></el-empty>
<el-checkbox-group v-model="handingCodes" v-else>
<el-checkbox
......@@ -247,7 +249,9 @@
<el-form-item label="Sub Category">
<el-empty
description="暂无数据"
v-if="!selectData.SubCategory || selectData.SubCategory.length == 0"
v-if="
!selectData.SubCategory || selectData.SubCategory.length == 0
"
></el-empty>
<el-checkbox-group v-model="subCategorys" v-else>
<el-checkbox
......@@ -334,7 +338,7 @@ import { downLoadXlsx } from "@/utils/zipdownload";
import { upCase } from "@/utils/FedEx";
export default {
name:"CargoAllocation",
name: "CargoAllocation",
components: {
Dialog,
},
......@@ -344,7 +348,7 @@ export default {
fltDateStart: null,
fltDateEnd: null,
typeId: null,
portName:null,
portName: null,
statusId: null,
kindToAllocFlightId: null,
serviceTypeId: null,
......@@ -854,18 +858,20 @@ export default {
} else {
reject(res.msg);
}
resolve(obj)
resolve(obj);
})
.catch(() => {});
this.select();
}).then(res=>{
this.selectData = res
}).catch((err) => {
this.$message({
message: "查询条件不存在",
type: "warning",
})
.then((res) => {
this.selectData = res;
})
.catch((err) => {
this.$message({
message: "查询条件不存在",
type: "warning",
});
});
});
},
mounted() {
window.addEventListener("keydown", (code) => {
......@@ -1015,29 +1021,27 @@ export default {
this.select();
},
//排序
sortChange(val){
this.tableData.sort(this.$refs.newTables.compare(val.prop,val.order));
},
//添加到航班
addFit() {
let open = true;
this.tableSelection.forEach((item) => {
if (item.statusId != 107966) {
open = false;
sortChange(val) {
let data = [];
let nullData = [];
this.tableData.forEach((item) => {
if (item[val.prop]) {
data.push(item);
} else {
nullData.push(item);
}
});
if (open) {
this.dialogVisible = open;
data = data.sort(this.$refs.newTables.compare(val.prop, val.order));
if (val.order != "ascending") {
this.tableData = nullData.concat(data);
} else {
this.$message({
message: "包含不可手动配舱货物",
type: "warning",
});
this.tableSelection = [];
this.cargoTotal();
this.$refs.newTables.clearTable();
this.tableData = data.concat(nullData);
}
},
//添加到航班
addFit() {
this.dialogVisible = true;
},
//关闭弹框
dialogBeforeClose(val) {
this.dialogVisible = val.close;
......
......@@ -8,7 +8,7 @@
>
<el-form-item label="航班号">
<el-input
v-model.trim="queryParams.purposeOfFlightNo"
v-model.trim="purposeOfFlightNo"
placeholder="航班号"
@keyup.enter.native="getList"
></el-input>
......@@ -34,7 +34,7 @@
type="primary"
icon="el-icon-plus"
size="mini"
@click="$router.push({ name: 'flightAllocConfigAdd', params: { handle: 'add' } })"
@click="$router.push({ name: 'FlightAllocConfigInfo', params: { handle: 'add' } })"
>添加</el-button
>
<el-table :data="flyList" v-loading="loading" size="small">
......@@ -169,7 +169,7 @@ export default {
//跳转到查看，修改页面
handleClick(flightiId, handle) {
this.$router.push({
name: "flightAllocConfigInfo",
name: "FlightAllocConfigInfo",
params: { handle: handle, id: flightiId },
});
},
......@@ -218,6 +218,16 @@ export default {
},
created() {
this.getList();
},
computed:{
purposeOfFlightNo: {
get: function () {
return this.queryParams.purposeOfFlightNo;
},
set: function (val) {
this.queryParams.purposeOfFlightNo = val.toUpperCase()
},
},
}
};
</script>
......
......@@ -277,6 +277,7 @@ import {
} from "@/api/destinationFlight";
export default {
name:"",
data() {
return {
form: {
......@@ -355,6 +356,7 @@ export default {
this.formHandlingCode = this.form.handlingCode;
this.formSubCategory = this.form.subCategory;
this.form.isNeedRequired = this.isNeedRequired;
this.form.purposeOfFlightNo = this.form.purposeOfFlightNo.toUpperCase();
if (this.isLocation == 1) {
this.form.notLocation = "";
} else {
......
......@@ -237,7 +237,7 @@
//跳转到查看，修改页面
handleClick(flightiId, handle) {
this.$router.push({
name: "flightAllocConfigInfo",
name: "FlightAllocConfigInfo",
params: {
handle: handle,
id: flightiId
......
......@@ -51,8 +51,11 @@
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">搜索</el-button>
<el-button icon="el-icon-refresh" size="mini" @click="resetQuery">重置</el-button>
<el-button type="primary" icon="el-icon-plus" size="mini" @click="handleAdd">新增</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" :disabled="multiple" @click="handleDelete">删除
</el-button>
<el-button type="primary" icon="el-icon-circle-check" size="mini" @click="handleFlightStatus('flightStatus10')">自动配舱开启</el-button>
<el-button type="primary" icon="el-icon-circle-close" size="mini" @click="handleFlightStatus('flightStatus80')">自动配舱关闭</el-button>
</el-form>
<!-- <el-row :gutter="10" class="mb8">
<el-col :span="1.5">
......@@ -112,7 +115,7 @@
class-name="small-padding fixed-width" width="130" fixed="right">
<template slot-scope="scope">
<el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)">修改</el-button>
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDeleteorPlayorpause(scope.row,0,'删除')">
<!-- <el-button size="mini" type="text" icon="el-icon-delete" @click="handleDelete(scope.row,'删除')">
删除</el-button> -->
</template>
</el-table-column>
......@@ -264,10 +267,19 @@
<el-button @click="cancel">取 消</el-button>
</div>
</el-dialog>
<el-dialog title="未删除成功航班" width="40%" center :visible.sync="dialogTableVisible">
<el-table :data="gridData">
<el-table-column property="fltNo" label="航班号" width="150"></el-table-column>
<el-table-column property="fltDate" label="航班日期" width="200"></el-table-column>
<el-table-column property="alloctedWeight" label="已配重量" width="200"></el-table-column>
</el-table>
</el-dialog>
</div>
</template>
<script>
import {
delFlight,
findFltConditionDataApi,
findAllFltDataApi,
findFltById,
......@@ -280,6 +292,8 @@
name: "FlightInformationMaintenance",
data() {
return {
gridData:[],
dialogTableVisible: false,
//高价百分比是否打开
ishighPriceWeightPercent:true,
//form属性禁用状态
......@@ -624,40 +638,34 @@
});
},
/** 删除 启用 停用按钮操作 */
handleDeleteorPlayorpause(row, status, statusText) {
//删除前需要停用
if (status === 0 && row.status != '3') {
this.$message({
message: '请停用后删除',
type: 'warning'
});
return;
}
this.$confirm('是否确认' + statusText + '此数据项?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
let disable = {
id: row.id,
status: status
};
/** 删除按钮操作 */
handleDelete(row) {
const fIds =this.ids;
this.$confirm('是否确认删除所选数据?', "警告", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning"
}).then(function() {
return delFlight(fIds);
}).then(response => {
this.findAllFltData();
if(response.data.length>0){
this.gridData=response.data;
this.$confirm(response.msg, '提示', {
confirmButtonText: '查看删除失败航班信息',
cancelButtonText: '取消',
type: 'warning',
center: true
}).then(() => {
this.dialogTableVisible=true;
}).catch(function() { });
return delOrEnableORDisableApi(disable);
}).then(response => {
if (response.code == 200) {
this.findAllFltData();
this.msgSuccess(statusText + "成功");
} else {
this.msgError(response.msg);
}
}else{
this.msgSuccess(response.msg);
}
}).catch(function() {});
},
}).catch(function() {});
},
/** 提交按钮 */
submitForm: function() {
this.$refs["form"].validate(valid => {
......