朱兆平 / vue_cli · 提交

转到一个项目

作者 朱兆平
提交 077ba87b479a1450fccb9894662d95ddb561efb0 1 个父辈 5a8783d1

update: 修改收发货人联系电话校验部分

内嵌 并排对比
正在显示 2 个修改的文件 包含 36 行增加 和 22 行删除
@@ -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="收货人公司名称英文" clearable> 7 + <el-input 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>
@@ -21,7 +21,7 @@ @@ -21,7 +21,7 @@
21 <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" 21 <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
22 @current-change="handleCurrentChange" 22 @current-change="handleCurrentChange"
23 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" 23 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
24 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small"> 24 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" >
25 <el-table-column type="selection" width="55"> 25 <el-table-column type="selection" width="55">
26 </el-table-column> 26 </el-table-column>
27 <el-table-column label="序号" type="index"> 27 <el-table-column label="序号" type="index">
@@ -58,14 +58,14 @@ @@ -58,14 +58,14 @@
58 <el-row> 58 <el-row>
59 <el-col :span="8" style="margin-right: 20px"> 59 <el-col :span="8" style="margin-right: 20px">
60 <el-form-item label="" prop="companyName"> 60 <el-form-item label="" prop="companyName">
61 - <el-input v-model="coneeForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small"> 61 + <el-input v-model="coneeForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" >
62 <template slot="prepend" >公司</template> 62 <template slot="prepend" >公司</template>
63 </el-input> 63 </el-input>
64 </el-form-item> 64 </el-form-item>
65 </el-col> 65 </el-col>
66 <el-col :span="8"> 66 <el-col :span="8">
67 <el-form-item label="" prop="conAddress"> 67 <el-form-item label="" prop="conAddress">
68 - <el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small"> 68 + <el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
69 <template slot="prepend" >地址</template> 69 <template slot="prepend" >地址</template>
70 </el-input> 70 </el-input>
71 </el-form-item> 71 </el-form-item>
@@ -74,14 +74,14 @@ @@ -74,14 +74,14 @@
74 <el-row> 74 <el-row>
75 <el-col :span="8" style="margin-right: 20px"> 75 <el-col :span="8" style="margin-right: 20px">
76 <el-form-item label="" prop="conPhone"> 76 <el-form-item label="" prop="conPhone">
77 - <el-input v-model="coneeForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small"> 77 + <el-input v-model="coneeForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" >
78 <template slot="prepend" >电话</template> 78 <template slot="prepend" >电话</template>
79 </el-input> 79 </el-input>
80 </el-form-item> 80 </el-form-item>
81 </el-col> 81 </el-col>
82 <el-col :span="8"> 82 <el-col :span="8">
83 <el-form-item label="" prop="conFax"> 83 <el-form-item label="" prop="conFax">
84 - <el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small"> 84 + <el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
85 <template slot="prepend" >传真</template> 85 <template slot="prepend" >传真</template>
86 </el-input> 86 </el-input>
87 </el-form-item> 87 </el-form-item>
@@ -91,14 +91,14 @@ @@ -91,14 +91,14 @@
91 <el-row> 91 <el-row>
92 <el-col :span="8" style="margin-right: 20px"> 92 <el-col :span="8" style="margin-right: 20px">
93 <el-form-item label="" prop="conPostcode"> 93 <el-form-item label="" prop="conPostcode">
94 - <el-input v-model="coneeForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small"> 94 + <el-input v-model="coneeForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" >
95 <template slot="prepend" >邮编</template> 95 <template slot="prepend" >邮编</template>
96 </el-input> 96 </el-input>
97 </el-form-item> 97 </el-form-item>
98 </el-col> 98 </el-col>
99 <el-col :span="8"> 99 <el-col :span="8">
100 <el-form-item label="" prop="conCity"> 100 <el-form-item label="" prop="conCity">
101 - <el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small"> 101 + <el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
102 <template slot="prepend" >城市</template> 102 <template slot="prepend" >城市</template>
103 </el-input> 103 </el-input>
104 </el-form-item> 104 </el-form-item>
@@ -107,14 +107,14 @@ @@ -107,14 +107,14 @@
107 <el-row> 107 <el-row>
108 <el-col :span="8" style="margin-right: 20px"> 108 <el-col :span="8" style="margin-right: 20px">
109 <el-form-item label="" prop="country"> 109 <el-form-item label="" prop="country">
110 - <el-input v-model="coneeForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small"> 110 + <el-input v-model="coneeForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" >
111 <template slot="prepend" >国家代码</template> 111 <template slot="prepend" >国家代码</template>
112 </el-input> 112 </el-input>
113 </el-form-item> 113 </el-form-item>
114 </el-col> 114 </el-col>
115 <el-col :span="8"> 115 <el-col :span="8">
116 <el-form-item label="" prop="conName"> 116 <el-form-item label="" prop="conName">
117 - <el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small"> 117 + <el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" >
118 <template slot="prepend" >收货人名称</template> 118 <template slot="prepend" >收货人名称</template>
119 </el-input> 119 </el-input>
120 </el-form-item> 120 </el-form-item>
@@ -123,11 +123,18 @@ @@ -123,11 +123,18 @@
123 <el-row> 123 <el-row>
124 <el-col :span="8"> 124 <el-col :span="8">
125 <el-form-item label="" prop="conAeo"> 125 <el-form-item label="" prop="conAeo">
126 - <el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small"> 126 + <el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px">
127 <template slot="prepend" >收货人AEO</template> 127 <template slot="prepend" >收货人AEO</template>
128 </el-input> 128 </el-input>
129 </el-form-item> 129 </el-form-item>
130 </el-col> 130 </el-col>
  131 + <el-col :span="8">
  132 + <el-form-item label="" prop="enterprise">
  133 + <el-input v-model="coneeForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
  134 + <template slot="prepend" >企业编码</template>
  135 + </el-input>
  136 + </el-form-item>
  137 + </el-col>
131 </el-row> 138 </el-row>
132 </el-form> 139 </el-form>
133 <div slot="footer" class="dialog-footer" style="text-align: center"> 140 <div slot="footer" class="dialog-footer" style="text-align: center">
@@ -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="发货人公司名称英文" clearable> 7 + <el-input 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>
@@ -20,7 +20,7 @@ @@ -20,7 +20,7 @@
20 <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" 20 <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
21 @current-change="handleCurrentChange" 21 @current-change="handleCurrentChange"
22 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" 22 :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
23 - style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small"> 23 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" >
24 <el-table-column type="selection" width="55"> 24 <el-table-column type="selection" width="55">
25 </el-table-column> 25 </el-table-column>
26 <el-table-column label="序号" type="index"> 26 <el-table-column label="序号" type="index">
@@ -57,14 +57,14 @@ @@ -57,14 +57,14 @@
57 <el-row> 57 <el-row>
58 <el-col :span="8" style="margin-right: 20px"> 58 <el-col :span="8" style="margin-right: 20px">
59 <el-form-item label="" prop="companyName"> 59 <el-form-item label="" prop="companyName">
60 - <el-input v-model="conerForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small"> 60 + <el-input v-model="conerForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" >
61 <template slot="prepend" >公司</template> 61 <template slot="prepend" >公司</template>
62 </el-input> 62 </el-input>
63 </el-form-item> 63 </el-form-item>
64 </el-col> 64 </el-col>
65 <el-col :span="8"> 65 <el-col :span="8">
66 <el-form-item label="" prop="conAddress"> 66 <el-form-item label="" prop="conAddress">
67 - <el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small"> 67 + <el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
68 <template slot="prepend" >地址</template> 68 <template slot="prepend" >地址</template>
69 </el-input> 69 </el-input>
70 </el-form-item> 70 </el-form-item>
@@ -73,14 +73,14 @@ @@ -73,14 +73,14 @@
73 <el-row> 73 <el-row>
74 <el-col :span="8" style="margin-right: 20px"> 74 <el-col :span="8" style="margin-right: 20px">
75 <el-form-item label="" prop="conPhone"> 75 <el-form-item label="" prop="conPhone">
76 - <el-input v-model="conerForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small"> 76 + <el-input v-model="conerForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" >
77 <template slot="prepend" >电话</template> 77 <template slot="prepend" >电话</template>
78 </el-input> 78 </el-input>
79 </el-form-item> 79 </el-form-item>
80 </el-col> 80 </el-col>
81 <el-col :span="8"> 81 <el-col :span="8">
82 <el-form-item label="" prop="conFax"> 82 <el-form-item label="" prop="conFax">
83 - <el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small"> 83 + <el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
84 <template slot="prepend" >传真</template> 84 <template slot="prepend" >传真</template>
85 </el-input> 85 </el-input>
86 </el-form-item> 86 </el-form-item>
@@ -90,14 +90,14 @@ @@ -90,14 +90,14 @@
90 <el-row> 90 <el-row>
91 <el-col :span="8" style="margin-right: 20px"> 91 <el-col :span="8" style="margin-right: 20px">
92 <el-form-item label="" prop="conPostcode"> 92 <el-form-item label="" prop="conPostcode">
93 - <el-input v-model="conerForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small"> 93 + <el-input v-model="conerForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" >
94 <template slot="prepend" >邮编</template> 94 <template slot="prepend" >邮编</template>
95 </el-input> 95 </el-input>
96 </el-form-item> 96 </el-form-item>
97 </el-col> 97 </el-col>
98 <el-col :span="8"> 98 <el-col :span="8">
99 <el-form-item label="" prop="conCity"> 99 <el-form-item label="" prop="conCity">
100 - <el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small"> 100 + <el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
101 <template slot="prepend" >城市</template> 101 <template slot="prepend" >城市</template>
102 </el-input> 102 </el-input>
103 </el-form-item> 103 </el-form-item>
@@ -106,14 +106,14 @@ @@ -106,14 +106,14 @@
106 <el-row> 106 <el-row>
107 <el-col :span="8" style="margin-right: 20px"> 107 <el-col :span="8" style="margin-right: 20px">
108 <el-form-item label="" prop="country"> 108 <el-form-item label="" prop="country">
109 - <el-input v-model="conerForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small"> 109 + <el-input v-model="conerForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" >
110 <template slot="prepend" >国家代码</template> 110 <template slot="prepend" >国家代码</template>
111 </el-input> 111 </el-input>
112 </el-form-item> 112 </el-form-item>
113 </el-col> 113 </el-col>
114 <el-col :span="8"> 114 <el-col :span="8">
115 <el-form-item label="" prop="conName"> 115 <el-form-item label="" prop="conName">
116 - <el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small"> 116 + <el-input v-model="conerForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" >
117 <template slot="prepend" >发货人名称</template> 117 <template slot="prepend" >发货人名称</template>
118 </el-input> 118 </el-input>
119 </el-form-item> 119 </el-form-item>
@@ -122,11 +122,18 @@ @@ -122,11 +122,18 @@
122 <el-row> 122 <el-row>
123 <el-col :span="8"> 123 <el-col :span="8">
124 <el-form-item label="" prop="conAeo"> 124 <el-form-item label="" prop="conAeo">
125 - <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small"> 125 + <el-input v-model="conerForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px">
126 <template slot="prepend" >发货人AEO</template> 126 <template slot="prepend" >发货人AEO</template>
127 </el-input> 127 </el-input>
128 </el-form-item> 128 </el-form-item>
129 </el-col> 129 </el-col>
  130 + <el-col :span="8">
  131 + <el-form-item label="" prop="enterprise">
  132 + <el-input v-model="conerForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
  133 + <template slot="prepend" >企业编码</template>
  134 + </el-input>
  135 + </el-form-item>
  136 + </el-col>
130 </el-row> 137 </el-row>
131 </el-form> 138 </el-form>
132 <div slot="footer" class="dialog-footer" style="text-align: center"> 139 <div slot="footer" class="dialog-footer" style="text-align: center">