Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
67bd0bbb 1 parent cc85eead

modify

Inline Side-by-side
Showing 2 changed files with 37 additions and 20 deletions
...@@ -188,25 +188,26 @@ export const inputBlurValidate = { ...@@ -188,25 +188,26 @@ export const inputBlurValidate = {
188 this.$refs.minWeight.innerHTML = ""; 188 this.$refs.minWeight.innerHTML = "";
189 } 189 }
190 } 190 }
191 - } else {
192 - if (value.length) {
193 - if (Number(value) > 34) {
194 - if (Array.isArray(this.$refs.minWeight)) {
195 - this.validateForm = false;
196 - this.msgError("最大重量不能大于34KG");
197 - } else {
198 - this.validateForm = false;
199 - this.$refs.minWeight.innerHTML = "";
200 - this.$refs.minWeight.innerHTML = "最大重量不能大于34KG";
201 - }
202 - } else {
203 - if (!Array.isArray(this.$refs.minWeight)) {
204 - this.validateForm = true;
205 - this.$refs.minWeight.innerHTML = "";
206 - }
207 - }
208 - }
209 } 191 }
192 + // else {
193 + // if (value.length) {
194 + // if (Number(value) > 34) {
195 + // if (Array.isArray(this.$refs.minWeight)) {
196 + // this.validateForm = false;
197 + // this.msgError("最大重量不能大于34KG");
198 + // } else {
199 + // this.validateForm = false;
200 + // this.$refs.minWeight.innerHTML = "";
201 + // this.$refs.minWeight.innerHTML = "最大重量不能大于34KG";
202 + // }
203 + // } else {
204 + // if (!Array.isArray(this.$refs.minWeight)) {
205 + // this.validateForm = true;
206 + // this.$refs.minWeight.innerHTML = "";
207 + // }
208 + // }
209 + // }
210 + // }
210 } else { 211 } else {
211 if (Array.isArray(this.$refs.minWeight)) { 212 if (Array.isArray(this.$refs.minWeight)) {
212 this.validateForm = false; 213 this.validateForm = false;
...@@ -262,6 +263,14 @@ export const inputBlurValidate = { ...@@ -262,6 +263,14 @@ export const inputBlurValidate = {
262 this.$refs[coin[customVal]].innerHTML = ""; 263 this.$refs[coin[customVal]].innerHTML = "";
263 this.validateForm = true; 264 this.validateForm = true;
264 } 265 }
266 + // 如果人民币其中任何一个有值，去判断美元是否有值，如果有值把美元值清空
267 + if (this.minCNYCustomVal || this.maxCNYCustomVal) {
268 + if (this.minSUDCustomVal || this.maxSUDCustomVal) {
269 + this.$refs.minSUDCustomVal.innerHTML = "";
270 + this.validateForm = true;
271 + this.minSUDCustomVal = this.maxSUDCustomVal = "";
272 + }
273 + }
265 } 274 }
266 // 其中一个有值的情况下美元 275 // 其中一个有值的情况下美元
267 if ( 276 if (
...@@ -280,8 +289,16 @@ export const inputBlurValidate = { ...@@ -280,8 +289,16 @@ export const inputBlurValidate = {
280 this.validateForm = true; 289 this.validateForm = true;
281 } 290 }
282 } else { 291 } else {
283 - this.validateForm = true;
284 this.$refs[coin[customVal]].innerHTML = ""; 292 this.$refs[coin[customVal]].innerHTML = "";
293 + this.validateForm = true;
294 + }
295 + // 如果美元其中任何一个有值，去判断人民币是否有值，如果有值把人民币值清空
296 + if (this.minSUDCustomVal || this.maxSUDCustomVal) {
297 + if (this.minCNYCustomVal || this.maxCNYCustomVal) {
298 + this.$refs.minCNYCustomVal.innerHTML = "";
299 + this.validateForm = true;
300 + this.minCNYCustomVal = this.maxCNYCustomVal = "";
301 + }
285 } 302 }
286 } 303 }
287 } else { 304 } else {
......
...@@ -725,7 +725,7 @@ export default { ...@@ -725,7 +725,7 @@ export default {
725 this.queryForm.minCustomVal = this.minSUDCustomVal; 725 this.queryForm.minCustomVal = this.minSUDCustomVal;
726 this.queryForm.maxCustomVal = this.maxSUDCustomVal; 726 this.queryForm.maxCustomVal = this.maxSUDCustomVal;
727 } else { 727 } else {
728 - this.queryForm.currencyCd = "CNY"; 728 + this.queryForm.currencyCd = null;
729 } 729 }
730 let fltNo = this.tableData.some((item) => item.flightNo == ""); // 通过遍历判断航班顺位列表有没有填写的航班号 730 let fltNo = this.tableData.some((item) => item.flightNo == ""); // 通过遍历判断航班顺位列表有没有填写的航班号
731 let fltNoRoute = this.tableData.some( 731 let fltNoRoute = this.tableData.some(
......