朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 86a92bb1532d6ce43294f6d12d4f9701129e20df 2 个父辈 0ee04400 4c02ea01

Merge remote-tracking branch 'origin/master'

内嵌 并排对比
正在显示 2 个修改的文件 包含 40 行增加 和 26 行删除
... ... @@ -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="收货人公司名称英文" clearable>
<el-input v-model="filters.companyName" placeholder="收货人公司名称英文" clearable>
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
... ... @@ -21,7 +21,7 @@
<el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
@current-change="handleCurrentChange"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" >
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="序号" type="index">
... ... @@ -58,14 +58,14 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="companyName">
<el-input v-model="coneeForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
<el-input v-model="coneeForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" >
<template slot="prepend" >公司</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conAddress">
<el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
<el-input v-model="coneeForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
<template slot="prepend" >地址</template>
</el-input>
</el-form-item>
... ... @@ -74,14 +74,14 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="conPhone">
<el-input v-model="coneeForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
<el-input v-model="coneeForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" >
<template slot="prepend" >电话</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conFax">
<el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
<el-input v-model="coneeForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
<template slot="prepend" >传真</template>
</el-input>
</el-form-item>
... ... @@ -91,14 +91,14 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="conPostcode">
<el-input v-model="coneeForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
<el-input v-model="coneeForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" >
<template slot="prepend" >邮编</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conCity">
<el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
<el-input v-model="coneeForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
<template slot="prepend" >城市</template>
</el-input>
</el-form-item>
... ... @@ -107,15 +107,15 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="country">
<el-input v-model="coneeForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
<el-input v-model="coneeForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" >
<template slot="prepend" >国家代码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conName">
<el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">
<template slot="prepend" >收货人名称</template>
<el-input v-model="coneeForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" >
<template slot="prepend" >中文名称</template>
</el-input>
</el-form-item>
</el-col>
... ... @@ -123,8 +123,15 @@
<el-row>
<el-col :span="8">
<el-form-item label="" prop="conAeo">
<el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">
<template slot="prepend" >收货人AEO</template>
<el-input v-model="coneeForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px">
<template slot="prepend" >AEO编码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="enterprise">
<el-input v-model="coneeForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
<template slot="prepend" >企业编码</template>
</el-input>
</el-form-item>
</el-col>
... ...
... ... @@ -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="发货人公司名称英文" clearable>
<el-input v-model="filters.companyName" placeholder="发货人公司名称英文" clearable>
<template slot="prepend">公司名称</template>
</el-input>
</el-form-item>
... ... @@ -20,7 +20,7 @@
<el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
@current-change="handleCurrentChange"
:header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
style="border-radius: 10px 10px 0px 0px;line-height: 25px;" >
<el-table-column type="selection" width="55">
</el-table-column>
<el-table-column label="序号" type="index">
... ... @@ -57,14 +57,14 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="companyName">
<el-input v-model="conerForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
<el-input v-model="conerForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" >
<template slot="prepend" >公司</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conAddress">
<el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
<el-input v-model="conerForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" >
<template slot="prepend" >地址</template>
</el-input>
</el-form-item>
... ... @@ -73,14 +73,14 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="conPhone">
<el-input v-model="conerForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
<el-input v-model="conerForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" >
<template slot="prepend" >电话</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conFax">
<el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
<el-input v-model="conerForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" >
<template slot="prepend" >传真</template>
</el-input>
</el-form-item>
... ... @@ -90,14 +90,14 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="conPostcode">
<el-input v-model="conerForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
<el-input v-model="conerForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" >
<template slot="prepend" >邮编</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="conCity">
<el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
<el-input v-model="conerForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" >
<template slot="prepend" >城市</template>
</el-input>
</el-form-item>
... ... @@ -106,15 +106,15 @@
<el-row>
<el-col :span="8" style="margin-right: 20px">
<el-form-item label="" prop="country">
<el-input v-model="conerForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
<el-input v-model="conerForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" >
<template slot="prepend" >国家代码</template>
</el-input>
</el-form-item>
</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" >
<template slot="prepend" >中文名称</template>
</el-input>
</el-form-item>
</el-col>
... ... @@ -122,8 +122,15 @@
<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">
<template slot="prepend" >AEO编码</template>
</el-input>
</el-form-item>
</el-col>
<el-col :span="8">
<el-form-item label="" prop="enterprise">
<el-input v-model="conerForm.enterprise" auto-complete="on" placeholder="企业编码" style="width:300px">
<template slot="prepend" >企业编码</template>
</el-input>
</el-form-item>
</el-col>
... ...