朱兆平 / vue_cli · 提交

转到一个项目

作者 xudada
提交 85c0925f8b37eef94587dce72058ea44209487d3 2 个父辈 a37f55fb 9e1c3fae

Merge remote-tracking branch 'origin/master' into ExportOrder

内嵌 并排对比
正在显示 1 个修改的文件 包含 32 行增加 和 23 行删除
@@ -536,7 +536,7 @@ @@ -536,7 +536,7 @@
536 </el-row> 536 </el-row>
537 <!-- 收货人信息--> 537 <!-- 收货人信息-->
538 <el-row style="padding-top: 10px"> 538 <el-row style="padding-top: 10px">
539 - <el-col :span="22" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 25px"> 539 + <el-col :span="12" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 25px">
540 <span style="font-size: 12px"> 540 <span style="font-size: 12px">
541 Notify Name and Address 541 Notify Name and Address
542 <el-button type="primary" plain size="mini" style="margin-top: 5px" @click="getCneFwb()">通知人</el-button> 542 <el-button type="primary" plain size="mini" style="margin-top: 5px" @click="getCneFwb()">通知人</el-button>
@@ -580,7 +580,7 @@ @@ -580,7 +580,7 @@
580 </el-form-item> 580 </el-form-item>
581 </el-col> 581 </el-col>
582 </el-row> 582 </el-row>
583 - <el-row> 583 + <el-row style="margin-bottom: -5px">
584 <el-col style="width: 80%"> 584 <el-col style="width: 80%">
585 <el-form-item> 585 <el-form-item>
586 <el-input minlength="1" maxlength="35" 586 <el-input minlength="1" maxlength="35"
@@ -589,15 +589,9 @@ @@ -589,15 +589,9 @@
589 </el-form-item> 589 </el-form-item>
590 </el-col> 590 </el-col>
591 </el-row> 591 </el-row>
592 - <el-row style="margin-bottom: -5px">  
593 - <el-col style="width: 80%">  
594 - <el-form-item>  
595 - <el-input minlength="1" maxlength="65" onkeyup="this.value=this.value.toUpperCase()"  
596 - @keyup.native="cne_oci.oci_csrc_info=cne_oci.oci_csrc_info.replace(/[^A-Za-z0-9_\s]/g,'')"  
597 - v-model="cne_oci.oci_csrc_info" auto-complete="off" placeholder="企业编码"></el-input>  
598 - </el-form-item>  
599 </el-col> 592 </el-col>
600 - </el-row> 593 + <el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 25px">
  594 + Also Notify Area
601 </el-col> 595 </el-col>
602 </el-row> 596 </el-row>
603 <!-- 处理信息--> 597 <!-- 处理信息-->
@@ -673,7 +667,9 @@ Handling Information @@ -673,7 +667,9 @@ Handling Information
673 <el-row style="margin-bottom: -5px"> 667 <el-row style="margin-bottom: -5px">
674 <el-col style="width: 95%"> 668 <el-col style="width: 95%">
675 <el-form-item> 669 <el-form-item>
676 - <el-input v-model="form.bill.quantity_picecs" auto-complete="off" placeholder="件数" size="mini"></el-input> 670 + <el-input v-model="form.bill.quantity_picecs"
  671 + oninput="this.value=this.value.replace(/[^0-9]/g,'').trim();"
  672 + auto-complete="off" placeholder="件数1" size="mini"></el-input>
677 </el-form-item> 673 </el-form-item>
678 </el-col> 674 </el-col>
679 </el-row> 675 </el-row>
@@ -682,7 +678,9 @@ Handling Information @@ -682,7 +678,9 @@ Handling Information
682 <el-row style="margin-bottom: -5px"> 678 <el-row style="margin-bottom: -5px">
683 <el-col style="width: 95%"> 679 <el-col style="width: 95%">
684 <el-form-item> 680 <el-form-item>
685 - <el-input v-model="form.bill.quantity_weight" auto-complete="off" placeholder="重量（KG）" size="mini"></el-input> 681 + <el-input v-model="form.bill.quantity_weight"
  682 + oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
  683 + auto-complete="off" placeholder="重量（KG）" size="mini"></el-input>
686 </el-form-item> 684 </el-form-item>
687 </el-col> 685 </el-col>
688 </el-row> 686 </el-row>
@@ -725,7 +723,9 @@ Handling Information @@ -725,7 +723,9 @@ Handling Information
725 <el-row style="margin-bottom: -5px"> 723 <el-row style="margin-bottom: -5px">
726 <el-col style="width: 95%"> 724 <el-col style="width: 95%">
727 <el-form-item> 725 <el-form-item>
728 - <el-input v-model="form.rtd.rtd_charge_weight" auto-complete="off" placeholder="计费重量" size="mini"></el-input> 726 + <el-input v-model="form.rtd.rtd_charge_weight"
  727 + oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
  728 + auto-complete="off" placeholder="计费重量" size="mini"></el-input>
729 </el-form-item> 729 </el-form-item>
730 </el-col> 730 </el-col>
731 </el-row> 731 </el-row>
@@ -734,7 +734,9 @@ Handling Information @@ -734,7 +734,9 @@ Handling Information
734 <el-row style="margin-bottom: -5px"> 734 <el-row style="margin-bottom: -5px">
735 <el-col style="width: 95%"> 735 <el-col style="width: 95%">
736 <el-form-item> 736 <el-form-item>
737 - <el-input v-model="form.rtd.rtd_rate_charge" auto-complete="off" placeholder="费率" size="mini"></el-input> 737 + <el-input v-model="form.rtd.rtd_rate_charge"
  738 + oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
  739 + auto-complete="off" placeholder="费率" size="mini"></el-input>
738 </el-form-item> 740 </el-form-item>
739 </el-col> 741 </el-col>
740 </el-row> 742 </el-row>
@@ -743,7 +745,9 @@ Handling Information @@ -743,7 +745,9 @@ Handling Information
743 <el-row style="margin-bottom: -5px"> 745 <el-row style="margin-bottom: -5px">
744 <el-col style="width: 95%"> 746 <el-col style="width: 95%">
745 <el-form-item> 747 <el-form-item>
746 - <el-input v-model="form.rtd.rtd_total" auto-complete="off" placeholder="总计" size="mini"></el-input> 748 + <el-input v-model="form.rtd.rtd_total"
  749 + oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
  750 + auto-complete="off" placeholder="总计" size="mini"></el-input>
747 </el-form-item> 751 </el-form-item>
748 </el-col> 752 </el-col>
749 </el-row> 753 </el-row>
@@ -1045,13 +1049,17 @@ Handling Information @@ -1045,13 +1049,17 @@ Handling Information
1045 <el-row> 1049 <el-row>
1046 <el-col :span="4"> 1050 <el-col :span="4">
1047 <el-form-item label-width="30px" prop="fhl.waybillNum"> 1051 <el-form-item label-width="30px" prop="fhl.waybillNum">
1048 - <el-input v-model="addForm.fhl.waybillNum" auto-complete="off" placeholder="主运单号(必填)" 1052 + <el-input v-model="addForm.fhl.waybillNum"
  1053 + oninput="this.value=this.value.replace(/[^0-9\-]/g,'').toUpperCase();"
  1054 + auto-complete="off" placeholder="主运单号(必填)"
1049 @blur="blur"></el-input> 1055 @blur="blur"></el-input>
1050 </el-form-item> 1056 </el-form-item>
1051 </el-col> 1057 </el-col>
1052 <el-col :span="4"> 1058 <el-col :span="4">
1053 <el-form-item label-width="40px" prop="hbs.hbs_serial_number"> 1059 <el-form-item label-width="40px" prop="hbs.hbs_serial_number">
1054 - <el-input v-model="addForm.hbs.hbs_serial_number" auto-complete="off" placeholder="分运单号(必填)" 1060 + <el-input v-model="addForm.hbs.hbs_serial_number"
  1061 + oninput="this.value=this.value.replace(/[^A-Za-z0-9]/g,'').toUpperCase();"
  1062 + auto-complete="off" placeholder="分运单号(必填)"
1055 onkeyup="this.value=this.value.toUpperCase()" 1063 onkeyup="this.value=this.value.toUpperCase()"
1056 ></el-input> 1064 ></el-input>
1057 </el-form-item> 1065 </el-form-item>
@@ -1543,10 +1551,10 @@ Handling Information @@ -1543,10 +1551,10 @@ Handling Information
1543 <el-row style="margin-bottom: -2px"> 1551 <el-row style="margin-bottom: -2px">
1544 <el-col style="width: 100%"> 1552 <el-col style="width: 100%">
1545 <el-form-item> 1553 <el-form-item>
1546 - <el-input disabled  
1547 - maxlength="195"  
1548 - type="textarea" :autosize="{ minRows: 2, maxRows: 4}"  
1549 - auto-complete="off" placeholder="处理信息" size="mini"></el-input> 1554 + <el-input v-model="addForm.txt.txt_free_text"
  1555 + maxlength="585"
  1556 + type="textarea" :autosize="{ minRows: 1, maxRows: 9}"
  1557 + auto-complete="off" placeholder="处理信息-Free Text"></el-input>
1550 </el-form-item> 1558 </el-form-item>
1551 </el-col> 1559 </el-col>
1552 </el-row> 1560 </el-row>
@@ -1707,7 +1715,7 @@ Handling Information @@ -1707,7 +1715,7 @@ Handling Information
1707 <el-row style="margin-bottom: -5px"> 1715 <el-row style="margin-bottom: -5px">
1708 <el-col style="width: 95%"> 1716 <el-col style="width: 95%">
1709 <el-form-item> 1717 <el-form-item>
1710 - <el-input disabled auto-complete="off" placeholder="其他" size="mini"></el-input> 1718 + <el-input v-model="addForm.hbs.hbs_slac" auto-complete="off" placeholder="SLAC"></el-input>
1711 </el-form-item> 1719 </el-form-item>
1712 </el-col> 1720 </el-col>
1713 </el-row> 1721 </el-row>
@@ -2336,7 +2344,7 @@ Handling Information @@ -2336,7 +2344,7 @@ Handling Information
2336 cvd_currency_code:'', 2344 cvd_currency_code:'',
2337 }, 2345 },
2338 hbs:{ 2346 hbs:{
2339 - hbs_origin:'', 2347 + hbs_origin:'CGO',
2340 hbs_destination:'', 2348 hbs_destination:'',
2341 hbs_manifest_description:'', 2349 hbs_manifest_description:'',
2342 hbs_pieces:'', 2350 hbs_pieces:'',
@@ -2433,6 +2441,7 @@ Handling Information @@ -2433,6 +2441,7 @@ Handling Information
2433 //删除行 2441 //删除行
2434 deleteRows(scope) { 2442 deleteRows(scope) {
2435 this.gridData.splice(scope.$index, 1); 2443 this.gridData.splice(scope.$index, 1);
  2444 + this.form.rtd.dimensions.splice(scope.$index,1);
2436 }, 2445 },
2437 //求体积 2446 //求体积
2438 handleEdit(index, row) { 2447 handleEdit(index, row) {