Fedex / imac-vue

Go to a project
Toggle navigation Toggle navigation pinning
Elements-SY
58817f33 1 parent afb19ccf

modify

Inline Side-by-side
Showing 2 changed files with 80 additions and 175 deletions
...@@ -24,10 +24,10 @@ export const inputBlurValidate = { ...@@ -24,10 +24,10 @@ export const inputBlurValidate = {
24 empty: "不能为空", 24 empty: "不能为空",
25 valid: "请输入有效件数", 25 valid: "请输入有效件数",
26 range: "件数不得小于1", 26 range: "件数不得小于1",
27 - interval: "最小件数和最大件数不能小于1", 27 + interval: "最小件数不得大于最大件数",
28 }, 28 },
29 }; 29 };
30 - this.validateNumOfPieces(validateData); 30 + this.validateMinNumPieces(validateData);
31 }, 31 },
32 // 最大件数失焦事件 32 // 最大件数失焦事件
33 inputBlurMaxPieces({ index, queryForm }) { 33 inputBlurMaxPieces({ index, queryForm }) {
...@@ -42,9 +42,10 @@ export const inputBlurValidate = { ...@@ -42,9 +42,10 @@ export const inputBlurValidate = {
42 empty: "不能为空", 42 empty: "不能为空",
43 valid: "请输入有效件数", 43 valid: "请输入有效件数",
44 range: "件数不得小于1", 44 range: "件数不得小于1",
45 - interval: "最小件数和最大件数不能小于1", 45 + interval: "最小件数不得大于最大件数",
46 }, 46 },
47 }; 47 };
48 + this.validateMaxNumOfPieces(validateData);
48 }, 49 },
49 // 最小重量失焦事件 50 // 最小重量失焦事件
50 inputBlurMinWeight({ index, queryForm }) { 51 inputBlurMinWeight({ index, queryForm }) {
...@@ -521,214 +522,118 @@ export const inputBlurValidate = { ...@@ -521,214 +522,118 @@ export const inputBlurValidate = {
521 } 522 }
522 }, 523 },
523 // 校验件数方法 【件数可以为空但件数不得为0】只能输入正整数 524 // 校验件数方法 【件数可以为空但件数不得为0】只能输入正整数
524 - validateNumOfPieces(item) { 525 + validateMinNumPieces(item) {
525 if (item.minNumOfPieces == "" && item.maxNumOfPieces == "") { 526 if (item.minNumOfPieces == "" && item.maxNumOfPieces == "") {
526 - this.queryForm[item.errorMsgAttr] = "";
527 this.queryForm.validateForm = true; 527 this.queryForm.validateForm = true;
528 + this.queryForm[item.errorMsgAttr] = "";
529 + this.$set(this.queryForm, item.errorMsgAttr, "");
528 } 530 }
531 + // 鼠标聚焦最小重量，最小重量无值的情况下去校验最大重量
529 if (item.minNumOfPieces == "" && item.maxNumOfPieces) { 532 if (item.minNumOfPieces == "" && item.maxNumOfPieces) {
530 - if ( 533 + if (item.reg.test(Number(item.maxNumOfPieces))) {
531 - item.reg.test(Number(item.maxNumOfPieces)) &&
532 - Number(item.maxNumOfPieces) > 0
533 - ) {
534 - this.queryForm[item.errorMsgAttr] = "";
535 this.queryForm.validateForm = true; 534 this.queryForm.validateForm = true;
535 + this.queryForm[item.errorMsgAttr] = "";
536 + this.$set(this.queryForm, item.errorMsgAttr, "");
536 } else { 537 } else {
537 - this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
538 this.queryForm.validateForm = false; 538 this.queryForm.validateForm = false;
539 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
540 + this.$set(this.queryForm, item.errorMsgAttr, item.errorMsg.valid);
539 } 541 }
540 } 542 }
541 - 543 + // 最小重量有值的情况下
542 if (item.minNumOfPieces && Number(item.minNumOfPieces) > 0) { 544 if (item.minNumOfPieces && Number(item.minNumOfPieces) > 0) {
543 if (item.reg.test(Number(item.minNumOfPieces))) { 545 if (item.reg.test(Number(item.minNumOfPieces))) {
544 - if (this.queryForm.maxWeight) { 546 + if (item.maxNumOfPieces) {
545 if (Number(item.maxNumOfPieces) < Number(item.minNumOfPieces)) { 547 if (Number(item.maxNumOfPieces) < Number(item.minNumOfPieces)) {
546 - this.queryForm[item.errorMsgAttr] = item.errorMsg.interval;
547 this.queryForm.validateForm = false; 548 this.queryForm.validateForm = false;
548 - } else if (item.reg.test(Number(item.maxNumOfPieces))) { 549 + this.queryForm[item.errorMsgAttr] = item.errorMsg.interval;
549 - this.queryForm[item.errorMsgAttr] = ""; 550 + this.$set(
551 + this.queryForm,
552 + item.errorMsgAttr,
553 + item.errorMsg.interval
554 + );
555 + } else if (item.reg.test(Number(this.queryForm.maxWeight))) {
550 this.queryForm.validateForm = true; 556 this.queryForm.validateForm = true;
557 + this.queryForm[item.errorMsgAttr] = "";
558 + this.$set(this.queryForm, item.errorMsgAttr, "");
551 } else { 559 } else {
552 - this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
553 this.queryForm.validateForm = false; 560 this.queryForm.validateForm = false;
561 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
562 + this.$set(this.queryForm, item.errorMsgAttr, item.errorMsg.valid);
554 } 563 }
555 } else { 564 } else {
556 - this.queryForm[item.errorMsgAttr] = "";
557 this.queryForm.validateForm = true; 565 this.queryForm.validateForm = true;
566 + this.queryForm[item.errorMsgAttr] = "";
567 + this.$set(this.queryForm, item.errorMsgAttr, "");
558 } 568 }
559 } else { 569 } else {
560 - this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
561 this.queryForm.validateForm = false; 570 this.queryForm.validateForm = false;
571 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
572 + this.$set(this.queryForm, item.errorMsgAttr, item.errorMsg.valid);
562 } 573 }
563 } else { 574 } else {
564 if (item.minNumOfPieces && isNaN(item.minNumOfPieces)) { 575 if (item.minNumOfPieces && isNaN(item.minNumOfPieces)) {
565 - this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
566 this.queryForm.validateForm = false; 576 this.queryForm.validateForm = false;
567 - }
568 - if (Number(item.minNumOfPieces) < 0) {
569 this.queryForm[item.errorMsgAttr] = item.errorMsg.valid; 577 this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
578 + this.$set(this.queryForm, item.errorMsgAttr, item.errorMsg.valid);
579 + }
580 + if (item.minNumOfPieces && Number(item.minNumOfPieces) < 1) {
570 this.queryForm.validateForm = false; 581 this.queryForm.validateForm = false;
582 + this.queryForm[item.errorMsgAttr] = item.errorMsg.range;
583 + this.$set(this.queryForm, item.errorMsgAttr, item.errorMsg.range);
571 } 584 }
572 } 585 }
573 - console.log(this.queryForm.validateForm); 586 + // this.$set(this.queryForm);
574 - return; 587 + console.log(this.queryForm);
588 + },
575 589
576 - if (value.toString().length) { 590 + validateMaxNumOfPieces(item) {
577 - // 获取当前输入框有值的情况下 591 + // 重量最小值和最大值都为空的情况下
578 - this.queryForm[pieces] = Number(value); 592 + if (item.minNumOfPieces == "" && item.maxNumOfPieces == "") {
579 - let markPieces = false; 593 + this.queryForm.validateForm = true;
580 - if (pieces == "minNumOfPieces" || pieces == "maxNumOfPieces") { 594 + this.queryForm[item.errorMsgAttr] = "";
581 - // 最大件数和最小件数都不为空的情况下
582 - if (
583 - this.queryForm.minNumOfPieces.toString() != "" &&
584 - this.queryForm.maxNumOfPieces.toString() != ""
585 - ) {
586 - this.validateForm = true;
587 - this.$refs.minNumOfPieces.innerHTML = "";
588 - markPieces = true;
589 - } else {
590 - markPieces = false;
591 - }
592 - }
593 - if (/^\d+$/.test(this.queryForm[pieces])) {
594 - if (markPieces) {
595 - //当最大件数和最小件数都不为空的情况下，最大件数小于最小件数的时候
596 - if (this.queryForm.maxNumOfPieces < this.queryForm.minNumOfPieces) {
597 - if (Array.isArray(this.$refs.minNumOfPieces)) {
598 - this.msgError("最小件数不得大于最大件数");
599 - this.validateForm = false;
600 - } else {
601 - this.$refs.minNumOfPieces.innerHTML = "";
602 - this.$refs.minNumOfPieces.innerHTML =
603 - "最小件数不得大于最大件数";
604 - this.validateForm = false;
605 - }
606 } 595 }
607 - //当最大件数和最小件数都不为空的情况下，最大件数和最小件数小于1的时候 596 + // 鼠标聚焦最大重量，最大重量无值的情况下去校验最小重量
608 - else if ( 597 + if (item.maxNumOfPieces == "" && item.minNumOfPieces) {
609 - this.queryForm.minNumOfPieces < 1 || 598 + if (item.reg.test(Number(item.minNumOfPieces))) {
610 - this.queryForm.maxNumOfPieces < 1 599 + this.queryForm.validateForm = true;
611 - ) { 600 + this.queryForm[item.errorMsgAttr] = "";
612 - if (Array.isArray(this.$refs.minNumOfPieces)) {
613 - this.msgError("最小件数和最大件数不能小于1");
614 - this.validateForm = false;
615 } else { 601 } else {
616 - this.$refs.minNumOfPieces.innerHTML = ""; 602 + this.queryForm.validateForm = false;
617 - this.$refs.minNumOfPieces.innerHTML = 603 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
618 - "最小件数和最大件数不能小于1";
619 - this.validateForm = false;
620 - }
621 - }
622 - //当最大件数和最小件数都不为空的情况下，最大件数和最小件数满足大于1左区间小于等于右区间的时候
623 - else {
624 - this.$refs.minNumOfPieces.innerHTML = "";
625 - this.validateForm = true;
626 } 604 }
627 - } else {
628 - // 当左右区间其中一个有值的情况下
629 - if (value.length) {
630 - if (Number(value) < 1) {
631 - if (Array.isArray(this.$refs.minNumOfPieces)) {
632 - this.msgError("件数不得小于1");
633 - this.$refs.minNumOfPieces.innerHTML = "";
634 - this.$refs.minNumOfPieces.innerHTML = "件数不得小于1";
635 - this.validateForm = false;
636 - } else {
637 - this.msgError("件数不得小于1");
638 - this.$refs.minNumOfPieces.innerHTML = "";
639 - this.$refs.minNumOfPieces.innerHTML = "件数不得小于1";
640 - this.validateForm = false;
641 } 605 }
606 + if (item.maxNumOfPieces && Number(item.maxNumOfPieces) >= 0) {
607 + if (item.reg.test(Number(item.maxNumOfPieces))) {
608 + if (item.minNumOfPieces) {
609 + if (Number(item.maxNumOfPieces) < Number(item.minNumOfPieces)) {
610 + this.queryForm.validateForm = false;
611 + this.queryForm[item.errorMsgAttr] = item.errorMsg.interval;
612 + } else if (item.reg.test(Number(this.queryForm.minWeight))) {
613 + this.queryForm.validateForm = true;
614 + this.queryForm[item.errorMsgAttr] = "";
642 } else { 615 } else {
643 - if (!Array.isArray(this.$refs.minNumOfPieces)) { 616 + this.queryForm.validateForm = false;
644 - this.$refs.minNumOfPieces.innerHTML = ""; 617 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
645 - this.validateForm = true;
646 - }
647 - }
648 - }
649 } 618 }
650 } else { 619 } else {
651 - if (Array.isArray(this.$refs.minNumOfPieces)) { 620 + this.queryForm.validateForm = true;
652 - this.msgError("请输入有效件数"); 621 + this.queryForm[item.errorMsgAttr] = "";
653 - } else {
654 - this.queryForm[pieces] = value;
655 - this.$refs.minNumOfPieces.innerHTML = "";
656 - this.$refs.minNumOfPieces.innerHTML = "请输入有效件数";
657 - }
658 - this.validateForm = false;
659 } 622 }
660 } else { 623 } else {
661 - // 【左右区间不是都有值的情况下】 624 + this.queryForm.validateForm = false;
662 - // 最小件数为空最大件数有值的情况下 625 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
663 - if (pieces == "minNumOfPieces" && this.queryForm.maxNumOfPieces > 0) {
664 - this.$refs.minNumOfPieces.innerHTML = "";
665 - this.validateForm = true;
666 - } else {
667 - this.$refs.minNumOfPieces.innerHTML = "";
668 - this.$refs.minNumOfPieces.innerHTML = "最大件数不得小于1";
669 - this.validateForm = false;
670 } 626 }
671 - // 最大件数为空最小件数有值的情况下
672 - if (pieces == "maxNumOfPieces" && this.queryForm.minNumOfPieces > 0) {
673 - this.$refs.minNumOfPieces.innerHTML = "";
674 - this.validateForm = true;
675 } else { 627 } else {
676 - this.$refs.minNumOfPieces.innerHTML = ""; 628 + if (item.maxNumOfPieces && isNaN(item.maxNumOfPieces)) {
677 - this.validateForm = true; 629 + this.queryForm.validateForm = false;
630 + this.queryForm[item.errorMsgAttr] = item.errorMsg.valid;
678 } 631 }
679 - // 左右区间 都为空的情况下 632 + if (item.maxNumOfPieces && Number(item.maxNumOfPieces) < 1) {
680 - if ( 633 + this.queryForm.validateForm = false;
681 - this.queryForm.minNumOfPieces.toString().length == 0 && 634 + this.queryForm[item.errorMsgAttr] = item.errorMsg.range;
682 - this.queryForm.maxNumOfPieces.toString().length == 0
683 - ) {
684 - this.$refs.minNumOfPieces.innerHTML = "";
685 - this.validateForm = true;
686 } 635 }
687 } 636 }
688 - return this.validateForm;
689 - },
690 -
691 - validate() {
692 - const validateData1 = {
693 - reg: /^\d+$/,
694 - index: index,
695 - minNumOfPieces: item.minNumOfPieces,
696 - maxNumOfPieces: item.maxNumOfPieces,
697 - errorMsgAttr: "piecesMsg",
698 - validateForm: false, // form表单节流阀
699 - errorMsg: {
700 - empty: "不能为空",
701 - valid: "请输入有效件数",
702 - range: "件数不得小于1",
703 - interval: "最小件数和最大件数不能小于1",
704 - },
705 - };
706 - const validateData2 = {
707 - reg: /^(0|[1-9]\d*)(.\d{1,2})?$/,
708 - index: index,
709 - minWeight: item.minWeight,
710 - maxWeight: item.maxWeight,
711 - errorMsgAttr: "weightMsg",
712 - validateForm: false, // form表单节流阀
713 - errorMsg: {
714 - empty: "不能为空",
715 - valid: "请输入有效重量，小数保留5位",
716 - interval: "最小重量不得大于最大重量",
717 - },
718 - };
719 - const validateData3 = {
720 - reg: /^(0|[1-9]\d*)(.\d{1,2})?$/,
721 - index: index,
722 - minUsdCustomVal: item.minUsdCustomVal,
723 - maxUsdCustomVal: item.maxUsdCustomVal,
724 - errorMsgAttr: "currencyCdMsg", // currencyCdUsdMsg
725 - validateForm: false, // form表单节流阀
726 - errorMsg: {
727 - empty: "不能为空",
728 - valid: "请输入有效申报价值，小数保留2位",
729 - interval: "最小申报价值不得大于最大申报价值",
730 - },
731 - };
732 }, 637 },
733 }, 638 },
734 }; 639 };
......
...@@ -309,17 +309,17 @@ ...@@ -309,17 +309,17 @@
309 <el-input 309 <el-input
310 v-model.trim="queryForm.minNumOfPieces" 310 v-model.trim="queryForm.minNumOfPieces"
311 placeholder="最小件数" 311 placeholder="最小件数"
312 - @blur="inputBlurMinPieces({ index: 0, queryForm, $event })" 312 + @blur="inputBlurMinPieces($event)"
313 :disabled="!getRouter" 313 :disabled="!getRouter"
314 ></el-input> 314 ></el-input>
315 - <span ref="minNumOfPieces" class="el-form-item__error"></span> 315 + <span class="el-form-item__error" v-text="queryForm.piecesMsg"></span>
316 </el-col> 316 </el-col>
317 <el-col style="text-align: center" :span="1">-</el-col> 317 <el-col style="text-align: center" :span="1">-</el-col>
318 <el-col :span="10"> 318 <el-col :span="10">
319 <el-input 319 <el-input
320 v-model.trim="queryForm.maxNumOfPieces" 320 v-model.trim="queryForm.maxNumOfPieces"
321 placeholder="最大件数" 321 placeholder="最大件数"
322 - @blur="inputBlurMaxPieces({ index: 0, queryForm, $event })" 322 + @blur="inputBlurMaxPieces($event)"
323 :disabled="!getRouter" 323 :disabled="!getRouter"
324 ></el-input> 324 ></el-input>
325 </el-col> 325 </el-col>
...@@ -332,7 +332,7 @@ ...@@ -332,7 +332,7 @@
332 <el-input 332 <el-input
333 v-model.trim="queryForm.minWeight" 333 v-model.trim="queryForm.minWeight"
334 placeholder="最小重量" 334 placeholder="最小重量"
335 - @blur="inputBlurMinWeight({ index: 0, queryForm, $event })" 335 + @blur="inputBlurMinWeight($event)"
336 :disabled="!getRouter" 336 :disabled="!getRouter"
337 ></el-input> 337 ></el-input>
338 <span ref="minWeight" class="el-form-item__error"></span> 338 <span ref="minWeight" class="el-form-item__error"></span>
...@@ -342,7 +342,7 @@ ...@@ -342,7 +342,7 @@
342 <el-input 342 <el-input
343 v-model.trim="queryForm.maxWeight" 343 v-model.trim="queryForm.maxWeight"
344 placeholder="最大重量" 344 placeholder="最大重量"
345 - @blur="inputBlurMaxWeight({ index: 0, queryForm, $event })" 345 + @blur="inputBlurMaxWeight($event)"
346 :disabled="!getRouter" 346 :disabled="!getRouter"
347 ></el-input> 347 ></el-input>
348 </el-col> 348 </el-col>
...@@ -361,7 +361,7 @@ ...@@ -361,7 +361,7 @@
361 <el-input 361 <el-input
362 v-model.trim="queryForm.minCustomVal" 362 v-model.trim="queryForm.minCustomVal"
363 placeholder="最小申报价值" 363 placeholder="最小申报价值"
364 - @blur="inputCNYBlurMin({ index: 0, queryForm, $event })" 364 + @blur="inputCNYBlurMin($event)"
365 :disabled="!getRouter" 365 :disabled="!getRouter"
366 ></el-input> 366 ></el-input>
367 <span 367 <span
...@@ -374,7 +374,7 @@ ...@@ -374,7 +374,7 @@
374 <el-input 374 <el-input
375 v-model.trim="queryForm.maxCustomVal" 375 v-model.trim="queryForm.maxCustomVal"
376 placeholder="最大申报价值" 376 placeholder="最大申报价值"
377 - @blur="inputCNYBlurMax({ index: 0, queryForm, $event })" 377 + @blur="inputCNYBlurMax($event)"
378 :disabled="!getRouter" 378 :disabled="!getRouter"
379 ></el-input> 379 ></el-input>
380 </el-col> 380 </el-col>
...@@ -387,7 +387,7 @@ ...@@ -387,7 +387,7 @@
387 <el-input 387 <el-input
388 v-model.trim="queryForm.minUsdCustomVal" 388 v-model.trim="queryForm.minUsdCustomVal"
389 placeholder="最小申报价值" 389 placeholder="最小申报价值"
390 - @blur="inputSUDBlurMin({ index: 0, queryForm, $event })" 390 + @blur="inputSUDBlurMin($event)"
391 :disabled="!getRouter" 391 :disabled="!getRouter"
392 ></el-input> 392 ></el-input>
393 <span 393 <span
...@@ -400,7 +400,7 @@ ...@@ -400,7 +400,7 @@
400 <el-input 400 <el-input
401 v-model.trim="queryForm.maxUsdCustomVal" 401 v-model.trim="queryForm.maxUsdCustomVal"
402 placeholder="最大申报价值" 402 placeholder="最大申报价值"
403 - @blur="inputSUDBlurMax({ index: 0, queryForm, $event })" 403 + @blur="inputSUDBlurMax($event)"
404 :disabled="!getRouter" 404 :disabled="!getRouter"
405 ></el-input> 405 ></el-input>
406 </el-col> 406 </el-col>
......