朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 ba2ed0ed2f2c74959690c0dc09f1b102b02e509a 2 个父辈 76cdc449 5c5f52f6

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 3 个修改的文件 包含 23 行增加 和 21 行删除
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input size="small" v-model="filters.companyName" placeholder="公司名称"> 7 + <el-input size="small" v-model="filters.companyName" placeholder="收货人公司名称英文" clearable>
8 <template slot="prepend">公司名称</template> 8 <template slot="prepend">公司名称</template>
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
@@ -26,13 +26,15 @@ @@ -26,13 +26,15 @@
26 </el-table-column> 26 </el-table-column>
27 <el-table-column label="序号" type="index"> 27 <el-table-column label="序号" type="index">
28 </el-table-column> 28 </el-table-column>
29 - <el-table-column prop="companyName" label="收货人公司" > 29 + <el-table-column prop="conName" label="公司中文" show-overflow-tooltip>
30 </el-table-column> 30 </el-table-column>
31 - <el-table-column prop="conCity" label="收货人城市" > 31 + <el-table-column prop="companyName" label="公司名称" >
32 </el-table-column> 32 </el-table-column>
33 - <el-table-column prop="country" label="收货人国家代码" > 33 + <el-table-column prop="conCity" label="城市" >
34 </el-table-column> 34 </el-table-column>
35 - <el-table-column prop="conPhone" label="收货人电话" > 35 + <el-table-column prop="country" label="国家代码" >
  36 + </el-table-column>
  37 + <el-table-column prop="conPhone" label="电话" >
36 </el-table-column> 38 </el-table-column>
37 <!-- <el-table-column prop="enterprise" label="收货人企业代码" >--> 39 <!-- <el-table-column prop="enterprise" label="收货人企业代码" >-->
38 <!-- </el-table-column>--> 40 <!-- </el-table-column>-->
@@ -196,10 +198,9 @@ @@ -196,10 +198,9 @@
196 { required: true, message: '不能为空！！!', trigger: 'blur' } 198 { required: true, message: '不能为空！！!', trigger: 'blur' }
197 ], 199 ],
198 conPhone: [ 200 conPhone: [
199 - { required: true, message: '手机号不能为空', trigger: 'blur' },  
200 - { type: 'number', message: '手机号格式不正确', trigger: 'blur', 201 + { type: 'number', message: '电话号码格式不正确,须为纯数字', trigger: 'blur',
201 transform(value){ 202 transform(value){
202 - var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/ 203 + var phone = 11 && /^(\d+)$/
203 if (!phone.test(value)){ 204 if (!phone.test(value)){
204 return false; 205 return false;
205 }else { 206 }else {
@@ -4,7 +4,7 @@ @@ -4,7 +4,7 @@
4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 4 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
5 <el-form :inline="true" :model="filters"> 5 <el-form :inline="true" :model="filters">
6 <el-form-item> 6 <el-form-item>
7 - <el-input size="small" v-model="filters.companyName" placeholder="公司名称"> 7 + <el-input size="small" v-model="filters.companyName" placeholder="发货人公司名称英文" clearable>
8 <template slot="prepend">公司名称</template> 8 <template slot="prepend">公司名称</template>
9 </el-input> 9 </el-input>
10 </el-form-item> 10 </el-form-item>
@@ -25,13 +25,15 @@ @@ -25,13 +25,15 @@
25 </el-table-column> 25 </el-table-column>
26 <el-table-column label="序号" type="index"> 26 <el-table-column label="序号" type="index">
27 </el-table-column> 27 </el-table-column>
28 - <el-table-column prop="companyName" label="收货人公司" > 28 + <el-table-column prop="conName" label="公司中文" show-overflow-tooltip>
29 </el-table-column> 29 </el-table-column>
30 - <el-table-column prop="conCity" label="收货人城市" > 30 + <el-table-column prop="companyName" label="公司名称" >
31 </el-table-column> 31 </el-table-column>
32 - <el-table-column prop="country" label="收货人国家代码" > 32 + <el-table-column prop="conCity" label="城市" >
33 </el-table-column> 33 </el-table-column>
34 - <el-table-column prop="conPhone" label="收货人电话" > 34 + <el-table-column prop="country" label="国家代码" >
  35 + </el-table-column>
  36 + <el-table-column prop="conPhone" label="电话" >
35 </el-table-column> 37 </el-table-column>
36 <!-- <el-table-column prop="enterprise" label="收货人企业代码" >--> 38 <!-- <el-table-column prop="enterprise" label="收货人企业代码" >-->
37 <!-- </el-table-column>--> 39 <!-- </el-table-column>-->
@@ -111,8 +113,8 @@ @@ -111,8 +113,8 @@
111 </el-col> 113 </el-col>
112 <el-col :span="8"> 114 <el-col :span="8">
113 <el-form-item label="" prop="conName"> 115 <el-form-item label="" prop="conName">
114 - <el-input v-model="conerForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">  
115 - <template slot="prepend" >收货人名称</template> 116 + <el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small">
  117 + <template slot="prepend" >发货人名称</template>
116 </el-input> 118 </el-input>
117 </el-form-item> 119 </el-form-item>
118 </el-col> 120 </el-col>
@@ -120,8 +122,8 @@ @@ -120,8 +122,8 @@
120 <el-row> 122 <el-row>
121 <el-col :span="8"> 123 <el-col :span="8">
122 <el-form-item label="" prop="conAeo"> 124 <el-form-item label="" prop="conAeo">
123 - <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">  
124 - <template slot="prepend" >收货人AEO</template> 125 + <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small">
  126 + <template slot="prepend" >发货人AEO</template>
125 </el-input> 127 </el-input>
126 </el-form-item> 128 </el-form-item>
127 </el-col> 129 </el-col>
@@ -194,10 +196,9 @@ @@ -194,10 +196,9 @@
194 { required: true, message: '不能为空！！!', trigger: 'blur' } 196 { required: true, message: '不能为空！！!', trigger: 'blur' }
195 ], 197 ],
196 conPhone: [ 198 conPhone: [
197 - { required: true, message: '手机号不能为空', trigger: 'blur' },  
198 - { type: 'number', message: '手机号格式不正确', trigger: 'blur', 199 + { type: 'number', message: '电话号格式不正确,须为纯数字', trigger: 'blur',
199 transform(value){ 200 transform(value){
200 - var phone = 11 && /^((13|14|15|16|17|18|19)[0-9]{1}\d{8})$/ 201 + var phone = 11 && /^(\d+)$/
201 if (!phone.test(value)){ 202 if (!phone.test(value)){
202 return false; 203 return false;
203 }else { 204 }else {
1 { 1 {
2 - "nmmsVer": "1.40" 2 + "nmmsVer": "1.41"
3 } 3 }