作者 xudada

Merge branch 'master' into ExportOrder

... ... @@ -534,6 +534,72 @@
</span>
</el-col>
</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">
<span style="font-size: 12px">
Notify Name and Address
<el-button type="primary" plain size="mini" style="margin-top: 5px" @click="getCneFwb()">通知人</el-button>
</span>
<el-row>
<el-col style="width: 38%">
<el-form-item>
<el-input minlength="1" maxlength="35"
oninput="this.value=this.value.replace(/[^A-Za-z0-9_\S]/g,'').toUpperCase();"
v-model="form.nfy.nfy_name" auto-complete="off" placeholder="名称" size="mini"></el-input>
</el-form-item>
</el-col>
<el-col style="width: 40%;margin-left: 5px">
<el-form-item>
<el-input minlength="1" maxlength="25"
oninput="this.value=this.value.replace(/[^0-9]/g,'');"
v-model="nfy_contact.contact_number" auto-complete="off" placeholder="电话/传真" size="mini"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 25%">
<el-form-item>
<el-input minlength="1" maxlength="9"
oninput="this.value=this.value.replace(/[^0-9]/g,'');"
v-model="form.nfy.nfy_postcode" auto-complete="off" placeholder="邮编"></el-input>
</el-form-item>
</el-col>
<el-col style="width: 25%;margin-left: 10px">
<el-form-item>
<el-input minlength="1" maxlength="17"
oninput="this.value=this.value.replace(/[^A-Za-z0-9_\s]/g,'').toUpperCase();"
v-model="form.nfy.nfy_LOC_city" auto-complete="off" placeholder="城市"></el-input>
</el-form-item>
</el-col>
<el-col style="width: 25%;margin-left: 10px">
<el-form-item>
<el-input minlength="2" maxlength="2"
oninput="this.value=this.value.replace(/[^A-Z]/g,'').toUpperCase();"
v-model="form.nfy.nfy_country" auto-complete="off" placeholder="国家代码"></el-input>
</el-form-item>
</el-col>
</el-row>
<el-row>
<el-col style="width: 80%">
<el-form-item>
<el-input minlength="1" maxlength="35"
oninput="this.value=this.value.replace(/[^A-Z0-9_\s]/g,'').toUpperCase();"
v-model="form.nfy.nfy_ADR" auto-complete="off" placeholder="地址"></el-input>
</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>
</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: 5px">
... ... @@ -2584,6 +2650,7 @@ Handling Information
this.form.oci=[];
this.form.shp.shp_contacts=[];
this.form.cne.cne_contacts=[];
this.form.nfy.nfy_contacts = [];
this.shp_oci.oci_country_code=this.form.shp.shp_country;
this.cne_oci.oci_country_code=this.form.cne.cne_country;
this.form.acc.push(this.acc_info);
... ... @@ -2591,6 +2658,7 @@ Handling Information
this.form.shp.shp_contacts.push(this.shp_contact);
this.form.oci.push(this.cne_oci);
this.form.cne.cne_contacts.push(this.cne_contact);
this.form.nfy.nfy_contacts.push(this.nfy_contact);
/*进行表单的预验证*/
this.$refs.apply_formRef.validate(valid => {
// 未通过,表单预校验
... ...