Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
c5513e3a 2 parents 2577bab4 8183b2d5

Merge branch 'et86-black' into test

Inline Side-by-side
Showing 2 changed files with 45 additions and 35 deletions
......@@ -128,7 +128,7 @@ export const inputBlurValidate = {
this.validateForm = true;
} else {
this.$refs.minNumOfPieces.innerHTML = "";
this.$refs.minNumOfPieces.innerHTML = "件数不得小于1";
this.$refs.minNumOfPieces.innerHTML = "最大件数不得小于1";
this.validateForm = false;
}
// 最大件数为空最小件数有值的情况下
......@@ -137,8 +137,7 @@ export const inputBlurValidate = {
this.validateForm = true;
} else {
this.$refs.minNumOfPieces.innerHTML = "";
this.$refs.minNumOfPieces.innerHTML = "件数不得小于1";
this.validateForm = false;
this.validateForm = true;
}
// 左右区间 都为空的情况下
if (
......@@ -218,13 +217,14 @@ export const inputBlurValidate = {
this.$refs.minWeight.innerHTML = "请输入正整数，小数保留5位";
}
}
} else {
this.validateForm = true;
this.$refs.minWeight.innerHTML = "";
}
return this.validateForm;
},
// 报价值【申报价值可以为空为0】
validateCustomVal(value, customVal) {
if (value.length) {
this[customVal] = Number(value);
let coin = {
minCNYCustomVal: "minCNYCustomVal",
maxCNYCustomVal: "minCNYCustomVal",
......@@ -238,13 +238,21 @@ export const inputBlurValidate = {
maxSUDCustomVal: 600,
};
let markCoin = false;
if (value.length) {
this[customVal] = Number(value);
// 其中一个有值的情况下
if (customVal == "minCNYCustomVal" || customVal == "maxCNYCustomVal") {
if (this.minCNYCustomVal && this.maxCNYCustomVal) {
this.validateForm = false;
markCoin =
Number(this.maxCNYCustomVal) < Number(this.minCNYCustomVal);
}
} else {
this.validateForm = true;
this.$refs[coin[customVal]].innerHTML = "";
}
}
// 都有值的情况下
else {
if (this.minSUDCustomVal && this.maxSUDCustomVal) {
this.validateForm = false;
markCoin =
......@@ -258,28 +266,31 @@ export const inputBlurValidate = {
this.$refs[coin[customVal]].innerHTML = "";
this.$refs[coin[customVal]].innerHTML =
"最小申报价值不得大于最大申报价值";
} else if (this[customVal] > currency[customVal]) {
this.validateForm = false;
this.$refs[coin[customVal]].innerHTML = "";
this.$refs[
coin[customVal]
].innerHTML = `最大申报值不得大于${currency[customVal]}`;
} else {
this.validateForm = true;
this.$refs[coin[customVal]].innerHTML = "";
}
// 判断申报价值不得大于上限
// else if (this[customVal] > currency[customVal]) {
// this.validateForm = false;
// this.$refs[coin[customVal]].innerHTML = "";
// this.$refs[
// coin[customVal]
// ].innerHTML = `最大申报值不得大于${currency[customVal]}`;
// } else {
// this.validateForm = true;
// this.$refs[coin[customVal]].innerHTML = "";
// }
} else {
if (value.length) {
if (Number(value) > currency[customVal]) {
this.validateForm = false;
this.$refs[coin[customVal]].innerHTML = "";
this.$refs[
coin[customVal]
].innerHTML = `最大申报值不得大于${currency[customVal]}`;
} else {
this.validateForm = true;
this.$refs[coin[customVal]].innerHTML = "";
}
// 判断申报价值不得大于上限
// if (Number(value) > currency[customVal]) {
// this.validateForm = false;
// this.$refs[coin[customVal]].innerHTML = "";
// this.$refs[
// coin[customVal]
// ].innerHTML = `最大申报值不得大于${currency[customVal]}`;
// } else {
// this.validateForm = true;
// this.$refs[coin[customVal]].innerHTML = "";
// }
}
}
} else {
......@@ -287,6 +298,9 @@ export const inputBlurValidate = {
this.$refs[coin[customVal]].innerHTML = "";
this.$refs[coin[customVal]].innerHTML = "请输入正确申报价值";
}
} else {
this.validateForm = true;
this.$refs[coin[customVal]].innerHTML = "";
}
return this.validateForm;
},
......
......@@ -71,10 +71,8 @@
<el-button type="primary" v-if="val.status === '3'" size="mini"
icon="el-icon-video-pause" @click="changeStatus(idx)">
启 用</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete"
@click="del(idx)">删
除
</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" @click="del(idx)">
删 除</el-button>
<div v-if="(routeSatus.indexOf('flightInformationMaintenance') >= 0)"
style="display: inline-block;">
<span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
......@@ -216,7 +214,7 @@
<el-col v-for="item in checkBoxItem.cargoStatus" :span="3"
:key="item.id">
<el-checkbox v-if="item.status === 1" :label="item.chineseName"
:name="item.chineseName" :key="item.code">
:name="item.chineseName" :key="item.code" disabled>
<Tooltips :content="item.chineseName" :refName="item.code">
</Tooltips>
</el-checkbox>
......@@ -326,15 +324,13 @@
<el-button type="primary" v-if="val.status === '3'" size="mini" icon="el-icon-video-pause"
@click="changeStatus(idx)">
启 用</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px"
@click="del(idx)">删 除
</el-button>
<el-button v-if="val.id" type="danger" size="mini" icon="el-icon-delete" style="margin-right:10px" @click="del(idx)">
删 除</el-button>
<div v-if="routeSatus.indexOf('flightInformationMaintenance') >= 0" style="display: inline-block;">
<span v-if="val.id">日期级别规则</span><span v-else>普通规则</span>
</div>
<div v-else-if="(routeSatus.indexOf('FlightAllocConfig') >= 0)" style="display: inline-block;">
<span
v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
<span v-if="infoForm.fltDate != null && infoForm.fltDate != '' && infoForm.fltDate != ' '">日期级别规则</span><span
v-else>普通规则</span>
</div>
<el-divider></el-divider>
......