朱兆平 / vue_cli · 提交

转到一个项目

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

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

内嵌 并排对比
正在显示 1 个修改的文件 包含 32 行增加 和 23 行删除
... ... @@ -536,7 +536,7 @@
</el-row>
<!-- 收货人信息-->
<el-row style="padding-top: 10px">
<el-col :span="22" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 25px">
<el-col :span="12" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 25px">
<span style="font-size: 12px">
Notify Name and Address
<el-button type="primary" plain size="mini" style="margin-top: 5px" @click="getCneFwb()">通知人</el-button>
... ... @@ -580,7 +580,7 @@
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-row style="margin-bottom: -5px">
<el-col style="width: 80%">
<el-form-item>
<el-input minlength="1" maxlength="35"
... ... @@ -589,15 +589,9 @@
</el-form-item>
</el-col>
</el-row>
<el-row style="margin-bottom: -5px">
<el-col style="width: 80%">
<el-form-item>
<el-input minlength="1" maxlength="65" onkeyup="this.value=this.value.toUpperCase()"
@keyup.native="cne_oci.oci_csrc_info=cne_oci.oci_csrc_info.replace(/[^A-Za-z0-9_\s]/g,'')"
v-model="cne_oci.oci_csrc_info" auto-complete="off" placeholder="企业编码"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-col :span="10" style="border-right: 1px solid #a5a5a5;border-bottom:1px solid #a5a5a5;border-left:1px solid #a5a5a5;padding-left: 25px">
Also Notify Area
</el-col>
</el-row>
<!-- 处理信息-->
... ... @@ -673,7 +667,9 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input v-model="form.bill.quantity_picecs" auto-complete="off" placeholder="件数" size="mini"></el-input>
<el-input v-model="form.bill.quantity_picecs"
oninput="this.value=this.value.replace(/[^0-9]/g,'').trim();"
auto-complete="off" placeholder="件数1" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -682,7 +678,9 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input v-model="form.bill.quantity_weight" auto-complete="off" placeholder="重量（KG）" size="mini"></el-input>
<el-input v-model="form.bill.quantity_weight"
oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
auto-complete="off" placeholder="重量（KG）" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -725,7 +723,9 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input v-model="form.rtd.rtd_charge_weight" auto-complete="off" placeholder="计费重量" size="mini"></el-input>
<el-input v-model="form.rtd.rtd_charge_weight"
oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
auto-complete="off" placeholder="计费重量" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -734,7 +734,9 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input v-model="form.rtd.rtd_rate_charge" auto-complete="off" placeholder="费率" size="mini"></el-input>
<el-input v-model="form.rtd.rtd_rate_charge"
oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
auto-complete="off" placeholder="费率" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -743,7 +745,9 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input v-model="form.rtd.rtd_total" auto-complete="off" placeholder="总计" size="mini"></el-input>
<el-input v-model="form.rtd.rtd_total"
oninput="this.value=this.value.replace(/[^0-9\.]/g,'');"
auto-complete="off" placeholder="总计" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -1045,13 +1049,17 @@ Handling Information
<el-row>
<el-col :span="4">
<el-form-item label-width="30px" prop="fhl.waybillNum">
<el-input v-model="addForm.fhl.waybillNum" auto-complete="off" placeholder="主运单号(必填)"
<el-input v-model="addForm.fhl.waybillNum"
oninput="this.value=this.value.replace(/[^0-9\-]/g,'').toUpperCase();"
auto-complete="off" placeholder="主运单号(必填)"
@blur="blur"></el-input>
</el-form-item>
</el-col>
<el-col :span="4">
<el-form-item label-width="40px" prop="hbs.hbs_serial_number">
<el-input v-model="addForm.hbs.hbs_serial_number" auto-complete="off" placeholder="分运单号(必填)"
<el-input v-model="addForm.hbs.hbs_serial_number"
oninput="this.value=this.value.replace(/[^A-Za-z0-9]/g,'').toUpperCase();"
auto-complete="off" placeholder="分运单号(必填)"
onkeyup="this.value=this.value.toUpperCase()"
></el-input>
</el-form-item>
... ... @@ -1543,10 +1551,10 @@ Handling Information
<el-row style="margin-bottom: -2px">
<el-col style="width: 100%">
<el-form-item>
<el-input disabled
maxlength="195"
type="textarea" :autosize="{ minRows: 2, maxRows: 4}"
auto-complete="off" placeholder="处理信息" size="mini"></el-input>
<el-input v-model="addForm.txt.txt_free_text"
maxlength="585"
type="textarea" :autosize="{ minRows: 1, maxRows: 9}"
auto-complete="off" placeholder="处理信息-Free Text"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -1707,7 +1715,7 @@ Handling Information
<el-row style="margin-bottom: -5px">
<el-col style="width: 95%">
<el-form-item>
<el-input disabled auto-complete="off" placeholder="其他" size="mini"></el-input>
<el-input v-model="addForm.hbs.hbs_slac" auto-complete="off" placeholder="SLAC"></el-input>
</el-form-item>
</el-col>
</el-row>
... ... @@ -2336,7 +2344,7 @@ Handling Information
cvd_currency_code:'',
},
hbs:{
hbs_origin:'',
hbs_origin:'CGO',
hbs_destination:'',
hbs_manifest_description:'',
hbs_pieces:'',
... ... @@ -2433,6 +2441,7 @@ Handling Information
//删除行
deleteRows(scope) {
this.gridData.splice(scope.$index, 1);
this.form.rtd.dimensions.splice(scope.$index,1);
},
//求体积
handleEdit(index, row) {
... ...