作者 小范

Merge remote-tracking branch 'origin/master'

... ... @@ -4,7 +4,7 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input size="small" v-model="filters.companyName" placeholder="公司名称">
<el-input size="small" v-model="filters.companyName" placeholder="收货人公司名称英文" clearable>
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
... ... @@ -26,13 +26,15 @@
</el-table-column>
<el-table-column label="序号" type="index">
</el-table-column>
<el-table-column prop="companyName" label="收货人公司" >
<el-table-column prop="conName" label="公司中文" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="conCity" label="收货人城市" >
<el-table-column prop="companyName" label="公司名称" >
</el-table-column>
<el-table-column prop="country" label="收货人国家代码" >
<el-table-column prop="conCity" label="城市" >
</el-table-column>
<el-table-column prop="conPhone" label="收货人电话" >
<el-table-column prop="country" label="国家代码" >
</el-table-column>
<el-table-column prop="conPhone" label="电话" >
</el-table-column>
<!-- <el-table-column prop="enterprise" label="收货人企业代码" >-->
<!-- </el-table-column>-->
... ... @@ -196,10 +198,9 @@
{ required: true, message: '不能为空!!!', trigger: 'blur' }
],
conPhone: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
{ type: 'number', message: '手机号格式不正确', trigger: 'blur',
{ type: 'number', message: '电话号码格式不正确,须为纯数字', trigger: 'blur',
transform(value){
var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
var phone = 11 && /^(\d+)$/
if (!phone.test(value)){
return false;
}else {
... ...
... ... @@ -4,7 +4,7 @@
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
<el-form :inline="true" :model="filters">
<el-form-item>
<el-input size="small" v-model="filters.companyName" placeholder="公司名称">
<el-input size="small" v-model="filters.companyName" placeholder="发货人公司名称英文" clearable>
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
... ... @@ -25,13 +25,15 @@
</el-table-column>
<el-table-column label="序号" type="index">
</el-table-column>
<el-table-column prop="companyName" label="收货人公司" >
<el-table-column prop="conName" label="公司中文" show-overflow-tooltip>
</el-table-column>
<el-table-column prop="conCity" label="收货人城市" >
<el-table-column prop="companyName" label="公司名称" >
</el-table-column>
<el-table-column prop="country" label="收货人国家代码" >
<el-table-column prop="conCity" label="城市" >
</el-table-column>
<el-table-column prop="conPhone" label="收货人电话" >
<el-table-column prop="country" label="国家代码" >
</el-table-column>
<el-table-column prop="conPhone" label="电话" >
</el-table-column>
<!-- <el-table-column prop="enterprise" label="收货人企业代码" >-->
<!-- </el-table-column>-->
... ... @@ -111,8 +113,8 @@
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conName">
<el-input v-model="conerForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">
<template slot="prepend" >收货人名称</template>
<el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small">
<template slot="prepend" >发货人名称</template>
</el-input>
</el-form-item>
</el-col>
... ... @@ -120,8 +122,8 @@
<el-row>
<el-col :span="8">
<el-form-item label="" prop="conAeo">
<el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">
<template slot="prepend" >收货人AEO</template>
<el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small">
<template slot="prepend" >发货人AEO</template>
</el-input>
</el-form-item>
</el-col>
... ... @@ -194,10 +196,9 @@
{ required: true, message: '不能为空!!!', trigger: 'blur' }
],
conPhone: [
{ required: true, message: '手机号不能为空', trigger: 'blur' },
{ type: 'number', message: '手机号格式不正确', trigger: 'blur',
{ type: 'number', message: '电话号格式不正确,须为纯数字', trigger: 'blur',
transform(value){
var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/
var phone = 11 && /^(\d+)$/
if (!phone.test(value)){
return false;
}else {
... ...
{
"nmmsVer": "1.40"
"nmmsVer": "1.41"
}
... ...