Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
cedbd9dc 2 parents 0c0ded07 704f1b21

Merge branch 'et86-black' into uat

Expand all
Inline Side-by-side
Showing 4 changed files with 60 additions and 31 deletions
This diff is collapsed. Click to expand it.
......@@ -370,14 +370,14 @@ export const inputBlurValidate = {
}
},
// 美元最小申报价值
inputSUDBlurMin({ target }) {
inputUSDBlurMin({ target }) {
// 申报价值最小值和最大值都为空的情况下
if (
this.queryForm.minUsdCustomVal == "" &&
this.queryForm.maxUsdCustomVal == ""
) {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
}
// 鼠标聚焦最小申报价值，最小申报价值无值的情况下去校验最大申报价值
if (target.value == "" && this.queryForm.maxUsdCustomVal) {
......@@ -387,7 +387,7 @@ export const inputBlurValidate = {
)
) {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
}
}
// 最小申报价值有值的情况下
......@@ -399,7 +399,7 @@ export const inputBlurValidate = {
Number(this.queryForm.minUsdCustomVal)
) {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"最小申报价值不得大于最大申报价值";
} else if (
/^(0|[1-9]\d*)(.\d{1,2})?$/.test(
......@@ -407,43 +407,43 @@ export const inputBlurValidate = {
)
) {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
} else {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
} else {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
}
} else {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
} else {
if (target.value && isNaN(target.value)) {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
if (target.value && Number(target.value) < 0) {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
}
},
// 美元最大申报价值
inputSUDBlurMax({ target }) {
inputUSDBlurMax({ target }) {
// 申报价值最小值和最大值都为空的情况下
if (
this.queryForm.minUsdCustomVal == "" &&
this.queryForm.maxUsdCustomVal == ""
) {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
}
// 鼠标聚焦最大申报价值，最大申报价值无值的情况下去校验最小申报价值
if (target.value == "" && this.queryForm.minUsdCustomVal) {
......@@ -453,10 +453,10 @@ export const inputBlurValidate = {
)
) {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
} else {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
}
......@@ -469,7 +469,7 @@ export const inputBlurValidate = {
Number(this.queryForm.minUsdCustomVal)
) {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"最小申报价值不得大于最大申报价值";
} else if (
/^(0|[1-9]\d*)(.\d{1,2})?$/.test(
......@@ -477,27 +477,27 @@ export const inputBlurValidate = {
)
) {
this.validateForm = true;
this.$refs.minSUDCustomVal.innerHTML = "";
this.$refs.minUSDCustomVal.innerHTML = "";
} else {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
}
} else {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
} else {
if (target.value && isNaN(target.value)) {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
if (target.value && Number(target.value) < 0) {
this.validateForm = false;
this.$refs.minSUDCustomVal.innerHTML =
this.$refs.minUSDCustomVal.innerHTML =
"请输入有效申报价值，小数保留2位";
}
}
......
......@@ -221,20 +221,36 @@ export default {
this.msgError(msg);
return;
}
if (data.routeList.length == 0) {
this.msgError("暂无航线");
return;
}
let noDateRouteLists = data.routeList; // 只负责展示航线优先级
// 航班航线基本信息(过滤ET86航线的)
let noDateRouteList = data.routeList.filter(
(item) => item.etesRule == "N"
);
if (noDateRouteList.length == 0) {
this.msgError("暂无航线");
return;
}
// 航班种类和日期级别处理默认数据
const flightKindName = ["Purple Tail", "White Tail"].includes(
this.$route.query.flightKindName
);
// 航班信息维护从非日期级别拿数据时要删掉id 和 historyId
if (
this.$route.query.flightKindName == "Purple Tail" ||
this.$route.query.flightKindName == "White Tail" ||
this.$route.query.querySpecifyData == "1"
) {
if (flightKindName || this.$route.query.querySpecifyData == "1") {
data.list.map((item) => {
if (item.status == "1") {
delete item.id;
delete item.historyId;
}
// 开启 || 保存【若开启则不用重置status和删除id & historyId】
if ((item.status = "3")) {
item.status = "1";
delete item.id;
delete item.historyId;
}
return item;
});
}
......@@ -281,12 +297,20 @@ export default {
this.msgError(msg);
return;
}
if (data.routeList.length == 0) {
this.msgError("暂无航线");
return;
}
let dateDataLists = data.routeList; // 只负责展示航线优先级
this.routeSpecifyDateSeq = data.routeList; // 日期级别航班顺位
// 航班航线基本信息(过滤ET86航线的)
let dateRouteList = data.routeList.filter(
(item) => item.etesRule == "N"
);
if (dateRouteList.length == 0) {
this.msgError("暂无航线");
return;
}
// 日期级别航班航线维度规则详情
const dateDataList = removeDuplicates(data.list, {
duplicate: "flightRoute", // 去重字段
......@@ -322,6 +346,7 @@ export default {
.catch(() => {});
});
},
// 根据航班号ID查看航班航线配置详情
getFindByFlightId(parmas) {
this.pageLoading = true;
......@@ -332,6 +357,10 @@ export default {
this.msgError(msg);
return;
}
if (data.list.length == 0) {
this.msgError("暂无航线维度设置");
return;
}
const routeList = [data.list];
// 航班航线维度规则详情
const dataList = removeDuplicates(routeList, {
......
......@@ -387,11 +387,11 @@
<el-input
v-model.trim="queryForm.minUsdCustomVal"
placeholder="最小申报价值"
@blur="inputSUDBlurMin($event)"
@blur="inputUSDBlurMin($event)"
:disabled="!getRouter"
></el-input>
<span
ref="minSUDCustomVal"
ref="minUSDCustomVal"
class="el-form-item__error"
></span>
</el-col>
......@@ -400,7 +400,7 @@
<el-input
v-model.trim="queryForm.maxUsdCustomVal"
placeholder="最大申报价值"
@blur="inputSUDBlurMax($event)"
@blur="inputUSDBlurMax($event)"
:disabled="!getRouter"
></el-input>
</el-col>
......@@ -463,7 +463,7 @@ export default {
minNumOfPieces: "", // 最小件数
maxNumOfPieces: "",
currencyCd: "RMB", // 人民币种
currencyCdUsd: "SUD", // 美元币种
currencyCdUsd: "USD", // 美元币种
minCustomVal: "", // 人民币最小申报值
maxCustomVal: "", // 人民币最大申报值
minUsdCustomVal: "", // 美元最小申报值
......@@ -481,8 +481,8 @@ export default {
serviceCodeData: [], // 【服务种类】调用接口获取服务种类所有的serviceCode
minCNYCustomVal: "", // 人民币最小申报值
maxCNYCustomVal: "", //
minSUDCustomVal: "", // 美元最小申报值
maxSUDCustomVal: "", //
minUSDCustomVal: "", // 美元最小申报值
maxUSDCustomVal: "", //
currentFlightNo: "", // 当前航班号
};
},
......