Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
9d2f21a8 1 parent 1cb3f4f7

version:0.5.6,bug修复，手动配舱排序增加，查询条件增加，配舱高地价限制增加

Expand all
Inline Side-by-side
Showing 9 changed files with 121 additions and 97 deletions
......@@ -45,3 +45,11 @@ export function findFltCommonConf(data) {
})
}
export function updateStatusBatch(data){
return request({
url: '/FlightPreserveController/updateStatusBatch',
method: 'post',
data: data
})
}
......
let ductLabels = {
"cargoRulesStatus":{
"1":"自动",
"2":"手动"
"1":"手动",
"2":"自动"
}
}
......
......@@ -30,8 +30,8 @@
:fixed="item.fixed"
:show-overflow-tooltip="showOverflowTooltip"
:sortable="item.sorTable"
header-align="center"
:formatter="formatter"
header-align="center"
:slotHeader="slotHeader"
:key="index"
>
......@@ -188,7 +188,6 @@ export default {
this.newHeader = this.headerData;
},
mounted() {
},
methods: {
nextClick() {
......@@ -218,7 +217,11 @@ export default {
this.selectTable.push(this.data[i]);
}
} else if (selection.includes(this.data[row.index])) {
for (i = this.start + 1; i <= end; i++) {
if(!selection.includes(this.data[this.start])){
this.$refs.tables.toggleRowSelection(this.data[this.start], true);
this.selectTable.push(this.data[this.start]);
}
for (i = this.start+1; i <= this.start+sum; i++) {
this.$refs.tables.toggleRowSelection(this.data[i], true);
this.selectTable.push(this.data[i]);
}
......@@ -254,7 +257,9 @@ export default {
this.selectTable = []
this.$refs.tables.clearSelection()
},
// itemChange(val) {},
itemChange(val) {
console.log(val)
},
// checkChange(val) {
// console.log(val);
// },
......
......@@ -38,11 +38,11 @@ export const constantRoutes = [
}
]
},
{
path: '/login',
component: (resolve) => require(['@/views/login'], resolve),
hidden: true
},
// {
// path: '/login',
// component: (resolve) => require(['@/views/login'], resolve),
// hidden: true
// },
{
path: '/404',
component: (resolve) => require(['@/views/error/404'], resolve),
......@@ -66,20 +66,20 @@ 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: '/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,
......
......@@ -42,5 +42,5 @@ module.exports = {
/**
* 版本号
*/
version:'version：0.5.5.3'
version:'version：0.5.6'
}
......
......@@ -67,7 +67,7 @@
<script>
import { allocationFlight } from "@/api/cargoSelect";
import { MessageBox } from 'element-ui'
import { MessageBox } from "element-ui";
export default {
props: {
dialogVisible: {
......@@ -82,10 +82,10 @@ export default {
data() {
return {
formData: {
ids:[],
ids: [],
fltNo: undefined,
fltDate:undefined,
overweight:false
fltDate: undefined,
overweight: false,
},
cargoHeader: [
{ name: "口岸代码", value: "portName" },
......@@ -96,101 +96,101 @@ export default {
{ name: "URSA", value: "ursa" },
{ name: "实际重量", value: "actualWeight" },
{ name: "件数", value: "qty" },
{ name: "ACCS原航班号", value: "fltNoAccs" },
{ name: "ACCS原航班日期", value: "fltDateAccs" },
{ name: "品名描述", value: "nameDescription" },
{ name: "是否自动", value: "cargoRulesStatus" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
],
fltHeader: [
{ name: "航班日期", value: "fltDate" },
{ name: "航班号", value: "fltNo" },
{ name: "航班路线", value: "route" },
{ name: "航班类型", value: "typeName" },
{ name: "总重量", value: "totalWeight" },
{ name: "额外增重百分比", value: "extraWeightPercent" },
{ name: "已配重量", value: "alloctedWeight" },
{ name: "配舱优先级", value: "priorityRuleName" },
{ name: "是否开启高地价", value: "highLowPriceFlg" },
{ name: "航班起飞时间", value: "takeOffTime" },
{ name: "创建人", value: "createUserName" },
{ name: "创建时间", value: "createTime" },
],
rules:{
fltNo: [{
rules: {
fltNo: [
{
required: true,
message: "航班号不能为空",
trigger: "blur"
}],
fltDate: [{
trigger: "blur",
},
],
fltDate: [
{
required: true,
message: "航班日期不能为空",
trigger: "change"
}],
}
trigger: "change",
},
],
},
};
},
methods: {
cleaerForm(){
this.formData={
ids:[],
cleaerForm() {
this.formData = {
ids: [],
fltNo: undefined,
fltDate:undefined,
overweight:false
}
fltDate: undefined,
overweight: false,
};
},
//确定配舱
submit() {
let arr = [];
this.tableData.forEach(item => {
arr.push(item.id)
this.tableData.forEach((item) => {
arr.push(item.id);
});
this.formData.ids = arr;
if(this.formData.fltNo && this.formData.fltDate){
allocationFlight(this.formData).then(res=>{//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
if(res.code === 200){
if (this.formData.fltNo && this.formData.fltDate) {
allocationFlight(this.formData).then((res) => {
//code 200 配舱成功 601 重量已满需要确认 其余code直接输出msg
if (res.code === 200) {
this.$message({
message: "货物配舱成功",
type: "success",
});
}else if(res.code === 202){
MessageBox.confirm('航班配重已满，是否继续配舱？', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
}
).then(() => {
this.formData.overweight = true;//确定继续overweight变为true再次请求接口
allocationFlight(this.formData).then(res=>{
if(res.code === 200){
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
} else if (res.code === 202) {
MessageBox.confirm(res.msg, "提示", {
confirmButtonText: "确定",
cancelButtonText: "取消",
type: "warning",
})
.then(() => {
this.formData.overweight = true; //确定继续overweight变为true再次请求接口
allocationFlight(this.formData).then((res) => {
if (res.code === 200) {
this.$message({
message: "货物配舱成功",
type: "success",
});
}else{
} else {
this.$message({
message: res.msg,
type: "warning",
});
}
});
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: true });
})
this.cleaerForm()
this.$emit("dialogBeforeClose", {close:false,reload:true});
}).catch(() => {//取消 取消当前配舱
.catch(() => {
//取消 取消当前配舱
this.$message({
message: "配舱已取消",
type: "success",
});
this.cleaerForm()
this.$emit("dialogBeforeClose", {close:false,reload:false});
this.cleaerForm();
this.$emit("dialogBeforeClose", {
close: false,
reload: false,
});
});
}else{
} else {
this.$message({
message: res.msg,
type: "warning",
});
}
})
}else{
});
} else {
this.$message({
message: "航班号或航班日期不能为空",
type: "warning",
......@@ -198,8 +198,8 @@ export default {
}
},
dialogBeforeClose() {
this.cleaerForm()
this.$emit("dialogBeforeClose", {close:false,reload:false});
this.cleaerForm();
this.$emit("dialogBeforeClose", { close: false, reload: false });
},
},
computed: {
......
<template>
<div class="app-container">
<div>
<el-form class="form-header" :model="queryParams" ref="queryForm" label-position="right" label-width="auto" size="medium">
<el-row>
<el-col :span="6">
......@@ -51,8 +51,8 @@
<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="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-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">
......@@ -178,14 +178,14 @@
<el-col :span="12">
<el-form-item label="原始重量（KG）" prop="originalWeight">
<el-input-number @change="LowHighAvailable" placeholder="请输入原始重量（KG）" style="width:93%"
v-model="form.originalWeight" :precision="2"></el-input-number>
v-model="form.originalWeight"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="额外增重百分比" prop="extraWeightPercent">
<el-input-number @change="LowHighAvailable" placeholder="请输入额外增重百分比" style="width:93%"
v-model="form.extraWeightPercent" :precision="2"></el-input-number>
v-model="form.extraWeightPercent"></el-input-number>
</el-form-item>
</el-col>
......@@ -207,14 +207,14 @@
<el-col :span="12">
<el-form-item label="高价百分比" prop="highPriceWeightPercent">
<el-input-number :disabled="ishighPriceWeightPercent" @change="LowHighAvailable" placeholder="请输入高价百分比" style="width:93%"
v-model="form.highPriceWeightPercent" :precision="2"></el-input-number>
v-model="form.highPriceWeightPercent"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低价百分比" prop="lowPriceWeightPercent">
<el-input-number :disabled="true" placeholder="请输入低价百分比" style="width:93%"
v-model="form.lowPriceWeightPercent" :precision="2"></el-input-number>
v-model="form.lowPriceWeightPercent"></el-input-number>
</el-form-item>
</el-col>
......@@ -541,7 +541,6 @@
},
//计算高地价可配
LowHighAvailable() {
//判断是否开启高地价
if (this.form.highLowPriceFlg) {
this.ishighPriceWeightPercent=false;
......@@ -556,21 +555,33 @@
this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
.highPriceWeightPercent / 100));
// this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
} else {
}else if(this.title == "修改航班信息" && this.form.highPriceWeightPercent > 0){
if(this.form.highAvailableWeight){
this.$set(this.form, 'highAvailableWeight', this.form.highAvailableWeight)
}else{
this.$set(this.form, "highAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
.highPriceWeightPercent / 100));
}
}else {
this.$set(this.form, "highAvailableWeight", 0);
// this.form.HighAvailableWeight = 0;
}
//低价可配
if (this.form.lowPriceWeightPercent > 0) {
this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
.highAvailableWeight);
//this.form.lowAvailableWeight = Weightall - this.form.HighAvailableWeight;
} else {
}else if(this.title == "修改航班信息" && this.form.lowPriceWeightPercent > 0){
if(this.form.lowAvailableWeight){
this.$set(this.form, 'lowAvailableWeight', this.form.lowAvailableWeight)
}else{
this.$set(this.form, "lowAvailableWeight", (Weight - this.form.alloctedWeight) - this.form
.highAvailableWeight);
}
}else {
this.$set(this.form, "lowAvailableWeight", 0);
// this.form.lowAvailableWeight = 0;
}
}else{
this.ishighPriceWeightPercent=true;
}
......@@ -581,7 +592,7 @@
let Weight = 0;
if (this.form.extraWeightPercent > 0) {
Weight = this.form.originalWeight + this.form.originalWeight * (this.form.extraWeightPercent / 100)
} else {
}else {
Weight = this.form.originalWeight;
}
return Weight;
......