Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
jinhui.wang
d5e6ff8a 1 parent b0bea94d

version:0.5.4,航班维护页面bug修复，文本修正

Inline Side-by-side
Showing 4 changed files with 39 additions and 31 deletions
......@@ -42,5 +42,5 @@ module.exports = {
/**
* 版本号
*/
version:'version：0.5.3'
version:'version：0.5.4'
}
......
......@@ -2,8 +2,8 @@
<div class="app-container">
<el-form :model="queryParams" ref="queryForm" :inline="true">
<el-form-item label="原航班">
<el-input type="text" v-model="upCase" placeholder="请输入原航班" clearable class="formItem"></el-input>
<el-form-item label="ACCS原航班">
<el-input type="text" v-model="upCase" placeholder="请输入ACCS原航班" clearable class="formItem"></el-input>
<!-- <el-input v-model="upCase" placeholder="请输入原航班" clearable size="small" /> -->
</el-form-item>
<el-form-item label="状态" prop="status">
......@@ -14,7 +14,7 @@
</el-form-item>
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询原航班配置</el-button>
<el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery">查询ACCS原航班配置</el-button>
</el-form-item>
<br />
<el-form-item label="日期" prop="flightDate">
......@@ -26,7 +26,7 @@
<el-form-item>
<el-button type="primary" icon="el-icon-search" size="mini" @click="findSourceFlightAndFlightDate">查询实际配载航班
</el-button>&#12288;
<span style="color: red;">注：原航班+日期查询该日期的航班实际情况</span>
<span style="color: red;">注：ACCS原航班+日期查询该日期的航班实际情况</span>
</el-form-item>
<br />
<el-form-item>
......@@ -42,7 +42,7 @@
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="原航班" align="center" prop="sourceFlightNo" />
<el-table-column label="ACCS原航班" align="center" prop="sourceFlightNo" />
<el-table-column label="配载航班排序" align="center" prop="flightRank" width="280" />
<!-- <el-table-column label="优先级" align="center" prop="priority" /> -->
<el-table-column label="周期" align="center" prop="dayOfWeek" width="180" />
......@@ -74,7 +74,7 @@
<el-table-column type="index" label="序号" align="center">
<template slot-scope="scope">{{ scope.$index + 1 }}</template>
</el-table-column>
<el-table-column label="原航班" align="center" prop="sourceFlightNo" />
<el-table-column label="ACCS原航班" align="center" prop="sourceFlightNo" />
<el-table-column label="实际配载航班" align="center" prop="actualFlight" width="280" />
<el-table-column label="航班日期" align="center" prop="flightDate" />
<el-table-column label="操作" align="center" class-name="small-padding fixed-width" width="200">
......@@ -95,8 +95,8 @@
<el-form ref="form" :model="form" :rules="rules" label-width="100px">
<el-row>
<el-col :span="10">
<el-form-item label="原航班" prop="sourceFlightNo">
<el-input v-model="form.sourceFlightNo" placeholder="请输入原航班号" />
<el-form-item label="ACCS原航班" prop="sourceFlightNo">
<el-input v-model="form.sourceFlightNo" placeholder="请输入ACCS原航班号" />
</el-form-item>
</el-col>
</el-row>
......@@ -219,7 +219,7 @@
rules: {
sourceFlightNo: [{
required: true,
message: "原航班号不能为空",
message: "ACCS原航班号不能为空",
trigger: "blur"
}],
flightRank: [{
......@@ -269,7 +269,7 @@
handleAdd() {
this.form = {};
this.open = true;
this.title = "添加原航班顺位规则";
this.title = "添加ACCS原航班顺位规则";
this.form.id = -1;
this.dayOfWeek = [];
......@@ -280,7 +280,7 @@
this.form = {};
this.dayOfWeek = [];
this.open = true;
this.title = "修改原航班顺位规则";
this.title = "修改ACCS原航班顺位规则";
this.form = JSON.parse(JSON.stringify(row));
this.dayOfWeek = this.form.dayOfWeek ? this.form.dayOfWeek.split(";") : [];
//this.form.dayOfWeek = this.form.dayOfWeek ? this.form.dayOfWeek.split(";") : [];
......@@ -362,7 +362,7 @@
//校验原航班号非空
if (this.queryParams.sourceFlightNo === null || this.queryParams.sourceFlightNo === undefined || this
.queryParams.sourceFlightNo.trim() === '') {
this.$message.warning("原航班号为空");
this.$message.warning("ACCS原航班号为空");
return
}
//校验原日期非空
......
......@@ -210,14 +210,14 @@
<el-col :span="12">
<el-form-item label="高价百分比" prop="highPriceWeightPercent">
<el-input-number @change="LowHighAvailable" placeholder="请输入高价百分比" style="width:93%"
<el-input-number :disabled="ishighPriceWeightPercent" @change="LowHighAvailable" placeholder="请输入高价百分比" style="width:93%"
v-model="form.highPriceWeightPercent" :precision="2"></el-input-number>
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="低价百分比" prop="lowPriceWeightPercent">
<el-input-number @change="LowHighAvailable" placeholder="请输入低价百分比" style="width:93%"
<el-input-number :disabled="true" placeholder="请输入低价百分比" style="width:93%"
v-model="form.lowPriceWeightPercent" :precision="2"></el-input-number>
</el-form-item>
</el-col>
......@@ -236,7 +236,7 @@
</el-form-item>
</el-col>
<el-col :span="12">
<el-form-item label="高价已配重量" prop="HighAllocatedWeight">
<el-input-number :disabled="true" placeholder="请输入高价已配重量" style="width:93%"
......@@ -251,10 +251,10 @@
</el-col>
<el-col :span="12">
<el-form-item label="已配总重量" prop="alloctedWeight">
<el-input-number :disabled="true" placeholder="请输入已配总重量" style="width:93%" v-model="form.alloctedWeight"
:precision="2"></el-input-number>
</el-form-item>
</el-col>
......@@ -284,6 +284,8 @@
name: "findAllFltData",
data() {
return {
//高价百分比是否打开
ishighPriceWeightPercent:true,
//form属性禁用状态
formdisabled: {
//航班号
......@@ -358,12 +360,12 @@
rules: {
fltNo: [{
required: true,
message: "原航班号不能为空",
message: "ACCS原航班号不能为空",
trigger: "blur"
}],
fltDate: [{
required: true,
message: "航班日期不能为空",
message: "ACCS航班日期不能为空",
trigger: "blur"
}],
kindId: [{
......@@ -392,7 +394,7 @@
findFltCommonConf(this.form).then(response => {
if (response.code == 200) {
//额外增重百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置为0，不可编辑
if (response.data.extraWeightPercent != null && response.data.extraWeightPercent != undefined) {
if (response.data!=null && response.data.extraWeightPercent != null && response.data.extraWeightPercent != undefined) {
this.$set(this.form, "extraWeightPercent", response.data.extraWeightPercent);
// this.form.extraWeightPercent=response.data.extraWeightPercent;
} else {
......@@ -400,28 +402,29 @@
//this.form.extraWeightPercent=response.data.extraWeightPercent=0;
}
//是否开启高低价：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否开启高低价’ 为是，不可编辑
if (response.data.highLowPriceFlg != null && response.data.highLowPriceFlg != undefined) {
if (response.data!=null &&response.data.highLowPriceFlg != null && response.data.highLowPriceFlg != undefined) {
this.form.highLowPriceFlg = response.data.highLowPriceFlg === 1 ? true : false;
} else {
this.form.highLowPriceFlg = true;
this.$set(this.form, "highLowPriceFlg", true);
//this.form.highLowPriceFlg = true;
}
//是否预审：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘是否预审’ 为否，不可编辑；
if (response.data.isNeedRequired != null && response.data.isNeedRequired != undefined) {
if (response.data!=null &&response.data.isNeedRequired != null && response.data.isNeedRequired != undefined) {
this.form.isNeedRequired = response.data.isNeedRequired === 1 ? true : false;
} else {
this.form.isNeedRequired = false;
}
//高/低价百分比：根据已存在的相同航班号对应的最新值进行设置，如果无相同航班号，按照默认设置‘高价百分比’60%，‘低价百分比’40%，不可编辑
if (response.data.highPriceWeightPercent != null && response.data.highPriceWeightPercent !=
if (response.data!=null &&response.data.highPriceWeightPercent != null && response.data.highPriceWeightPercent !=
undefined) {
this.form.highPriceWeightPercent = response.data.highPriceWeightPercent;
} else {
this.form.highPriceWeightPercent = response.data.highPriceWeightPercent = 60;
this.form.highPriceWeightPercent = 60;
}
if (response.data.lowPriceWeightPercent != null && response.data.lowPriceWeightPercent != undefined) {
if (response.data!=null &&response.data.lowPriceWeightPercent != null && response.data.lowPriceWeightPercent != undefined) {
this.form.lowPriceWeightPercent = response.data.lowPriceWeightPercent;
} else {
this.form.lowPriceWeightPercent = response.data.lowPriceWeightPercent = 40;
this.form.lowPriceWeightPercent = 40;
}
this.LowHighAvailable();
} else {
......@@ -546,7 +549,8 @@
LowHighAvailable() {
//判断是否开启高地价
if (this.form.highLowPriceFlg) {
if (this.form.highLowPriceFlg) {
this.ishighPriceWeightPercent=false;
let Weight = 0;
//计算实际重量
if (this.form.highPriceWeightPercent > 0 || this.form.lowPriceWeightPercent > 0) {
......@@ -554,6 +558,7 @@
}
//高价可配
if (this.form.highPriceWeightPercent > 0) {
this.$set(this.form, "lowPriceWeightPercent", 100-this.form.highPriceWeightPercent);
this.$set(this.form, "HighAvailableWeight", (Weight - this.form.alloctedWeight) * (this.form
.highPriceWeightPercent / 100));
// this.form.HighAvailableWeight = Weightall * (this.form.highPriceWeightPercent / 100)
......@@ -572,6 +577,8 @@
// this.form.LowAvailableWeight = 0;
}
}else{
this.ishighPriceWeightPercent=true;
}
},
......@@ -654,8 +661,7 @@
let formdata = JSON.parse(JSON.stringify(this.form));
//高价百分比和低价百分比和不可以大于100
if (this.form.highLowPriceFlg && formdata.highPriceWeightPercent + formdata.lowPriceWeightPercent !=
100) {
if (this.form.highLowPriceFlg && (formdata.highPriceWeightPercent>100||formdata.highPriceWeightPercent<0) ) {
this.$message.warning("请正确填写高低价百分比");
return;
}
......@@ -713,6 +719,7 @@
this.queryParams.start = 0;
this.findAllFltData();
},
}
};
</script>
......
......@@ -340,6 +340,7 @@
:key="item.name"
header-align="center"
align="center"
:show-overflow-tooltip="true"
:width="item.value=='bigPretrialOpinion'?'300':'170'"
:formatter="formatter"
sortable
......