朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 6c634c48662e03b61c79a1b906ccee5755627cb2 1 个父辈 cff76975

代理人5个界面样式更新

内嵌 并排对比
正在显示 6 个修改的文件 包含 1062 行增加 和 584 行删除
@@ -24,7 +24,7 @@ module.exports = { @@ -24,7 +24,7 @@ module.exports = {
24 }, 24 },
25 dev: { 25 dev: {
26 env: require('./dev.env'), 26 env: require('./dev.env'),
27 - port: 12020, 27 + port: 12022,
28 autoOpenBrowser: true, 28 autoOpenBrowser: true,
29 assetsSubDirectory: 'static', 29 assetsSubDirectory: 'static',
30 assetsPublicPath: '/', 30 assetsPublicPath: '/',
@@ -7,16 +7,18 @@ @@ -7,16 +7,18 @@
7 <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input> 7 <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="primary" v-on:click="getConsigner()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 - <el-button type="primary" @click="companyAdd">新增</el-button> 13 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
14 </el-form-item> 14 </el-form-item>
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
17 17
18 <!--列表--> 18 <!--列表-->
19 - <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 19 + <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  20 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  21 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
20 <el-table-column type="selection" width="55"> 22 <el-table-column type="selection" width="55">
21 </el-table-column> 23 </el-table-column>
22 <el-table-column label="序号" type="index"> 24 <el-table-column label="序号" type="index">
@@ -33,49 +35,100 @@ @@ -33,49 +35,100 @@
33 </el-table-column> 35 </el-table-column>
34 <el-table-column label="操作" min-width="150"> 36 <el-table-column label="操作" min-width="150">
35 <template slot-scope="scope"> 37 <template slot-scope="scope">
36 - <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>  
37 - <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button> 38 + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
  39 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button>
38 </template> 40 </template>
39 </el-table-column> 41 </el-table-column>
40 </el-table> 42 </el-table>
41 43
42 <!--编辑界面--> 44 <!--编辑界面-->
43 - <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">  
44 - <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">  
45 - <el-form-item label="ID">  
46 - <span>{{editForm.id}}</span>  
47 - </el-form-item>  
48 - <el-form-item label="公司" prop="companyName">  
49 - <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司"></el-input>  
50 - </el-form-item>  
51 - <el-form-item label="收货人名称" prop="conName">  
52 - <el-input v-model="editForm.conName" auto-complete="on" placeholder="收货人名称"></el-input>  
53 - </el-form-item>  
54 - <el-form-item label="电话" prop="conPhone">  
55 - <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话"></el-input>  
56 - </el-form-item>  
57 - <el-form-item label="传真" prop="conFax">  
58 - <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真"></el-input>  
59 - </el-form-item>  
60 - <el-form-item label="国家代码" prop="country">  
61 - <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码"></el-input>  
62 - </el-form-item>  
63 - <el-form-item label="城市" prop="conCity">  
64 - <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市"></el-input>  
65 - </el-form-item>  
66 - <el-form-item label="邮编" prop="conPostcode">  
67 - <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>  
68 - </el-form-item>  
69 - <el-form-item label="地址" prop="conAddress">  
70 - <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址"></el-input>  
71 - </el-form-item>  
72 - <el-form-item label="收货人AEO" prop="conAeo">  
73 - <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="收货人AEO"></el-input>  
74 - </el-form-item> 45 + <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
  46 + <el-form :model="editForm" :rules="editFormRules" ref="editForm" label-width="145px" style="margin-top: -10px">
  47 + <el-row>
  48 + <el-col :span="4">
  49 + <el-form-item label="ID">
  50 + <span>{{editForm.id}}</span>
  51 + </el-form-item>
  52 + </el-col>
  53 + </el-row>
  54 + <el-row>
  55 + <el-col :span="8" style="margin-right: 20px">
  56 + <el-form-item label="" prop="companyName">
  57 + <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
  58 + <template slot="prepend" >公司</template>
  59 + </el-input>
  60 + </el-form-item>
  61 + </el-col>
  62 + <el-col :span="8">
  63 + <el-form-item label="" prop="conAddress">
  64 + <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
  65 + <template slot="prepend" >地址</template>
  66 + </el-input>
  67 + </el-form-item>
  68 + </el-col>
  69 + </el-row>
  70 + <el-row>
  71 + <el-col :span="8" style="margin-right: 20px">
  72 + <el-form-item label="" prop="conPhone">
  73 + <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
  74 + <template slot="prepend" >电话</template>
  75 + </el-input>
  76 + </el-form-item>
  77 + </el-col>
  78 + <el-col :span="8">
  79 + <el-form-item label="" prop="conFax">
  80 + <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
  81 + <template slot="prepend" >传真</template>
  82 + </el-input>
  83 + </el-form-item>
  84 + </el-col>
  85 + </el-row>
  86 +
  87 + <el-row>
  88 + <el-col :span="8" style="margin-right: 20px">
  89 + <el-form-item label="" prop="conPostcode">
  90 + <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
  91 + <template slot="prepend" >邮编</template>
  92 + </el-input>
  93 + </el-form-item>
  94 + </el-col>
  95 + <el-col :span="8">
  96 + <el-form-item label="" prop="conCity">
  97 + <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
  98 + <template slot="prepend" >城市</template>
  99 + </el-input>
  100 + </el-form-item>
  101 + </el-col>
  102 + </el-row>
  103 + <el-row>
  104 + <el-col :span="8" style="margin-right: 20px">
  105 + <el-form-item label="" prop="country">
  106 + <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
  107 + <template slot="prepend" >国家代码</template>
  108 + </el-input>
  109 + </el-form-item>
  110 + </el-col>
  111 + <el-col :span="8">
  112 + <el-form-item label="" prop="conName">
  113 + <el-input v-model="editForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">
  114 + <template slot="prepend" >收货人名称</template>
  115 + </el-input>
  116 + </el-form-item>
  117 + </el-col>
  118 + </el-row>
  119 + <el-row>
  120 + <el-col :span="8">
  121 + <el-form-item label="" prop="conAeo">
  122 + <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">
  123 + <template slot="prepend" >收货人AEO</template>
  124 + </el-input>
  125 + </el-form-item>
  126 + </el-col>
  127 + </el-row>
75 <el-row> 128 <el-row>
76 <el-col :span="6"> 129 <el-col :span="6">
77 - <el-form-item label="企业代码" prop="enterprise">  
78 - <el-select v-model="editForm.enterprise" placeholder="请选择"> 130 + <el-form-item label="" prop="enterprise">
  131 + <el-select v-model="editForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">
79 <el-option 132 <el-option
80 v-for="item in options" 133 v-for="item in options"
81 :key="item.value" 134 :key="item.value"
@@ -85,53 +138,103 @@ @@ -85,53 +138,103 @@
85 </el-select> 138 </el-select>
86 </el-form-item> 139 </el-form-item>
87 </el-col> 140 </el-col>
88 - <el-col :span="10"> 141 + <el-col :span="6">
89 <el-form-item label="+" prop="enterprise"> 142 <el-form-item label="+" prop="enterprise">
90 - <el-input v-model="editForm.ent"/> 143 + <el-input v-model="editForm.ent" style="width:200px" size="small"/>
91 </el-form-item> 144 </el-form-item>
92 </el-col> 145 </el-col>
93 </el-row> 146 </el-row>
94 </el-form> 147 </el-form>
95 - <div slot="footer" class="dialog-footer">  
96 - <el-button @click.native="editFormVisible = false">取消</el-button>  
97 - <el-button type="primary" @click.native="editSubmit">提交</el-button> 148 + <div slot="footer" class="dialog-footer" style="text-align: center">
  149 + <el-button @click.native="editFormVisible = false" style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" >取消</el-button>
  150 + <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit">提交</el-button>
98 </div> 151 </div>
99 </el-dialog> 152 </el-dialog>
100 153
101 <!--新增界面--> 154 <!--新增界面-->
102 - <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">  
103 - <el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm">  
104 - <el-form-item label="公司" prop="companyName">  
105 - <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司"></el-input>  
106 - </el-form-item>  
107 - <el-form-item label="收货人名称" prop="conName">  
108 - <el-input v-model="addForm.conName" auto-complete="on" placeholder="收货人名称"></el-input>  
109 - </el-form-item>  
110 - <el-form-item label="电话" prop="conPhone">  
111 - <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话"></el-input>  
112 - </el-form-item>  
113 - <el-form-item label="传真" prop="conFax">  
114 - <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真"></el-input>  
115 - </el-form-item>  
116 - <el-form-item label="国家代码" prop="country">  
117 - <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码"></el-input>  
118 - </el-form-item>  
119 - <el-form-item label="城市" prop="conCity">  
120 - <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市"></el-input>  
121 - </el-form-item>  
122 - <el-form-item label="邮编" prop="conPostcode">  
123 - <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>  
124 - </el-form-item>  
125 - <el-form-item label="地址" prop="conAddress">  
126 - <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址"></el-input>  
127 - </el-form-item>  
128 - <el-form-item label="收货人AEO" prop="conAeo">  
129 - <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="收货人AEO"></el-input>  
130 - </el-form-item> 155 + <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false" tyle="margin-top: -20px"
  156 + width="60%" text-align="center">
  157 + <el-form :model="addForm" label-width="145px" :rules="addFormRules" ref="addForm" style="margin-top: -10px" >
  158 + <el-row>
  159 + <el-col :span="8" style="margin-right: 20px">
  160 + <el-form-item label="" prop="companyName">
  161 + <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
  162 + <template slot="prepend" >公司</template>
  163 + </el-input>
  164 + </el-form-item>
  165 + </el-col>
  166 + <el-col :span="8">
  167 + <el-form-item label="" prop="conAddress">
  168 + <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
  169 + <template slot="prepend" >地址</template>
  170 + </el-input>
  171 + </el-form-item>
  172 + </el-col>
  173 + </el-row>
  174 + <el-row>
  175 + <el-col :span="8" style="margin-right: 20px">
  176 + <el-form-item label="" prop="conPhone">
  177 + <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
  178 + <template slot="prepend" >电话</template>
  179 + </el-input>
  180 + </el-form-item>
  181 + </el-col>
  182 + <el-col :span="8">
  183 + <el-form-item label="" prop="conFax">
  184 + <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
  185 + <template slot="prepend" >传真</template>
  186 + </el-input>
  187 + </el-form-item>
  188 + </el-col>
  189 + </el-row>
  190 +
  191 + <el-row>
  192 + <el-col :span="8" style="margin-right: 20px">
  193 + <el-form-item label="" prop="conPostcode">
  194 + <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
  195 + <template slot="prepend" >邮编</template>
  196 + </el-input>
  197 + </el-form-item>
  198 + </el-col>
  199 + <el-col :span="8">
  200 + <el-form-item label="" prop="conCity">
  201 + <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
  202 + <template slot="prepend" >城市</template>
  203 + </el-input>
  204 + </el-form-item>
  205 + </el-col>
  206 + </el-row>
  207 + <el-row>
  208 + <el-col :span="8" style="margin-right: 20px">
  209 + <el-form-item label="" prop="country">
  210 + <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
  211 + <template slot="prepend" >国家代码</template>
  212 + </el-input>
  213 + </el-form-item>
  214 + </el-col>
  215 + <el-col :span="8">
  216 + <el-form-item label="" prop="conAddress">
  217 + <el-form-item label="" prop="conName">
  218 + <el-input v-model="addForm.conName" auto-complete="on" placeholder="收货人名称" style="width:300px" size="small">
  219 + <template slot="prepend" >收货人名称</template>
  220 + </el-input>
  221 + </el-form-item>
  222 + </el-form-item>
  223 + </el-col>
  224 + </el-row>
  225 + <el-row>
  226 + <el-col :span="8">
  227 + <el-form-item label="" prop="conAeo">
  228 + <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="收货人AEO" style="width:300px" size="small">
  229 + <template slot="prepend" >收货人AEO</template>
  230 + </el-input>
  231 + </el-form-item>
  232 + </el-col>
  233 + </el-row>
131 <el-row> 234 <el-row>
132 <el-col :span="6"> 235 <el-col :span="6">
133 - <el-form-item label="企业代码" prop="enterprise">  
134 - <el-select v-model="addForm.enterprise" placeholder="请选择"> 236 + <el-form-item label="" prop="enterprise">
  237 + <el-select v-model="addForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">
135 <el-option 238 <el-option
136 v-for="item in options" 239 v-for="item in options"
137 :key="item.value" 240 :key="item.value"
@@ -141,16 +244,16 @@ @@ -141,16 +244,16 @@
141 </el-select> 244 </el-select>
142 </el-form-item> 245 </el-form-item>
143 </el-col> 246 </el-col>
144 - <el-col :span="10"> 247 + <el-col :span="6">
145 <el-form-item label="+" prop="enterprise"> 248 <el-form-item label="+" prop="enterprise">
146 - <el-input v-model="addForm.ent"/> 249 + <el-input v-model="addForm.ent" style="width:200px" size="small"/>
147 </el-form-item> 250 </el-form-item>
148 </el-col> 251 </el-col>
149 </el-row> 252 </el-row>
150 </el-form> 253 </el-form>
151 - <div slot="footer" class="dialog-footer">  
152 - <el-button @click.native="addFormVisible = false">取消</el-button>  
153 - <el-button type="primary" @click.native="addSubmit">提交</el-button> 254 + <div slot="footer" class="dialog-footer" style="text-align: center">
  255 + <el-button style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" @click.native="addFormVisible = false">取消</el-button>
  256 + <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit">提交</el-button>
154 </div> 257 </div>
155 </el-dialog> 258 </el-dialog>
156 </section> 259 </section>
@@ -436,4 +539,4 @@ @@ -436,4 +539,4 @@
436 }, 539 },
437 540
438 } 541 }
439 -</script>  
  542 +</script>
@@ -7,16 +7,18 @@ @@ -7,16 +7,18 @@
7 <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input> 7 <el-input v-model="filters.companyName" placeholder="关键字查询"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="primary" v-on:click="getConsigner()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getConsigner()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 - <el-button type="primary" @click="companyAdd">新增</el-button> 13 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
14 </el-form-item> 14 </el-form-item>
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
17 17
18 <!--列表--> 18 <!--列表-->
19 - <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 19 + <el-table :data="consignerList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  20 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  21 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small">
20 <el-table-column type="selection" width="55"> 22 <el-table-column type="selection" width="55">
21 </el-table-column> 23 </el-table-column>
22 <el-table-column label="序号" type="index"> 24 <el-table-column label="序号" type="index">
@@ -33,49 +35,100 @@ @@ -33,49 +35,100 @@
33 </el-table-column> 35 </el-table-column>
34 <el-table-column label="操作" min-width="150"> 36 <el-table-column label="操作" min-width="150">
35 <template slot-scope="scope"> 37 <template slot-scope="scope">
36 - <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>  
37 - <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button> 38 + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
  39 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button>
38 </template> 40 </template>
39 </el-table-column> 41 </el-table-column>
40 </el-table> 42 </el-table>
41 43
42 <!--编辑界面--> 44 <!--编辑界面-->
43 - <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">  
44 - <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">  
45 - <el-form-item label="ID">  
46 - <span>{{editForm.id}}</span>  
47 - </el-form-item>  
48 - <el-form-item label="公司" prop="companyName">  
49 - <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司"></el-input>  
50 - </el-form-item>  
51 - <el-form-item label="发货人名称" prop="conName">  
52 - <el-input v-model="editForm.conName" auto-complete="on" placeholder="发货人名称"></el-input>  
53 - </el-form-item>  
54 - <el-form-item label="电话" prop="conPhone">  
55 - <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话"></el-input>  
56 - </el-form-item>  
57 - <el-form-item label="传真" prop="conFax">  
58 - <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真"></el-input>  
59 - </el-form-item>  
60 - <el-form-item label="国家代码" prop="country">  
61 - <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码"></el-input>  
62 - </el-form-item>  
63 - <el-form-item label="城市" prop="conCity">  
64 - <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市"></el-input>  
65 - </el-form-item>  
66 - <el-form-item label="邮编" prop="conPostcode">  
67 - <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>  
68 - </el-form-item>  
69 - <el-form-item label="地址" prop="conAddress">  
70 - <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址"></el-input>  
71 - </el-form-item>  
72 - <el-form-item label="发货人AEO" prop="conAeo">  
73 - <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="发货人AEO"></el-input>  
74 - </el-form-item> 45 + <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
  46 + <el-form :model="editForm" :rules="editFormRules" ref="editForm" label-width="145px" style="margin-top: -10px">
  47 + <el-row>
  48 + <el-col :span="4">
  49 + <el-form-item label="ID">
  50 + <span>{{editForm.id}}</span>
  51 + </el-form-item>
  52 + </el-col>
  53 + </el-row>
  54 + <el-row>
  55 + <el-col :span="8" style="margin-right: 20px">
  56 + <el-form-item label="" prop="companyName">
  57 + <el-input v-model="editForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
  58 + <template slot="prepend" >公司</template>
  59 + </el-input>
  60 + </el-form-item>
  61 + </el-col>
  62 + <el-col :span="8">
  63 + <el-form-item label="" prop="conAddress">
  64 + <el-input v-model="editForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
  65 + <template slot="prepend" >地址</template>
  66 + </el-input>
  67 + </el-form-item>
  68 + </el-col>
  69 + </el-row>
  70 + <el-row>
  71 + <el-col :span="8" style="margin-right: 20px">
  72 + <el-form-item label="" prop="conPhone">
  73 + <el-input v-model="editForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
  74 + <template slot="prepend" >电话</template>
  75 + </el-input>
  76 + </el-form-item>
  77 + </el-col>
  78 + <el-col :span="8">
  79 + <el-form-item label="" prop="conFax">
  80 + <el-input v-model="editForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
  81 + <template slot="prepend" >传真</template>
  82 + </el-input>
  83 + </el-form-item>
  84 + </el-col>
  85 + </el-row>
  86 + <el-row>
  87 + <el-col :span="8" style="margin-right: 20px">
  88 + <el-form-item label="" prop="conPostcode">
  89 + <el-input v-model="editForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
  90 + <template slot="prepend" >邮编</template>
  91 + </el-input>
  92 + </el-form-item>
  93 + </el-col>
  94 + <el-col :span="8">
  95 + <el-form-item label="" prop="conCity">
  96 + <el-input v-model="editForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
  97 + <template slot="prepend" >城市</template>
  98 + </el-input>
  99 + </el-form-item>
  100 + </el-col>
  101 + </el-row>
  102 + <el-row>
  103 + <el-col :span="8" style="margin-right: 20px">
  104 + <el-form-item label="" prop="country">
  105 + <el-input v-model="editForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
  106 + <template slot="prepend" >国家代码</template>
  107 + </el-input>
  108 + </el-form-item>
  109 + </el-col>
  110 + <el-col :span="8">
  111 + <el-form-item label="" prop="conName">
  112 + <el-input v-model="editForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small">
  113 + <template slot="prepend" >发货人名称</template>
  114 + </el-input>
  115 + </el-form-item>
  116 + </el-col>
  117 +
  118 + </el-row>
  119 + <el-row>
  120 + <el-col :span="8">
  121 + <el-form-item label="" prop="conAeo">
  122 + <el-input v-model="editForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small">
  123 + <template slot="prepend" >发货人AEO</template>
  124 + </el-input>
  125 + </el-form-item>
  126 + </el-col>
  127 + </el-row>
75 <el-row> 128 <el-row>
76 <el-col :span="6"> 129 <el-col :span="6">
77 - <el-form-item label="企业代码" prop="enterprise">  
78 - <el-select v-model="editForm.enterprise" placeholder="请选择"> 130 + <el-form-item label="" prop="enterprise">
  131 + <el-select v-model="editForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">
79 <el-option 132 <el-option
80 v-for="item in options" 133 v-for="item in options"
81 :key="item.value" 134 :key="item.value"
@@ -85,53 +138,102 @@ @@ -85,53 +138,102 @@
85 </el-select> 138 </el-select>
86 </el-form-item> 139 </el-form-item>
87 </el-col> 140 </el-col>
88 - <el-col :span="10"> 141 + <el-col :span="6">
89 <el-form-item label="+" prop="enterprise"> 142 <el-form-item label="+" prop="enterprise">
90 - <el-input v-model="editForm.ent"/> 143 + <el-input v-model="editForm.ent" style="width:200px" size="small"></el-input>
91 </el-form-item> 144 </el-form-item>
92 </el-col> 145 </el-col>
93 </el-row> 146 </el-row>
94 </el-form> 147 </el-form>
95 - <div slot="footer" class="dialog-footer">  
96 - <el-button @click.native="editFormVisible = false">取消</el-button>  
97 - <el-button type="primary" @click.native="editSubmit" :loading="editLoading">提交</el-button> 148 + <div slot="footer" class="dialog-footer" style="text-align: center">
  149 + <el-button @click.native="editFormVisible = false" style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" >取消</el-button>
  150 + <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit" :loading="editLoading">提交</el-button>
98 </div> 151 </div>
99 </el-dialog> 152 </el-dialog>
100 153
101 <!--新增界面--> 154 <!--新增界面-->
102 - <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">  
103 - <el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm">  
104 - <el-form-item label="公司" prop="companyName">  
105 - <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司"></el-input>  
106 - </el-form-item>  
107 - <el-form-item label="发货人名称" prop="conName">  
108 - <el-input v-model="addForm.conName" auto-complete="on" placeholder="发货人名称"></el-input>  
109 - </el-form-item>  
110 - <el-form-item label="电话" prop="conPhone">  
111 - <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话"></el-input>  
112 - </el-form-item>  
113 - <el-form-item label="传真" prop="conFax">  
114 - <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真"></el-input>  
115 - </el-form-item>  
116 - <el-form-item label="国家代码" prop="country">  
117 - <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码"></el-input>  
118 - </el-form-item>  
119 - <el-form-item label="城市" prop="conCity">  
120 - <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市"></el-input>  
121 - </el-form-item>  
122 - <el-form-item label="邮编" prop="conPostcode">  
123 - <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编"></el-input>  
124 - </el-form-item>  
125 - <el-form-item label="地址" prop="conAddress">  
126 - <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址"></el-input>  
127 - </el-form-item>  
128 - <el-form-item label="发货人AEO" prop="conAeo">  
129 - <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="发货人AEO"></el-input>  
130 - </el-form-item> 155 + <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false" tyle="margin-top: -20px"
  156 + width="60%" text-align="center">
  157 + <el-form :model="addForm" label-width="145px" :rules="addFormRules" ref="addForm" style="margin-top: -10px" >
  158 + <el-row>
  159 + <el-col :span="8" style="margin-right: 20px">
  160 + <el-form-item label="" prop="companyName">
  161 + <el-input v-model="addForm.companyName" auto-complete="on" placeholder="公司" style="width:300px" size="small">
  162 + <template slot="prepend" >公司</template>
  163 + </el-input>
  164 + </el-form-item>
  165 + </el-col>
  166 + <el-col :span="8">
  167 + <el-form-item label="" prop="conAddress">
  168 + <el-input v-model="addForm.conAddress" auto-complete="on" placeholder="地址" style="width:300px" size="small">
  169 + <template slot="prepend" >地址</template>
  170 + </el-input>
  171 + </el-form-item>
  172 + </el-col>
  173 + </el-row>
  174 + <el-row>
  175 + <el-col :span="8" style="margin-right: 20px">
  176 + <el-form-item label="" prop="conPhone">
  177 + <el-input v-model="addForm.conPhone" auto-complete="on" placeholder="电话" style="width:300px" size="small">
  178 + <template slot="prepend" >电话</template>
  179 + </el-input>
  180 + </el-form-item>
  181 + </el-col>
  182 + <el-col :span="8">
  183 + <el-form-item label="" prop="conFax">
  184 + <el-input v-model="addForm.conFax" auto-complete="on" placeholder="传真" style="width:300px" size="small">
  185 + <template slot="prepend" >传真</template>
  186 + </el-input>
  187 + </el-form-item>
  188 + </el-col>
  189 + </el-row>
  190 + <el-row>
  191 + <el-col :span="8" style="margin-right: 20px">
  192 + <el-form-item label="" prop="conPostcode">
  193 + <el-input v-model="addForm.conPostcode" auto-complete="on" placeholder="邮编" style="width:300px" size="small">
  194 + <template slot="prepend" >邮编</template>
  195 + </el-input>
  196 + </el-form-item>
  197 + </el-col>
  198 + <el-col :span="8">
  199 + <el-form-item label="" prop="conCity">
  200 + <el-input v-model="addForm.conCity" auto-complete="on" placeholder="城市" style="width:300px" size="small">
  201 + <template slot="prepend" >城市</template>
  202 + </el-input>
  203 + </el-form-item>
  204 + </el-col>
  205 + </el-row>
  206 + <el-row>
  207 + <el-col :span="8" style="margin-right: 20px">
  208 + <el-form-item label="" prop="country">
  209 + <el-input v-model="addForm.country" auto-complete="on" placeholder="国家代码" style="width:300px" size="small">
  210 + <template slot="prepend" >国家代码</template>
  211 + </el-input>
  212 + </el-form-item>
  213 + </el-col>
  214 + <el-col :span="8">
  215 + <el-form-item label="" prop="conName">
  216 + <el-input v-model="addForm.conName" auto-complete="on" placeholder="发货人名称" style="width:300px" size="small">
  217 + <template slot="prepend" >发货人名称</template>
  218 + </el-input>
  219 + </el-form-item>
  220 + </el-col>
  221 +
  222 + </el-row>
  223 +
  224 + <el-row>
  225 + <el-col :span="8">
  226 + <el-form-item label="" prop="conAeo">
  227 + <el-input v-model="addForm.conAeo" auto-complete="on" placeholder="发货人AEO" style="width:300px" size="small">
  228 + <template slot="prepend" >发货人AEO</template>
  229 + </el-input>
  230 + </el-form-item>
  231 + </el-col>
  232 + </el-row>
131 <el-row> 233 <el-row>
132 <el-col :span="6"> 234 <el-col :span="6">
133 - <el-form-item label="企业代码" prop="enterprise">  
134 - <el-select v-model="addForm.enterprise" placeholder="请选择"> 235 + <el-form-item label="" prop="enterprise">
  236 + <el-select v-model="addForm.enterprise" placeholder="请选择企业代码" style="width:150px" size="small">
135 <el-option 237 <el-option
136 v-for="item in options" 238 v-for="item in options"
137 :key="item.value" 239 :key="item.value"
@@ -141,16 +243,16 @@ @@ -141,16 +243,16 @@
141 </el-select> 243 </el-select>
142 </el-form-item> 244 </el-form-item>
143 </el-col> 245 </el-col>
144 - <el-col :span="10"> 246 + <el-col :span="6">
145 <el-form-item label="+" prop="enterprise"> 247 <el-form-item label="+" prop="enterprise">
146 - <el-input v-model="addForm.ent"/> 248 + <el-input v-model="addForm.ent" style="width:200px" size="small"></el-input>
147 </el-form-item> 249 </el-form-item>
148 </el-col> 250 </el-col>
149 </el-row> 251 </el-row>
150 </el-form> 252 </el-form>
151 - <div slot="footer" class="dialog-footer">  
152 - <el-button @click.native="addFormVisible = false">取消</el-button>  
153 - <el-button type="primary" @click.native="addSubmit">提交</el-button> 253 + <div slot="footer" class="dialog-footer" style="text-align: center">
  254 + <el-button style="width: 120px;background-color: #6F8294;color: #ffffff" size="medium" @click.native="addFormVisible = false">取消</el-button>
  255 + <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit">提交</el-button>
154 </div> 256 </div>
155 </el-dialog> 257 </el-dialog>
156 </section> 258 </section>
@@ -436,4 +538,4 @@ @@ -436,4 +538,4 @@
436 }, 538 },
437 539
438 } 540 }
439 -</script>  
  541 +</script>
@@ -18,16 +18,17 @@ @@ -18,16 +18,17 @@
18 </el-date-picker> 18 </el-date-picker>
19 </el-form-item> 19 </el-form-item>
20 <el-form-item> 20 <el-form-item>
21 - <el-button type="primary" @click="getList()">查询</el-button> 21 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" @click="getList()">查询</el-button>
22 </el-form-item> 22 </el-form-item>
23 <el-form-item> 23 <el-form-item>
24 - <el-button type="primary" @click="expressAdd()">新增主单</el-button> 24 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="expressAdd()">新增主单</el-button>
25 </el-form-item> 25 </el-form-item>
26 </el-form> 26 </el-form>
27 </el-col> 27 </el-col>
28 <!--列表--> 28 <!--列表-->
29 <el-table :data="expressDate" 29 <el-table :data="expressDate"
30 - style="width: 100%" 30 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  31 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" size="small"
31 row-key="id" 32 row-key="id"
32 border 33 border
33 v-loading="listLoading" 34 v-loading="listLoading"
@@ -61,17 +62,27 @@ @@ -61,17 +62,27 @@
61 </el-table-column> 62 </el-table-column>
62 <el-table-column prop="" label="回执内容" width="180px"> 63 <el-table-column prop="" label="回执内容" width="180px">
63 </el-table-column> 64 </el-table-column>
64 - <el-table-column label="操作" align="center" fixed="right" width="330px"> 65 + <el-table-column label="操作" align="center" fixed="right" width="300px">
65 <template slot-scope="scope" > 66 <template slot-scope="scope" >
66 - <el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button>  
67 - <el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressEditAwbaAdd(scope.$index, scope.row)">编辑主单</el-button>  
68 - <el-button type="primary" size="mini" v-else @click="expressEditAwbhAdd(scope.$index, scope.row)">编辑分单</el-button>  
69 - <el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressBulidAbwa(scope.$index, scope.row)">发送主单报文</el-button>  
70 - <el-button type="primary" size="mini" v-else @click="expressBulidAbwh(scope.$index, scope.row)">发送分单报</el-button>  
71 - <br>  
72 - <br>  
73 - <el-button type="primary" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressEditBulidAbwa(scope.$index, scope.row)">发送修改主单表头报文</el-button>  
74 - <el-button type="primary" size="mini" v-else @click="expressEditBulidAbwh(scope.$index, scope.row)">发送追加表体分单报</el-button> 67 + <el-row>
  68 + <el-col :span="5" style="margin-right: 70px">
  69 + <el-button type="warning" icon="el-icon-plus" style="width: 110px" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressAwbhAdd(scope.$index, scope.row)">新增分单</el-button>
  70 + </el-col>
  71 + <el-col :span="5">
  72 + <el-button type="primary" icon="el-icon-edit" style="width: 150px" size="mini" v-if="scope.row.ext1 == 'awba'" @click="expressEditAwbaAdd(scope.$index, scope.row)">编辑主单</el-button>
  73 + <el-button type="primary" icon="el-icon-edit" style="width: 110px" size="mini" v-else @click="expressEditAwbhAdd(scope.$index, scope.row)">编辑分单</el-button>
  74 + </el-col>
  75 + </el-row>
  76 + <el-row>
  77 + <el-col :span="5" style="margin-right: 70px">
  78 + <el-button type="success" icon="el-icon-plus" size="mini" style="width: 110px" v-if="scope.row.ext1 == 'awba'" @click="expressBulidAbwa(scope.$index, scope.row)">发送主单报</el-button>
  79 + <el-button type="success" icon="el-icon-plus" size="mini" style="width: 110px" v-else @click="expressBulidAbwh(scope.$index, scope.row)">发送分单报</el-button>
  80 + </el-col>
  81 + <el-col :span="5">
  82 + <el-button type="danger" icon="el-icon-plus" size="mini" style="width: 150px" v-if="scope.row.ext1 == 'awba'" @click="expressEditBulidAbwa(scope.$index, scope.row)">发送修改主单表头报</el-button>
  83 + <el-button type="warning" icon="el-icon-plus" size="mini" style="width: 150px" v-else @click="expressEditBulidAbwh(scope.$index, scope.row)">发送追加表体分单报</el-button>
  84 + </el-col>
  85 + </el-row>
75 </template> 86 </template>
76 </el-table-column> 87 </el-table-column>
77 </el-table> 88 </el-table>
@@ -89,204 +100,259 @@ @@ -89,204 +100,259 @@
89 </el-pagination> 100 </el-pagination>
90 </el-col> 101 </el-col>
91 <!--新增主单弹框--> 102 <!--新增主单弹框-->
92 - <el-dialog :title="'快邮舱单'+awbatitle[dialogCommon]" :visible.sync="expressAwbaAddVisible" width="60%">  
93 - <el-form :model="expressAwbaAddModel" :rules="expressAwbaRules" ref="expressAwbaAddModel" > 103 + <el-dialog :title="'快邮舱单'+awbatitle[dialogCommon]" :visible.sync="expressAwbaAddVisible" width="80%">
  104 + <el-form :model="expressAwbaAddModel" :rules="expressAwbaRules" ref="expressAwbaAddModel" style="margin-left: -50px">
94 <el-row> 105 <el-row>
95 <el-col :span="8"> 106 <el-col :span="8">
96 - <el-form-item label="主单号" :label-width="expressAddlWidth" prop="billno">  
97 - <el-input style="width: 80%" v-if="dialogCommon == 'add'" v-model="expressAwbaAddModel.billno" autocomplete="off"></el-input>  
98 - <el-input style="width: 80%" v-else disabled v-model="expressAwbaAddModel.billno" autocomplete="off"></el-input> 107 + <el-form-item label="" :label-width="expressAddlWidth" prop="billno">
  108 + <el-input v-if="dialogCommon == 'add'" v-model="expressAwbaAddModel.billno" autocomplete="off" size="small">
  109 + <template slot="prepend" >主单号</template>
  110 + </el-input>
  111 + <el-input v-else disabled v-model="expressAwbaAddModel.billno" autocomplete="off" size="small">
  112 + <template slot="prepend" >主单号</template>
  113 + </el-input>
99 </el-form-item> 114 </el-form-item>
100 </el-col> 115 </el-col>
101 <el-col :span="8"> 116 <el-col :span="8">
102 - <el-form-item label="航班号" :label-width="expressAddlWidth" prop="flightNo">  
103 - <el-input style="width: 80%" v-model="expressAwbaAddModel.flightNo" autocomplete="off"></el-input> 117 + <el-form-item label="" :label-width="expressAddlWidth" prop="flightNo">
  118 + <el-input v-model="expressAwbaAddModel.flightNo" autocomplete="off" size="small">
  119 + <template slot="prepend" >航班号</template>
  120 + </el-input>
104 </el-form-item> 121 </el-form-item>
105 </el-col> 122 </el-col>
106 <el-col :span="8"> 123 <el-col :span="8">
107 - <el-form-item label="航班日期" :label-width="expressAddlWidth" prop="flightDate"> 124 + <el-form-item label="" :label-width="expressAddlWidth" prop="flightDate">
108 <el-date-picker 125 <el-date-picker
109 v-model="expressAwbaAddModel.flightDate" 126 v-model="expressAwbaAddModel.flightDate"
110 value-format="yyyy-MM-dd" 127 value-format="yyyy-MM-dd"
111 - type="date"  
112 - placeholder="选择日期"> 128 + type="date" size="small" style="width: 240px"
  129 + placeholder="选择航班日期">
113 </el-date-picker> 130 </el-date-picker>
114 </el-form-item> 131 </el-form-item>
115 </el-col> 132 </el-col>
116 </el-row> 133 </el-row>
117 <el-row> 134 <el-row>
118 <el-col :span="8"> 135 <el-col :span="8">
119 - <el-form-item label="进出口标志" :label-width="expressAddlWidth" prop="ieflag">  
120 - <el-select v-model="expressAwbaAddModel.ieflag" placeholder="请选择">  
121 - <el-option  
122 - v-for="item in options"  
123 - :key="item.value"  
124 - :label="item.label"  
125 - :value="item.value">  
126 - </el-option>  
127 - </el-select> 136 + <el-form-item label="" :label-width="expressAddlWidth" prop="grosswt">
  137 + <el-input v-model="expressAwbaAddModel.grosswt" autocomplete="off" size="small">
  138 + <template slot="prepend" >毛重</template>
  139 + </el-input>
128 </el-form-item> 140 </el-form-item>
129 </el-col> 141 </el-col>
130 <el-col :span="8"> 142 <el-col :span="8">
131 - <el-form-item label="运输工具中文名称" :label-width="expressAddlWidth" prop="trafcnname">  
132 - <el-input style="width: 80%" v-model="expressAwbaAddModel.trafcnname" autocomplete="off"></el-input> 143 + <el-form-item label="" :label-width="expressAddlWidth" prop="packno">
  144 + <el-input type="number" v-model="expressAwbaAddModel.packno" autocomplete="off" size="small">
  145 + <template slot="prepend" >件数</template>
  146 + </el-input>
133 </el-form-item> 147 </el-form-item>
134 </el-col> 148 </el-col>
135 <el-col :span="8"> 149 <el-col :span="8">
136 - <el-form-item label="运输工具英文名称" :label-width="expressAddlWidth" prop="trafenname">  
137 - <el-input style="width: 80%" v-model="expressAwbaAddModel.trafenname" autocomplete="off"></el-input> 150 + <el-form-item label="" :label-width="expressAddlWidth" prop="billnum">
  151 + <el-input type="number" v-model="expressAwbaAddModel.billnum" autocomplete="off" size="small">
  152 + <template slot="prepend" >分运单总数</template>
  153 + </el-input>
138 </el-form-item> 154 </el-form-item>
139 </el-col> 155 </el-col>
140 </el-row> 156 </el-row>
141 <el-row> 157 <el-row>
  158 +
142 <el-col :span="8"> 159 <el-col :span="8">
143 - <el-form-item label="毛重" :label-width="expressAddlWidth" prop="grosswt">  
144 - <el-input style="width: 80%" v-model="expressAwbaAddModel.grosswt" autocomplete="off"></el-input> 160 + <el-form-item label="" :label-width="expressAddlWidth" prop="trafcnname">
  161 + <el-input v-model="expressAwbaAddModel.trafcnname" autocomplete="off" size="small">
  162 + <template slot="prepend" >运输工具中文名称</template>
  163 + </el-input>
145 </el-form-item> 164 </el-form-item>
146 </el-col> 165 </el-col>
147 <el-col :span="8"> 166 <el-col :span="8">
148 - <el-form-item label="件数" :label-width="expressAddlWidth" prop="packno">  
149 - <el-input style="width: 80%" type="number" v-model="expressAwbaAddModel.packno" autocomplete="off"></el-input> 167 + <el-form-item label="" :label-width="expressAddlWidth" prop="trafenname">
  168 + <el-input v-model="expressAwbaAddModel.trafenname" autocomplete="off" size="small">
  169 + <template slot="prepend" >运输工具英文名称</template>
  170 + </el-input>
150 </el-form-item> 171 </el-form-item>
151 </el-col> 172 </el-col>
152 <el-col :span="8"> 173 <el-col :span="8">
153 - <el-form-item label="分运单总数" :label-width="expressAddlWidth" prop="billnum">  
154 - <el-input style="width: 80%" type="number" v-model="expressAwbaAddModel.billnum" autocomplete="off"></el-input> 174 + <el-form-item label="" :label-width="expressAddlWidth" prop="ieflag">
  175 + <el-select v-model="expressAwbaAddModel.ieflag" placeholder="请选择进出口标志" size="small" style="width: 240px">
  176 + <el-option
  177 + v-for="item in options"
  178 + :key="item.value"
  179 + :label="item.label"
  180 + :value="item.value"
  181 + >
  182 + </el-option>
  183 + </el-select>
155 </el-form-item> 184 </el-form-item>
156 </el-col> 185 </el-col>
157 </el-row> 186 </el-row>
158 <el-row> 187 <el-row>
159 <el-col :span="8"> 188 <el-col :span="8">
160 - <el-form-item label="运输方式代码" :label-width="expressAddlWidth" prop="trafmode">  
161 - <el-input style="width: 80%" v-model="expressAwbaAddModel.trafmode" autocomplete="off"></el-input> 189 + <el-form-item label="" :label-width="expressAddlWidth" prop="trafmode">
  190 + <el-input v-model="expressAwbaAddModel.trafmode" autocomplete="off" size="small">
  191 + <template slot="prepend" >运输方式代码</template>
  192 + </el-input>
  193 + </el-form-item>
  194 + </el-col>
  195 +
  196 + <el-col :span="8">
  197 + <el-form-item label="" :label-width="expressAddlWidth" prop="destinationport">
  198 + <el-input v-model="expressAwbaAddModel.destinationport" autocomplete="off" size="small">
  199 + <template slot="prepend" >指运港(抵运港)</template>
  200 + </el-input>
162 </el-form-item> 201 </el-form-item>
163 </el-col> 202 </el-col>
164 <el-col :span="8"> 203 <el-col :span="8">
165 - <el-form-item label="进出口日期" :label-width="expressAddlWidth" prop="iedate"> 204 + <el-form-item label="" :label-width="expressAddlWidth" prop="iedate">
166 <el-date-picker 205 <el-date-picker
167 v-model="expressAwbaAddModel.iedate" 206 v-model="expressAwbaAddModel.iedate"
168 value-format="yyyy-MM-dd" 207 value-format="yyyy-MM-dd"
169 - type="date"  
170 - placeholder="选择日期"> 208 + type="date" size="small" style="width: 240px"
  209 + placeholder="选择进出口日期">
171 </el-date-picker> 210 </el-date-picker>
172 </el-form-item> 211 </el-form-item>
173 </el-col> 212 </el-col>
174 - <el-col :span="8">  
175 - <el-form-item label="指运港(抵运港)" :label-width="expressAddlWidth" prop="destinationport">  
176 - <el-input style="width: 80%" v-model="expressAwbaAddModel.destinationport" autocomplete="off"></el-input>  
177 - </el-form-item>  
178 - </el-col>  
179 </el-row> 213 </el-row>
180 <el-row> 214 <el-row>
181 <el-col :span="8"> 215 <el-col :span="8">
182 - <el-form-item label="进出口岸代码" :label-width="expressAddlWidth" prop="ieport">  
183 - <el-input style="width: 80%" v-model="expressAwbaAddModel.ieport" autocomplete="off"></el-input> 216 + <el-form-item label="" :label-width="expressAddlWidth" prop="ieport">
  217 + <el-input v-model="expressAwbaAddModel.ieport" autocomplete="off" size="small">
  218 + <template slot="prepend" >进出口岸代码</template>
  219 + </el-input>
184 </el-form-item> 220 </el-form-item>
185 </el-col> 221 </el-col>
186 <el-col :span="8"> 222 <el-col :span="8">
187 - <el-form-item label="经营单位编号" :label-width="expressAddlWidth" prop="tradeco">  
188 - <el-input style="width: 80%" v-model="expressAwbaAddModel.tradeco" autocomplete="off"></el-input> 223 + <el-form-item label="" :label-width="expressAddlWidth" prop="tradeco">
  224 + <el-input v-model="expressAwbaAddModel.tradeco" autocomplete="off" size="small">
  225 + <template slot="prepend" >经营单位编号</template>
  226 + </el-input>
189 </el-form-item> 227 </el-form-item>
190 </el-col> 228 </el-col>
191 <el-col :span="8"> 229 <el-col :span="8">
192 - <el-form-item label="经营单位名称" :label-width="expressAddlWidth" prop="tradename">  
193 - <el-input style="width: 80%" type="textarea" v-model="expressAwbaAddModel.tradename" autocomplete="off"></el-input> 230 + <el-form-item label="" :label-width="expressAddlWidth" prop="tradename">
  231 + <el-input v-model="expressAwbaAddModel.tradename" autocomplete="off" size="small">
  232 + <template slot="prepend" >经营单位名称</template>
  233 + </el-input>
194 </el-form-item> 234 </el-form-item>
195 </el-col> 235 </el-col>
196 </el-row> 236 </el-row>
197 <el-row> 237 <el-row>
198 <el-col :span="8"> 238 <el-col :span="8">
199 - <el-form-item label="录入人卡号" :label-width="expressAddlWidth" prop="inputno">  
200 - <el-input style="width: 80%" v-model="expressAwbaAddModel.inputno" autocomplete="off"></el-input> 239 + <el-form-item label="" :label-width="expressAddlWidth" prop="inputno">
  240 + <el-input v-model="expressAwbaAddModel.inputno" autocomplete="off" size="small">
  241 + <template slot="prepend" >录入人卡号</template>
  242 + </el-input>
201 </el-form-item> 243 </el-form-item>
202 </el-col> 244 </el-col>
203 <el-col :span="8"> 245 <el-col :span="8">
204 - <el-form-item label="录入人姓名" :label-width="expressAddlWidth" prop="inputopname">  
205 - <el-input style="width: 80%" v-model="expressAwbaAddModel.inputopname" autocomplete="off"></el-input> 246 + <el-form-item label="" :label-width="expressAddlWidth" prop="inputopname">
  247 + <el-input v-model="expressAwbaAddModel.inputopname" autocomplete="off" size="small">
  248 + <template slot="prepend" >录入人姓名</template>
  249 + </el-input>
206 </el-form-item> 250 </el-form-item>
207 </el-col> 251 </el-col>
208 <el-col :span="8"> 252 <el-col :span="8">
209 - <el-form-item label="录入单位代码" :label-width="expressAddlWidth" prop="inputcompanycode">  
210 - <el-input style="width: 80%" v-model="expressAwbaAddModel.inputcompanycode" autocomplete="off"></el-input> 253 + <el-form-item label="" :label-width="expressAddlWidth" prop="inputcompanycode">
  254 + <el-input v-model="expressAwbaAddModel.inputcompanycode" autocomplete="off" size="small">
  255 + <template slot="prepend" >录入单位代码</template>
  256 + </el-input>
211 </el-form-item> 257 </el-form-item>
212 </el-col> 258 </el-col>
213 </el-row> 259 </el-row>
214 <el-row> 260 <el-row>
215 <el-col :span="8"> 261 <el-col :span="8">
216 - <el-form-item label="录入单位名称" :label-width="expressAddlWidth" prop="inputcompanyname">  
217 - <el-input style="width: 80%" type="textarea" v-model="expressAwbaAddModel.inputcompanyname" autocomplete="off"></el-input> 262 + <el-form-item label="" :label-width="expressAddlWidth" prop="inputcompanyname">
  263 + <el-input v-model="expressAwbaAddModel.inputcompanyname" autocomplete="off" size="small">
  264 + <template slot="prepend" >录入单位名称</template>
  265 + </el-input>
218 </el-form-item> 266 </el-form-item>
219 </el-col> 267 </el-col>
220 </el-row> 268 </el-row>
221 </el-form> 269 </el-form>
222 - <div slot="footer" class="dialog-footer">  
223 - <el-button type="primary" @click="expressAwbaAddVisible = false">取消</el-button>  
224 - <el-button type="primary" @click="dialogCommon=='add'?expressAwbaAddSubmit():expressAwbaEditSubmit()">提交</el-button> 270 + <div slot="footer" class="dialog-footer" style="text-align: center">
  271 + <el-button size="medium"
  272 + style="width: 100px;background-color: #6F8294;color: #ffffff" @click="expressAwbaAddVisible = false">取消</el-button>
  273 + <el-button type="primary" size="medium" style="width: 100px" @click="dialogCommon=='add'?expressAwbaAddSubmit():expressAwbaEditSubmit()">提交</el-button>
225 </div> 274 </div>
226 </el-dialog> 275 </el-dialog>
227 <!--新增分单弹框--> 276 <!--新增分单弹框-->
228 - <el-dialog :title="'快邮舱单'+awbhtitle[dialogCommon]" :visible.sync="expressAwbhAddVisible" width="60%">  
229 - <el-form :model="expressAwbhAddModel" :rules="expressAwbhRules" ref="expressAwbhAddModel" > 277 + <el-dialog :title="'快邮舱单'+awbhtitle[dialogCommon]" :visible.sync="expressAwbhAddVisible" width="80%">
  278 + <el-form :model="expressAwbhAddModel" :rules="expressAwbhRules" ref="expressAwbhAddModel">
230 <el-row> 279 <el-row>
231 <el-col :span="8"> 280 <el-col :span="8">
232 - <el-form-item label="主单号" :label-width="expressAddlWidth" prop="billno">  
233 - <el-input style="width: 80%" disabled v-model="expressAwbhAddModel.billno" autocomplete="off"></el-input> 281 + <el-form-item label="" :label-width="expressAddlWidth" prop="billno">
  282 + <el-input size="small" disabled v-model="expressAwbhAddModel.billno" autocomplete="off">
  283 + <template slot="prepend" >主单号</template>
  284 + </el-input>
234 </el-form-item> 285 </el-form-item>
235 </el-col> 286 </el-col>
236 <el-col :span="8"> 287 <el-col :span="8">
237 - <el-form-item label="航班号" :label-width="expressAddlWidth" prop="flightNo">  
238 - <el-input style="width: 80%" v-model="expressAwbhAddModel.flightNo" autocomplete="off"></el-input> 288 + <el-form-item label="" :label-width="expressAddlWidth" prop="flightNo">
  289 + <el-input size="small" v-model="expressAwbhAddModel.flightNo" autocomplete="off">
  290 + <template slot="prepend" >航班号</template>
  291 + </el-input>
239 </el-form-item> 292 </el-form-item>
240 </el-col> 293 </el-col>
241 <el-col :span="8"> 294 <el-col :span="8">
242 - <el-form-item label="航班日期" :label-width="expressAddlWidth" prop="flightDate"> 295 + <el-form-item label="" :label-width="expressAddlWidth" prop="flightDate">
243 <el-date-picker 296 <el-date-picker
244 v-model="expressAwbhAddModel.flightDate" 297 v-model="expressAwbhAddModel.flightDate"
245 value-format="yyyy-MM-dd" 298 value-format="yyyy-MM-dd"
246 - type="date"  
247 - placeholder="选择日期"> 299 + type="date" size="small"
  300 + placeholder="选择航班日期">
248 </el-date-picker> 301 </el-date-picker>
249 </el-form-item> 302 </el-form-item>
250 </el-col> 303 </el-col>
251 </el-row> 304 </el-row>
252 <el-row> 305 <el-row>
253 <el-col :span="8"> 306 <el-col :span="8">
254 - <el-form-item label="分单号" :label-width="expressAddlWidth" prop="assbillno">  
255 - <el-input style="width: 80%" v-model="expressAwbhAddModel.assbillno" autocomplete="off"></el-input> 307 + <el-form-item label="" :label-width="expressAddlWidth" prop="assbillno">
  308 + <el-input size="small" v-model="expressAwbhAddModel.assbillno" autocomplete="off">
  309 + <template slot="prepend" >分单号</template>
  310 + </el-input>
256 </el-form-item> 311 </el-form-item>
257 </el-col> 312 </el-col>
258 <el-col :span="8"> 313 <el-col :span="8">
259 - <el-form-item label="主要商品名称" :label-width="expressAddlWidth" prop="maingname">  
260 - <el-input style="width: 80%" type="textarea" v-model="expressAwbhAddModel.maingname" autocomplete="off"></el-input> 314 + <el-form-item label="" :label-width="expressAddlWidth" prop="tradetotal">
  315 + <el-input size="small" v-model="expressAwbhAddModel.tradetotal" autocomplete="off">
  316 + <template slot="prepend" >价值</template>
  317 + </el-input>
261 </el-form-item> 318 </el-form-item>
262 </el-col> 319 </el-col>
263 <el-col :span="8"> 320 <el-col :span="8">
264 - <el-form-item label="件数" :label-width="expressAddlWidth" prop="packno">  
265 - <el-input style="width: 80%" type="number" v-model="expressAwbhAddModel.packno" autocomplete="off"></el-input> 321 + <el-form-item label="" :label-width="expressAddlWidth" prop="packno">
  322 + <el-input size="small" type="number" v-model="expressAwbhAddModel.packno" autocomplete="off">
  323 + <template slot="prepend" >件数</template>
  324 + </el-input>
266 </el-form-item> 325 </el-form-item>
267 </el-col> 326 </el-col>
268 </el-row> 327 </el-row>
269 <el-row> 328 <el-row>
270 <el-col :span="8"> 329 <el-col :span="8">
271 - <el-form-item label="商品毛重" :label-width="expressAddlWidth" prop="grosswt">  
272 - <el-input style="width: 80%" v-model="expressAwbhAddModel.grosswt" autocomplete="off"></el-input> 330 + <el-form-item label="" :label-width="expressAddlWidth" prop="grosswt">
  331 + <el-input size="small" v-model="expressAwbhAddModel.grosswt" autocomplete="off">
  332 + <template slot="prepend" >商品毛重</template>
  333 + </el-input>
273 </el-form-item> 334 </el-form-item>
274 </el-col> 335 </el-col>
275 <el-col :span="8"> 336 <el-col :span="8">
276 - <el-form-item label="价值" :label-width="expressAddlWidth" prop="tradetotal">  
277 - <el-input style="width: 80%" v-model="expressAwbhAddModel.tradetotal" autocomplete="off"></el-input> 337 + <el-form-item label="" :label-width="expressAddlWidth" prop="maingname">
  338 + <el-input size="small" v-model="expressAwbhAddModel.maingname" autocomplete="off">
  339 + <template slot="prepend" >主要商品名称</template>
  340 + </el-input>
278 </el-form-item> 341 </el-form-item>
279 </el-col> 342 </el-col>
280 <el-col :span="8"> 343 <el-col :span="8">
281 - <el-form-item label="成交币制" :label-width="expressAddlWidth" prop="tradecurr">  
282 - <el-input style="width: 80%" v-model="expressAwbhAddModel.tradecurr" autocomplete="off"></el-input> 344 + <el-form-item label="" :label-width="expressAddlWidth" prop="tradecurr">
  345 + <el-input size="small" v-model="expressAwbhAddModel.tradecurr" autocomplete="off">
  346 + <template slot="prepend" >成交币制</template>
  347 + </el-input>
283 </el-form-item> 348 </el-form-item>
284 </el-col> 349 </el-col>
285 </el-row> 350 </el-row>
286 </el-form> 351 </el-form>
287 - <div slot="footer" class="dialog-footer">  
288 - <el-button type="primary" @click="expressAwbhAddVisible = false">取消</el-button>  
289 - <el-button type="primary" @click="dialogCommon=='add'?expressAwbhAddSubmit():expressAwbhEditSubmit()">提交</el-button> 352 + <div slot="footer" class="dialog-footer" style="text-align: center">
  353 + <el-button size="medium"
  354 + style="width: 100px;background-color: #6F8294;color: #ffffff" @click="expressAwbhAddVisible = false">取消</el-button>
  355 + <el-button type="primary" size="medium" style="width: 100px" @click="dialogCommon=='add'?expressAwbhAddSubmit():expressAwbhEditSubmit()">提交</el-button>
290 </div> 356 </div>
291 </el-dialog> 357 </el-dialog>
292 </section> 358 </section>
@@ -827,4 +893,4 @@ @@ -827,4 +893,4 @@
827 893
828 <style scoped> 894 <style scoped>
829 895
830 -</style>  
  896 +</style>
@@ -36,9 +36,9 @@ @@ -36,9 +36,9 @@
36 </div> 36 </div>
37 </el-col> 37 </el-col>
38 <div class="grid-content el-btn"> 38 <div class="grid-content el-btn">
39 - <el-button type="primary" size="mini" @click="handleSerach">查询</el-button> 39 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-search" @click="handleSerach">查询</el-button>
40 <el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary" 40 <el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary"
41 - size="mini" 41 + style="width:150px" size="medium" icon="el-icon-plus"
42 @click="handleAddpre">新增预配舱单 42 @click="handleAddpre">新增预配舱单
43 </el-button> 43 </el-button>
44 <el-upload 44 <el-upload
@@ -49,7 +49,7 @@ @@ -49,7 +49,7 @@
49 :on-exceed="fileExceed" 49 :on-exceed="fileExceed"
50 accept="application/vnd.ms-excel,application/vnd.ms-excels" 50 accept="application/vnd.ms-excel,application/vnd.ms-excels"
51 ref="fileupload"> 51 ref="fileupload">
52 - <el-button slot="trigger" size="small" type="primary">导入excel</el-button> 52 + <el-button slot="trigger" style="width:150px" size="medium" icon="el-icon-folder-add" type="success">导入excel</el-button>
53 </el-upload> 53 </el-upload>
54 </div> 54 </div>
55 </div> 55 </div>
@@ -62,7 +62,9 @@ @@ -62,7 +62,9 @@
62 </el-row> 62 </el-row>
63 </div> 63 </div>
64 64
65 - <el-table :data="preData" stripe style="font-size: 12px" stripe 65 + <el-table :data="preData" stripe
  66 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;" stripe
  67 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
66 @selection-change="handleSelectionChange" v-loading="listLoading" 68 @selection-change="handleSelectionChange" v-loading="listLoading"
67 default-expand-all 69 default-expand-all
68 row-key="uuid" 70 row-key="uuid"
@@ -125,25 +127,43 @@ @@ -125,25 +127,43 @@
125 {{scope.row.ext5}} 127 {{scope.row.ext5}}
126 </template> 128 </template>
127 </el-table-column> 129 </el-table-column>
128 - <el-table-column label="操作" width="450" fixed="right">  
129 - <template slot-scope="scope">  
130 - <el-button size="mini" @click="handleSend(scope.row)">收发明细</el-button>  
131 - <el-button size="mini" type="success" @click="handleEdit(scope.row)" >编辑</el-button>  
132 - <el-button size="mini" type="success" v-if="scope.row.awbh ===''"  
133 - @click="handleAddAwbh(scope.row)">新增分单  
134 - </el-button>  
135 - <el-button size="mini" type="primary" @click="handleAwbSend(scope.row)"  
136 - :disabled="addStatus(scope.row.status)">发送预配舱单报  
137 - </el-button>  
138 - <p></p>  
139 - <el-button size="mini" type="primary" @click="handleAwbEdit(scope.row)"  
140 - :disabled="editStatus(scope.row.status)">发送预配修改报</el-button>  
141 -<!-- <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>-->  
142 - <el-button size="mini" type="warning" @click="handleAwbStatus(scope.row)"  
143 - :disabled="scope.row.status === '22'">更改状态  
144 - </el-button>  
145 - <el-button size="mini" type="danger" @click="handleSendDelete(scope.row)"  
146 - :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button> 130 + <el-table-column label="操作" width="450px" fixed="right" align="center">
  131 + <template slot-scope="scope" >
  132 + <el-row>
  133 + <el-col :span="5" style="margin-right: 10px">
  134 + <el-button type="warning" icon="el-icon-view" size="mini"@click="handleSend(scope.row)">收发明细</el-button>
  135 + </el-col>
  136 + <el-col :span="4" style="margin-right: 30px">
  137 + <el-button type="primary" icon="el-icon-edit" style="width: 100px" size="mini" @click="handleEdit(scope.row)" >编辑</el-button>
  138 + </el-col>
  139 + <el-col :span="5" style="margin-right: 10px">
  140 + <el-button type="info" icon="el-icon-edit" size="mini" @click="handleAwbStatus(scope.row)"
  141 + :disabled="scope.row.status === '22'">更改状态
  142 + </el-button>
  143 + </el-col>
  144 + <el-col :span="5">
  145 + <el-button type="success" icon="el-icon-plus" size="mini" v-if="scope.row.awbh ===''"
  146 + @click="handleAddAwbh(scope.row)">新增分单
  147 + </el-button>
  148 + </el-col>
  149 + </el-row>
  150 + <el-row>
  151 + <el-col :span="7" style="margin-right: 10px">
  152 + <el-button type="success" icon="el-icon-plus" size="mini" style="width: 130px" @click="handleAwbSend(scope.row)"
  153 + :disabled="addStatus(scope.row.status)">发送预配舱单报
  154 + </el-button>
  155 + </el-col>
  156 + <el-col :span="7" style="margin-right: 10px">
  157 + <el-button type="primary" icon="el-icon-plus" size="mini" style="width: 130px" @click="handleAwbEdit(scope.row)"
  158 + :disabled="editStatus(scope.row.status)">发送预配修改报</el-button>
  159 + <!-- <el-button size="mini" type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>-->
  160 + </el-col>
  161 + <el-col :span="7">
  162 + <el-button type="danger" icon="el-icon-delete" size="mini" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row)"
  163 + :disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
  164 + </el-col>
  165 + </el-row>
  166 +
147 </template> 167 </template>
148 </el-table-column> 168 </el-table-column>
149 </el-table> 169 </el-table>
@@ -163,19 +183,23 @@ @@ -163,19 +183,23 @@
163 183
164 <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%"> 184 <el-dialog top="5vh" :title="dialogMap[dialogStatus]" :visible.sync="dialogFormVisible" width="90%">
165 <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right" 185 <el-form ref="preFormData" :model="preModel" :rules="preRoles" label-position="right"
166 - label-width="78px" size="mini" class="el-dialog-div" style="height: 90%"> 186 + label-width="80px" size="mini" class="el-dialog-div">
167 <div class="grid-content content" style="font-size: 10px"> 187 <div class="grid-content content" style="font-size: 10px">
168 运单信息 188 运单信息
169 </div> 189 </div>
170 <el-row> 190 <el-row>
171 <el-col :span="7.5"> 191 <el-col :span="7.5">
172 - <el-form-item label="主单号" prop="awba">  
173 - <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable/> 192 + <el-form-item label="" prop="awba">
  193 + <el-input :disabled="dialogStatus !== 'create'" v-model="awba" clearable>
  194 + <template slot="prepend" >主单号</template>
  195 + </el-input>
174 </el-form-item> 196 </el-form-item>
175 </el-col> 197 </el-col>
176 <el-col :span="7.5" v-if="fenStatus === 'addAwbh'"> 198 <el-col :span="7.5" v-if="fenStatus === 'addAwbh'">
177 - <el-form-item label="分单号" prop="awbh">  
178 - <el-input v-model="awbh" clearable/> 199 + <el-form-item label="" prop="awbh">
  200 + <el-input v-model="awbh" clearable>
  201 + <template slot="prepend" >分单号</template>
  202 + </el-input>
179 </el-form-item> 203 </el-form-item>
180 </el-col> 204 </el-col>
181 </el-row> 205 </el-row>
@@ -184,25 +208,29 @@ @@ -184,25 +208,29 @@
184 </div> 208 </div>
185 <el-row> 209 <el-row>
186 <el-col :span="7.5"> 210 <el-col :span="7.5">
187 - <el-form-item label="承运人" prop="carrier">  
188 - <el-input v-model="carrier" :disabled="fenStatus === 'addAwbh'" clearable/> 211 + <el-form-item label="" prop="carrier">
  212 + <el-input v-model="carrier" :disabled="fenStatus === 'addAwbh'" clearable>
  213 + <template slot="prepend" >承运人</template>
  214 + </el-input>
189 </el-form-item> 215 </el-form-item>
190 </el-col> 216 </el-col>
191 <el-col :span="7.5"> 217 <el-col :span="7.5">
192 - <el-form-item label="航班号" prop="flightno">  
193 - <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" clearable/> 218 + <el-form-item label="" prop="flightno">
  219 + <el-input v-model="flightno" :disabled="fenStatus === 'addAwbh'" clearable>
  220 + <template slot="prepend" >航班号</template>
  221 + </el-input>
194 </el-form-item> 222 </el-form-item>
195 </el-col> 223 </el-col>
196 <el-col :span="7.5"> 224 <el-col :span="7.5">
197 - <el-form-item label="航班日期" prop="flightdate"> 225 + <el-form-item label="" prop="flightdate">
198 <el-date-picker :disabled="fenStatus === 'addAwbh'" 226 <el-date-picker :disabled="fenStatus === 'addAwbh'"
199 - value-format="yyyy-MM-dd" 227 + value-format="yyyy-MM-dd" style="width: 270px"
200 v-model="preModel.flightdate" align="right" 228 v-model="preModel.flightdate" align="right"
201 type="date" placeholder="请输入航班日期" clearable/> 229 type="date" placeholder="请输入航班日期" clearable/>
202 </el-form-item> 230 </el-form-item>
203 </el-col> 231 </el-col>
204 <el-col :span="7.5"> 232 <el-col :span="7.5">
205 - <el-form-item label="起始站" prop="originstation"> 233 + <el-form-item label="" prop="originstation">
206 <el-select 234 <el-select
207 filterable 235 filterable
208 clearable 236 clearable
@@ -210,7 +238,8 @@ @@ -210,7 +238,8 @@
210 :remote-method="remoteMethodAirport" 238 :remote-method="remoteMethodAirport"
211 allow-create remote 239 allow-create remote
212 v-model="originstation" 240 v-model="originstation"
213 - :loading="airportLoading"> 241 + :loading="airportLoading"
  242 + style="width: 270px">
214 <el-option v-for="item in airportCode" 243 <el-option v-for="item in airportCode"
215 :key="item.airportid" :label="item.airportid" 244 :key="item.airportid" :label="item.airportid"
216 :value="item.airportid" :disabled="fenStatus === 'addAwbh'"> 245 :value="item.airportid" :disabled="fenStatus === 'addAwbh'">
@@ -221,9 +250,9 @@ @@ -221,9 +250,9 @@
221 </el-form-item> 250 </el-form-item>
222 </el-col> 251 </el-col>
223 <el-col :span="7.5"> 252 <el-col :span="7.5">
224 - <el-form-item label="目的站" prop="destinationstation"> 253 + <el-form-item label="" prop="destinationstation">
225 <el-select filterable clearable placeholder="请选择目的站" allow-create remote 254 <el-select filterable clearable placeholder="请选择目的站" allow-create remote
226 - v-model="destinationstation" :remote-method="remoteMethodAirport"> 255 + v-model="destinationstation" :remote-method="remoteMethodAirport" style="width: 270px">
227 <el-option v-for="item in airportCode" 256 <el-option v-for="item in airportCode"
228 :key="item.airportid" :label="item.airportid" 257 :key="item.airportid" :label="item.airportid"
229 :value="item.airportid" :disabled="fenStatus === 'addAwbh'" > 258 :value="item.airportid" :disabled="fenStatus === 'addAwbh'" >
@@ -239,34 +268,46 @@ @@ -239,34 +268,46 @@
239 </div> 268 </div>
240 <div> 269 <div>
241 <el-row> 270 <el-row>
242 - <el-col :span="3">  
243 - <el-form-item label="承运人" prop="carrier">  
244 - <el-input v-model="carrier" disabled clearable/> 271 + <el-col :span="5">
  272 + <el-form-item label="" prop="carrier">
  273 + <el-input v-model="carrier" disabled clearable>
  274 + <template slot="prepend" >承运人</template>
  275 + </el-input>
245 </el-form-item> 276 </el-form-item>
246 </el-col> 277 </el-col>
247 - <el-col :span="3">  
248 - <el-form-item label="到达航站" prop="destinationstation">  
249 - <el-input v-model="destinationstation" disabled clearable/> 278 + <el-col :span="5">
  279 + <el-form-item label="" prop="destinationstation">
  280 + <el-input v-model="destinationstation" disabled clearable>
  281 + <template slot="prepend" >到达航站</template>
  282 + </el-input>
250 </el-form-item> 283 </el-form-item>
251 </el-col> 284 </el-col>
252 - <el-col :span="3">  
253 - <el-form-item label="承运人1">  
254 - <el-input v-model="by1" clearable/> 285 + <el-col :span="5">
  286 + <el-form-item label="">
  287 + <el-input v-model="by1" clearable>
  288 + <template slot="prepend" >承运人1</template>
  289 + </el-input>
255 </el-form-item> 290 </el-form-item>
256 </el-col> 291 </el-col>
257 - <el-col :span="3">  
258 - <el-form-item label="到达航站1">  
259 - <el-input v-model="dest1" clearable></el-input> 292 + <el-col :span="5">
  293 + <el-form-item label="">
  294 + <el-input v-model="dest1" clearable>
  295 + <template slot="prepend" >到达航站1</template>
  296 + </el-input>
260 </el-form-item> 297 </el-form-item>
261 </el-col> 298 </el-col>
262 - <el-col :span="3">  
263 - <el-form-item label="承运人2">  
264 - <el-input v-model="by2" clearable/> 299 + <el-col :span="5">
  300 + <el-form-item label="">
  301 + <el-input v-model="by2" clearable>
  302 + <template slot="prepend" >承运人2</template>
  303 + </el-input>
265 </el-form-item> 304 </el-form-item>
266 </el-col> 305 </el-col>
267 - <el-col :span="3">  
268 - <el-form-item label="到达航站2">  
269 - <el-input v-model="dest2" clearable/> 306 + <el-col :span="5">
  307 + <el-form-item label="">
  308 + <el-input v-model="dest2" clearable>
  309 + <template slot="prepend" >到达航站2</template>
  310 + </el-input>
270 </el-form-item> 311 </el-form-item>
271 </el-col> 312 </el-col>
272 </el-row> 313 </el-row>
@@ -275,60 +316,64 @@ @@ -275,60 +316,64 @@
275 货物信息 316 货物信息
276 </div> 317 </div>
277 <el-row> 318 <el-row>
278 - <el-col :span="3">  
279 - <el-form-item label="运单件数" prop="awbinfo.pcs">  
280 - <el-input v-model="preModel.awbinfo.pcs" clearable/> 319 + <el-col :span="5">
  320 + <el-form-item label="" prop="awbinfo.pcs">
  321 + <el-input v-model="preModel.awbinfo.pcs" clearable>
  322 + <template slot="prepend" >运单件数</template>
  323 + </el-input>
281 </el-form-item> 324 </el-form-item>
282 </el-col> 325 </el-col>
283 - <el-col :span="3">  
284 - <el-form-item label="运单重量" prop="awbinfo.weight">  
285 - <el-input v-model="preModel.awbinfo.weight" clearable/> 326 + <el-col :span="5">
  327 + <el-form-item label="" prop="awbinfo.weight">
  328 + <el-input v-model="preModel.awbinfo.weight" clearable>
  329 + <template slot="prepend" >运单重量</template>
  330 + </el-input>
286 </el-form-item> 331 </el-form-item>
287 </el-col> 332 </el-col>
288 - <el-col :span="3">  
289 - <el-form-item label="货物描述" prop="goodsname">  
290 - <el-input v-model="goodsname" clearable/> 333 + <el-col :span="5">
  334 + <el-form-item label="" prop="goodsname">
  335 + <el-input v-model="goodsname" clearable>
  336 + <template slot="prepend" >货物描述</template>
  337 + </el-input>
291 </el-form-item> 338 </el-form-item>
292 </el-col> 339 </el-col>
293 - <el-col :span="3" v-if="fenStatus !=='addAwbh'">  
294 - <el-form-item label="预配件数" prop="piece">  
295 - <el-input v-model="preModel.piece" clearable/> 340 + <el-col :span="5" v-if="fenStatus !=='addAwbh'">
  341 + <el-form-item label="" prop="piece">
  342 + <el-input v-model="preModel.piece" clearable>
  343 + <template slot="prepend" >预配件数</template>
  344 + </el-input>
296 </el-form-item> 345 </el-form-item>
297 </el-col> 346 </el-col>
298 - <el-col :span="3" v-if="fenStatus ==='addAwbh'">  
299 - <el-form-item label="预配件数" prop="piece">  
300 - <el-input v-model="preModel.piece" clearable/> 347 + <el-col :span="5" v-if="fenStatus ==='addAwbh'">
  348 + <el-form-item label="" prop="piece">
  349 + <el-input v-model="preModel.piece" clearable>
  350 + <template slot="prepend" >预配件数</template>
  351 + </el-input>
301 </el-form-item> 352 </el-form-item>
302 </el-col> 353 </el-col>
303 - <el-col :span="1.5" v-if="fenStatus ==='addAwbh'">  
304 - <span>剩余件数:{{awbPiece}}</span>  
305 - </el-col>  
306 -  
307 - <el-col :span="3" v-if="fenStatus !=='addAwbh'">  
308 - <el-form-item label="预配重量" prop="weight">  
309 - <el-input v-model="preModel.weight" clearable/> 354 + <el-col :span="5" v-if="fenStatus !=='addAwbh'">
  355 + <el-form-item label="" prop="weight">
  356 + <el-input v-model="preModel.weight" clearable>
  357 + <template slot="prepend" >预配重量</template>
  358 + </el-input>
310 </el-form-item> 359 </el-form-item>
311 </el-col> 360 </el-col>
312 - <el-col :span="3" v-if="fenStatus ==='addAwbh'">  
313 - <el-form-item label="预配重量" prop="weight">  
314 - <el-input v-model="preModel.weight" clearable/> 361 + <el-col :span="5" v-if="fenStatus ==='addAwbh'">
  362 + <el-form-item label="" prop="weight">
  363 + <el-input v-model="preModel.weight" clearable>
  364 + <template slot="prepend" >预配重量</template>
  365 + </el-input>
315 </el-form-item> 366 </el-form-item>
316 </el-col> 367 </el-col>
317 - <el-col :span="1.5" v-if="fenStatus ==='addAwbh'">  
318 - <span>剩余重量:{{awbWeight}}</span>  
319 - </el-col>  
320 -  
321 - <el-col :span="3">  
322 - <el-form-item label="预配时间" prop="actime"> 368 + <el-col :span="5">
  369 + <el-form-item label="" prop="actime">
323 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" 370 <el-date-picker value-format="yyyy-MM-dd HH:mm:ss"
324 - v-model="preModel.actime" align="right"  
325 - type="datetime" placeholder="请选择"/> 371 + v-model="preModel.actime" align="right" style="width: 180px"
  372 + type="datetime" placeholder="请选择预配时间"/>
326 </el-form-item> 373 </el-form-item>
327 </el-col> 374 </el-col>
328 - </el-row>  
329 - <el-row>  
330 - <el-col :span="3">  
331 - <el-form-item label="关区代码" prop="customcode"> 375 + <el-col :span="5">
  376 + <el-form-item label="" prop="customcode">
332 <el-select v-model="preModel.customcode" placeholder="请选择关区代码" 377 <el-select v-model="preModel.customcode" placeholder="请选择关区代码"
333 filterable clearable :remote-method="remoteMethodCustomCode" :loading="customLoading" remote 378 filterable clearable :remote-method="remoteMethodCustomCode" :loading="customLoading" remote
334 :disabled="fenStatus === 'addAwbh'"> 379 :disabled="fenStatus === 'addAwbh'">
@@ -340,78 +385,98 @@ @@ -340,78 +385,98 @@
340 </el-select> 385 </el-select>
341 </el-form-item> 386 </el-form-item>
342 </el-col> 387 </el-col>
343 - <el-col :span="3">  
344 - <el-form-item label="海关状态"> 388 + <el-col :span="5">
  389 + <el-form-item label="">
345 <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" placeholder="请录入货物类型"> 390 <el-select v-model="preModel.awbinfo.awbtype" class="filter-item" placeholder="请录入货物类型">
346 - <el-option v-for="item in customTypes" :key="item.value" :label="item.label"  
347 - :value="item.value"/> 391 + <el-option v-for="item in customTypes" :key="item.value"
  392 + :label="item.label"
  393 + :value="item.value">
  394 + </el-option>
348 </el-select> 395 </el-select>
349 </el-form-item> 396 </el-form-item>
350 </el-col> 397 </el-col>
351 - <el-col :span="3">  
352 - <el-form-item label="付费方式" prop="awbinfo.paymodel">  
353 - <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="付费方式"> 398 + <el-col :span="5">
  399 + <el-form-item label="" prop="awbinfo.paymodel">
  400 + <el-select v-model="preModel.awbinfo.paymodel" class="filter-item" placeholder="请选择付费方式">
354 <el-option 401 <el-option
355 v-for="item in payTypes" 402 v-for="item in payTypes"
356 :key="item.value" 403 :key="item.value"
357 :label="item.label" 404 :label="item.label"
358 - :value="item.value"/> 405 + :value="item.value">
  406 + </el-option>
359 </el-select> 407 </el-select>
360 </el-form-item> 408 </el-form-item>
361 </el-col> 409 </el-col>
362 - <el-col :span="3">  
363 - <el-form-item label="卸货地" prop="">  
364 - <el-input v-model="specopeid" clearable/> 410 + <el-col :span="5">
  411 + <el-form-item label="" prop="">
  412 + <el-input v-model="specopeid" clearable>
  413 + <template slot="prepend" >卸货地</template>
  414 + </el-input>
365 </el-form-item> 415 </el-form-item>
366 </el-col> 416 </el-col>
367 - <el-col :span="3">  
368 - <el-form-item label-width="95px" label="代理人代码" prop="">  
369 - <el-input v-model="preModel.awbinfo.shpcustomerid" clearable/> 417 + <el-col :span="5">
  418 + <el-form-item label="" prop="">
  419 + <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>
  420 + <template slot="prepend" >代理人代码</template>
  421 + </el-input>
370 </el-form-item> 422 </el-form-item>
371 </el-col> 423 </el-col>
372 - <el-col :span="3">  
373 - <el-form-item label-width="95px" label="代理人名称" prop="">  
374 - <el-input v-model="preModel.awbinfo.shpcustomerid" clearable/> 424 + <el-col :span="5">
  425 + <el-form-item label="" prop="">
  426 + <el-input v-model="preModel.awbinfo.shpcustomerid" clearable>
  427 + <template slot="prepend" >代理人名称</template>
  428 + </el-input>
375 </el-form-item> 429 </el-form-item>
376 </el-col> 430 </el-col>
377 </el-row> 431 </el-row>
  432 + <el-row style="margin-bottom: 10px">
  433 + <el-col :span="7" v-if="fenStatus ==='addAwbh'">
  434 + <span>
  435 + 货物剩余信息：
  436 + </span>
  437 + </el-col>
  438 + <el-col :span="7" v-if="fenStatus ==='addAwbh'">
  439 + <span>剩余件数:{{awbPiece}}</span>
  440 + </el-col>
  441 + <el-col :span="7" v-if="fenStatus ==='addAwbh'">
  442 + <span>剩余重量:{{awbWeight}}</span>
  443 + </el-col>
  444 + </el-row>
378 <div class="grid-content content" style="font-size: 10px"> 445 <div class="grid-content content" style="font-size: 10px">
379 发货人信息 446 发货人信息
380 - <el-button type="success" @click="consignerSelect()">选择发货人信息</el-button> 447 + <el-button type="primary" size="mini" @click="consignerSelect()">选择发货人信息</el-button>
381 </div> 448 </div>
382 <el-row> 449 <el-row>
383 - <el-col :span="3">  
384 - <el-form-item label-width="95px" label="发货人名称" prop="awbinfo.shprname">  
385 - <el-input v-model="shprname" clearable/> 450 + <el-col :span="5">
  451 + <el-form-item label="" prop="awbinfo.shprname">
  452 + <el-input v-model="shprname" clearable>
  453 + <template slot="prepend" >发货人名称</template>
  454 + </el-input>
386 </el-form-item> 455 </el-form-item>
387 </el-col> 456 </el-col>
388 - <el-col :span="3">  
389 - <el-form-item label="地址" prop="awbinfo.shpraddress">  
390 - <el-input style="width: 100px" v-model="shpraddress" clearable/> 457 + <el-col :span="5">
  458 + <el-form-item label="" prop="awbinfo.shpraddress">
  459 + <el-input v-model="shpraddress" clearable>
  460 + <template slot="prepend" >地址</template>
  461 + </el-input>
391 </el-form-item> 462 </el-form-item>
392 </el-col> 463 </el-col>
393 - <el-col :span="2">  
394 - <el-form-item label="城市代码">  
395 - <el-input style="width: 100px" v-model="scityid" maxlength="5" clearable/> 464 + <el-col :span="5">
  465 + <el-form-item label="">
  466 + <el-input v-model="scityid" maxlength="5" clearable>
  467 + <template slot="prepend" >城市代码</template>
  468 + </el-input>
396 </el-form-item> 469 </el-form-item>
397 </el-col> 470 </el-col>
398 - <el-col :span="3">  
399 - <el-form-item label="电话" prop="awbinfo.shprtel">  
400 - <el-input style="width: 150px" v-model="preModel.awbinfo.shprtel" clearable/> 471 + <el-col :span="5">
  472 + <el-form-item label="">
  473 + <el-input v-model="preModel.awbinfo.shprmobiletype" clearable>
  474 + <template slot="prepend" >传真</template>
  475 + </el-input>
401 </el-form-item> 476 </el-form-item>
402 </el-col> 477 </el-col>
403 - <el-col :span="3">  
404 - <el-form-item label="传真">  
405 - <el-input v-model="preModel.awbinfo.shprmobiletype" clearable/>  
406 - </el-form-item>  
407 - </el-col>  
408 - <el-col :span="3">  
409 - <el-form-item label-width="115px" label="发货人AEO编码" prop="awbinfo.shpaeocode">  
410 - <el-input v-model="shpaeocode" clearable/>  
411 - </el-form-item>  
412 - </el-col>  
413 - <el-col :span="3">  
414 - <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> 478 + <el-col :span="5">
  479 + <el-form-item label="" prop="awbinfo.shprcountyr">
415 <el-select 480 <el-select
416 :remote-method="remoteMethod" 481 :remote-method="remoteMethod"
417 :loading="listLoading" 482 :loading="listLoading"
@@ -419,7 +484,7 @@ @@ -419,7 +484,7 @@
419 filterable 484 filterable
420 allow-create 485 allow-create
421 remote 486 remote
422 - placeholder="请选择" clearable>目的站 487 + placeholder="请选择国家代码" clearable>目的站
423 <el-option 488 <el-option
424 v-for="item in countryOption" 489 v-for="item in countryOption"
425 :key="item.value" 490 :key="item.value"
@@ -431,6 +496,22 @@ @@ -431,6 +496,22 @@
431 </el-select> 496 </el-select>
432 </el-form-item> 497 </el-form-item>
433 </el-col> 498 </el-col>
  499 + <el-col :span="7.5">
  500 + <el-form-item label="" prop="awbinfo.shprtel">
  501 + <el-input v-model="preModel.awbinfo.shprtel" clearable>
  502 + <template slot="prepend" >电话</template>
  503 + </el-input>
  504 + </el-form-item>
  505 + </el-col>
  506 +
  507 + <el-col :span="7.5">
  508 + <el-form-item label="" prop="awbinfo.shpaeocode">
  509 + <el-input v-model="shpaeocode" clearable style="width: 270px">
  510 + <template slot="prepend" >发货人AEO编码</template>
  511 + </el-input>
  512 + </el-form-item>
  513 + </el-col>
  514 +
434 <!--<el-col :span="7.5">--> 515 <!--<el-col :span="7.5">-->
435 <!--<el-form-item label="企业代码类型" prop="awbinfo.shpcomidpre">--> 516 <!--<el-form-item label="企业代码类型" prop="awbinfo.shpcomidpre">-->
436 <!--<el-select--> 517 <!--<el-select-->
@@ -453,41 +534,39 @@ @@ -453,41 +534,39 @@
453 </el-row> 534 </el-row>
454 <div class="grid-content content" style="font-size: 10px"> 535 <div class="grid-content content" style="font-size: 10px">
455 收货人信息 536 收货人信息
456 - <el-button type="success" @click="consigneeSelect()">选择收货人信息</el-button> 537 + <el-button type="primary" size="mini" @click="consigneeSelect()">选择收货人信息</el-button>
457 </div> 538 </div>
458 <el-row> 539 <el-row>
459 - <el-col :span="3">  
460 - <el-form-item label-width="95px" label="收货人名称" prop="awbinfo.cnsnname">  
461 - <el-input v-model="cnsnname" clearable/> 540 + <el-col :span="5">
  541 + <el-form-item label="" prop="awbinfo.cnsnname">
  542 + <el-input v-model="cnsnname" clearable>
  543 + <template slot="prepend" >收货人名称</template>
  544 + </el-input>
462 </el-form-item> 545 </el-form-item>
463 </el-col> 546 </el-col>
464 - <el-col :span="3">  
465 - <el-form-item label="地址" prop="awbinfo.cnsnaddress">  
466 - <el-input style="weight: 100px" v-model="cnsnaddress" clearable/> 547 + <el-col :span="5">
  548 + <el-form-item label="" prop="awbinfo.cnsnaddress">
  549 + <el-input v-model="cnsnaddress" clearable>
  550 + <template slot="prepend" >地址</template>
  551 + </el-input>
467 </el-form-item> 552 </el-form-item>
468 </el-col> 553 </el-col>
469 - <el-col :span="3">  
470 - <el-form-item label="城市代码">  
471 - <el-input style="width: 100px" v-model="ecityid" clearable maxlength="5"/> 554 + <el-col :span="5">
  555 + <el-form-item label="">
  556 + <el-input v-model="ecityid" clearable maxlength="5">
  557 + <template slot="prepend" >城市代码</template>
  558 + </el-input>
472 </el-form-item> 559 </el-form-item>
473 </el-col> 560 </el-col>
474 - <el-col :span="3">  
475 - <el-form-item label="电话" prop="awbinfo.cnsntel">  
476 - <el-input style="weight: 150px" v-model="preModel.awbinfo.cnsntel" clearable/> 561 + <el-col :span="5">
  562 + <el-form-item label="">
  563 + <el-input v-model="preModel.awbinfo.cnsrmobiletype" clearable>
  564 + <template slot="prepend" >传真</template>
  565 + </el-input>
477 </el-form-item> 566 </el-form-item>
478 </el-col> 567 </el-col>
479 - <el-col :span="3">  
480 - <el-form-item label="传真">  
481 - <el-input v-model="preModel.awbinfo.cnsrmobiletype" clearable/>  
482 - </el-form-item>  
483 - </el-col>  
484 - <el-col :span="3">  
485 - <el-form-item label-width="115px" label="收货人AEO编码" prop="awbinfo.cnsaeocode">  
486 - <el-input v-model="cnsaeocode" clearable/>  
487 - </el-form-item>  
488 - </el-col>  
489 - <el-col :span="3">  
490 - <el-form-item label="国家代码" prop="awbinfo.cnscountyr"> 568 + <el-col :span="5">
  569 + <el-form-item label="" prop="awbinfo.cnscountyr">
491 <el-select 570 <el-select
492 :remote-method="remoteMethod" 571 :remote-method="remoteMethod"
493 :listLoading="listLoading" 572 :listLoading="listLoading"
@@ -495,7 +574,7 @@ @@ -495,7 +574,7 @@
495 filterable 574 filterable
496 allow-create 575 allow-create
497 remote 576 remote
498 - placeholder="请选择" clearable> 577 + placeholder="请选择国家代码" clearable>
499 <el-option 578 <el-option
500 v-for="item in countryOption" 579 v-for="item in countryOption"
501 :key="item.value" 580 :key="item.value"
@@ -507,16 +586,40 @@ @@ -507,16 +586,40 @@
507 </el-select> 586 </el-select>
508 </el-form-item> 587 </el-form-item>
509 </el-col> 588 </el-col>
510 - <el-col :span="3">  
511 - <el-form-item label-width="115px" label="具体收货人名称" prop="awbinfo.cnsrctcname">  
512 - <el-input v-model="cnsrctcname" clearable/> 589 + <el-col :span="7.5">
  590 + <el-form-item label="" prop="awbinfo.cnsntel">
  591 + <el-input v-model="preModel.awbinfo.cnsntel" clearable>
  592 + <template slot="prepend" >电话</template>
  593 + </el-input>
513 </el-form-item> 594 </el-form-item>
514 </el-col> 595 </el-col>
515 - <el-col :span="4">  
516 - <el-form-item label-width="115px" label="具体收货人电话" prop="awbinfo.cnsrctctel">  
517 - <el-input v-model="preModel.awbinfo.cnsrctctel" clearable/> 596 +
  597 + <el-col :span="7.5">
  598 + <el-form-item label="" prop="awbinfo.cnsaeocode">
  599 + <el-input v-model="cnsaeocode" clearable style="width: 270px">
  600 + <template slot="prepend" >收货人AEO编码</template>
  601 + </el-input>
518 </el-form-item> 602 </el-form-item>
519 </el-col> 603 </el-col>
  604 +
  605 + </el-row>
  606 + <el-row>
  607 + <el-col :span="6">
  608 + <el-form-item label="" prop="awbinfo.cnsrctcname">
  609 + <el-input v-model="cnsrctcname" clearable>
  610 + <template slot="prepend" >收货人名称</template>
  611 + </el-input>
  612 + </el-form-item>
  613 + </el-col>
  614 + <el-col :span="6">
  615 + <el-form-item label="" prop="awbinfo.cnsrctctel">
  616 + <el-input v-model="preModel.awbinfo.cnsrctctel" clearable style="width: 270px">
  617 + <template slot="prepend" >收货人电话</template>
  618 + </el-input>
  619 + </el-form-item>
  620 + </el-col>
  621 + </el-row>
  622 +
520 <!--<el-col :span="7.5">--> 623 <!--<el-col :span="7.5">-->
521 <!--<el-form-item label="企业代码类型" prop="awbinfo.csgcustomerid">--> 624 <!--<el-form-item label="企业代码类型" prop="awbinfo.csgcustomerid">-->
522 <!--<el-select--> 625 <!--<el-select-->
@@ -536,41 +639,48 @@ @@ -536,41 +639,48 @@
536 <!--<el-input v-model="cnscomidno" placeholder="企业代码"/>--> 639 <!--<el-input v-model="cnscomidno" placeholder="企业代码"/>-->
537 <!--</el-form-item>--> 640 <!--</el-form-item>-->
538 <!--</el-col>--> 641 <!--</el-col>-->
539 - </el-row>  
540 <div v-if="dialogStatus === 'sendUpdate'"> 642 <div v-if="dialogStatus === 'sendUpdate'">
541 <div class="grid-content content"> 643 <div class="grid-content content">
542 运单信息 644 运单信息
543 </div> 645 </div>
544 <el-row> 646 <el-row>
545 - <el-col :span="7.5">  
546 - <el-form-item label="修改原因" prop="reason">  
547 - <el-input v-model="preModel.reason" clearable/> 647 + <el-col :span="6">
  648 + <el-form-item label="" prop="reason">
  649 + <el-input v-model="preModel.reason" clearable>
  650 + <template slot="prepend" >修改原因</template>
  651 + </el-input>
548 </el-form-item> 652 </el-form-item>
549 </el-col> 653 </el-col>
550 - <el-col :span="7.5">  
551 - <el-form-item label="修改人" prop="contactName">  
552 - <el-input v-model="preModel.contactName" clearable/> 654 + <el-col :span="6">
  655 + <el-form-item label="" prop="contactName">
  656 + <el-input v-model="preModel.contactName" clearable>
  657 + <template slot="prepend" >修改人</template>
  658 + </el-input>
553 </el-form-item> 659 </el-form-item>
554 </el-col> 660 </el-col>
555 - <el-col :span="7.5">  
556 - <el-form-item label="修改人Tel" prop="contactTel">  
557 - <el-input v-model="preModel.contactTel" clearable maxlength="5"/> 661 + <el-col :span="6">
  662 + <el-form-item label="" prop="contactTel">
  663 + <el-input v-model="preModel.contactTel" clearable maxlength="5">
  664 + <template slot="prepend" >修改人Tel</template>
  665 + </el-input>
558 </el-form-item> 666 </el-form-item>
559 </el-col> 667 </el-col>
560 </el-row> 668 </el-row>
561 </div> 669 </div>
562 670
563 </el-form> 671 </el-form>
564 - <div slot="footer" class="dialog-footer">  
565 - <el-button @click="dialogFormVisible = false">取消</el-button>  
566 - <el-button type="primary" v-show="dialogStatus!=='sendUpdate'" 672 + <div slot="footer" class="dialog-footer" style="text-align: center">
  673 + <el-button @click="dialogFormVisible = false" size="medium"
  674 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button>
  675 + <el-button type="success" size="medium" style="width: 100px" v-show="dialogStatus!=='sendUpdate'"
567 @click="dialogStatus ==='create'? createData():updateData()">保存</el-button> 676 @click="dialogStatus ==='create'? createData():updateData()">保存</el-button>
568 - <el-button type="primary" v-show="dialogStatus==='sendUpdate'" @click="sendUpdate()">发送</el-button> 677 + <el-button type="primary" size="medium" style="width: 100px" v-show="dialogStatus==='sendUpdate'" @click="sendUpdate()">发送</el-button>
569 </div> 678 </div>
570 </el-dialog> 679 </el-dialog>
571 - <el-dialog title="收发明细" :visible.sync="dialogTableVisible">  
572 - <el-table :data="detailData" border>  
573 - <el-table-column label="操作时间" width="180"> 680 + <el-dialog title="收发明细" :visible.sync="dialogTableVisible" width="70%">
  681 + <el-table :data="detailData" border :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  682 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;width: 100%" size="small" >
  683 + <el-table-column label="操作时间" width="150">
574 <template slot-scope="scope"> 684 <template slot-scope="scope">
575 {{scope.row.busdate}} 685 {{scope.row.busdate}}
576 </template> 686 </template>
@@ -612,41 +722,51 @@ @@ -612,41 +722,51 @@
612 </el-table-column> 722 </el-table-column>
613 </el-table> 723 </el-table>
614 </el-dialog> 724 </el-dialog>
615 - <el-dialog title="删除原因" :visible.sync="dialogDeleteVisble" width="30%"> 725 + <el-dialog title="删除原因" :visible.sync="dialogDeleteVisble" width="50%">
616 <el-form ref="sendDeleteForm" :model="respModel" :rules="sendDeleteRules" label-width="120px" 726 <el-form ref="sendDeleteForm" :model="respModel" :rules="sendDeleteRules" label-width="120px"
617 style="margin-right:50px;"> 727 style="margin-right:50px;">
618 - <el-form-item label="删除原因" prop="reason">  
619 - <el-input v-model="respModel.reason" placeholder="删除原因"></el-input> 728 + <el-form-item label="" prop="reason">
  729 + <el-input v-model="respModel.reason" placeholder="删除原因">
  730 + <template slot="prepend" >删除&nbsp;&nbsp;&nbsp;&nbsp;原因</template>
  731 + </el-input>
620 </el-form-item> 732 </el-form-item>
621 - <el-form-item label="删除操作人" prop="contactName">  
622 - <el-input v-model="respModel.contactName" placeholder="操作人姓名"></el-input> 733 + <el-form-item label="" prop="contactName">
  734 + <el-input v-model="respModel.contactName" placeholder="操作人姓名">
  735 + <template slot="prepend" >删除操作人</template>
  736 + </el-input>
623 </el-form-item> 737 </el-form-item>
624 - <el-form-item label="操作人Tel" prop="contactTel">  
625 - <el-input v-model="respModel.contactTel" placeholder="删除操作人联系方式"></el-input> 738 + <el-form-item label="" prop="contactTel">
  739 + <el-input v-model="respModel.contactTel" placeholder="删除操作人联系方式">
  740 + <template slot="prepend" >操作人&nbsp;&nbsp; &nbsp;Tel</template>
  741 + </el-input>
626 </el-form-item> 742 </el-form-item>
627 - <el-form-item label="备注">  
628 - <el-input v-model="respModel.content" type="textarea"></el-input> 743 + <el-form-item label="">
  744 + <el-input v-model="respModel.content" type="textarea" placeholder="请输入备注">
  745 + </el-input>
629 </el-form-item> 746 </el-form-item>
630 </el-form> 747 </el-form>
631 <div slot="footer" class="dialog-footer"> 748 <div slot="footer" class="dialog-footer">
632 - <el-button @click="dialogDeleteVisble = false">取消</el-button>  
633 - <el-button type="primary" @click="sendDelete()">发送</el-button> 749 + <el-button @click="dialogDeleteVisble = false" size="medium"
  750 + style="width: 100px;background-color: #6F8294;color: #ffffff">取消</el-button>
  751 + <el-button type="primary" size="medium" style="width: 100px" @click="sendDelete()">发送</el-button>
634 </div> 752 </div>
635 </el-dialog> 753 </el-dialog>
636 754
637 - <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="50%"> 755 + <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="70%">
638 <!--工具条--> 756 <!--工具条-->
639 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 757 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
640 <el-form :inline="true" :model="consignerQuery"> 758 <el-form :inline="true" :model="consignerQuery">
641 <el-form-item> 759 <el-form-item>
642 - <el-input v-model="consignerQuery.companyName" placeholder="关键字查询"></el-input> 760 + <el-input v-model="consignerQuery.companyName" placeholder="关键字查询" size="small"></el-input>
643 </el-form-item> 761 </el-form-item>
644 <el-form-item> 762 <el-form-item>
645 - <el-button type="primary" v-on:click="consignerSelect()">查询</el-button> 763 + <el-button type="primary" size="small" v-on:click="consignerSelect()">查询</el-button>
646 </el-form-item> 764 </el-form-item>
647 </el-form> 765 </el-form>
648 </el-col> 766 </el-col>
649 - <el-table v-loading="listLoading" :data="consignerList" stripe style="font-size: 12px" 767 + <el-table v-loading="listLoading" :data="consignerList" stripe
  768 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  769 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;width: 100%" size="small"
650 border > 770 border >
651 <el-table-column type="selection" width="55"> 771 <el-table-column type="selection" width="55">
652 </el-table-column> 772 </el-table-column>
@@ -664,26 +784,28 @@ @@ -664,26 +784,28 @@
664 </el-table-column> 784 </el-table-column>
665 <el-table-column label="操作"> 785 <el-table-column label="操作">
666 <template slot-scope="scope"> 786 <template slot-scope="scope">
667 - <el-button type="success" @click="consignerClick(scope.row)">选择</el-button> 787 + <el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button>
668 </template> 788 </template>
669 </el-table-column> 789 </el-table-column>
670 </el-table> 790 </el-table>
671 <pagination background layout="total, prev, pager, next" v-show="consignerQuery.total>0" :total="consignerQuery.total" :page.sync="consignerQuery.pageSize" :limit.sync="consignerQuery.limitSize" 791 <pagination background layout="total, prev, pager, next" v-show="consignerQuery.total>0" :total="consignerQuery.total" :page.sync="consignerQuery.pageSize" :limit.sync="consignerQuery.limitSize"
672 @pagination="consignerSelect()"/> 792 @pagination="consignerSelect()"/>
673 </el-dialog> 793 </el-dialog>
674 - <el-dialog title="收货人信息" :visible.sync="dialogNeeVisible" width="50%"> 794 + <el-dialog title="收货人信息" :visible.sync="dialogNeeVisible" width="70%">
675 <!--工具条--> 795 <!--工具条-->
676 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;"> 796 <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
677 <el-form :inline="true" :model="consignerQuery"> 797 <el-form :inline="true" :model="consignerQuery">
678 <el-form-item> 798 <el-form-item>
679 - <el-input v-model="consigneeQuery.companyName" placeholder="关键字查询"></el-input> 799 + <el-input v-model="consigneeQuery.companyName" placeholder="关键字查询" size="small"></el-input>
680 </el-form-item> 800 </el-form-item>
681 <el-form-item> 801 <el-form-item>
682 - <el-button type="primary" v-on:click="consigneeSelect()">查询</el-button> 802 + <el-button type="primary" v-on:click="consigneeSelect()" size="small">查询</el-button>
683 </el-form-item> 803 </el-form-item>
684 </el-form> 804 </el-form>
685 </el-col> 805 </el-col>
686 - <el-table v-loading="listLoading" :data="consigneeList" stripe style="font-size: 12px" 806 + <el-table v-loading="listLoading" :data="consigneeList" stripe
  807 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}"
  808 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;width: 100%" size="small"
687 border > 809 border >
688 <el-table-column type="selection" width="55"> 810 <el-table-column type="selection" width="55">
689 </el-table-column> 811 </el-table-column>
@@ -701,7 +823,7 @@ @@ -701,7 +823,7 @@
701 </el-table-column> 823 </el-table-column>
702 <el-table-column label="操作"> 824 <el-table-column label="操作">
703 <template slot-scope="scope"> 825 <template slot-scope="scope">
704 - <el-button type="success" @click="consigneeClick(scope.row)">选择</el-button> 826 + <el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button>
705 </template> 827 </template>
706 </el-table-column> 828 </el-table-column>
707 </el-table> 829 </el-table>
@@ -7,15 +7,17 @@ @@ -7,15 +7,17 @@
7 <el-input v-model="filters.awba" placeholder="主单号查询"></el-input> 7 <el-input v-model="filters.awba" placeholder="主单号查询"></el-input>
8 </el-form-item> 8 </el-form-item>
9 <el-form-item> 9 <el-form-item>
10 - <el-button type="primary" v-on:click="getSecurity()">查询</el-button> 10 + <el-button type="warning" style="width:150px" size="medium" icon="el-icon-plus" v-on:click="getSecurity()">查询</el-button>
11 </el-form-item> 11 </el-form-item>
12 <el-form-item> 12 <el-form-item>
13 - <el-button type="primary" @click="companyAdd">新增</el-button> 13 + <el-button type="primary" style="width:150px" size="medium" icon="el-icon-plus" @click="companyAdd">新增</el-button>
14 </el-form-item> 14 </el-form-item>
15 </el-form> 15 </el-form>
16 </el-col> 16 </el-col>
17 <!--列表--> 17 <!--列表-->
18 - <el-table :data="securityList" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;"> 18 + <el-table :data="securityList" highlight-current-row v-loading="listLoading" @selection-change="selsChange"
  19 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;"
  20 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
19 <el-table-column type="selection" width="55"> 21 <el-table-column type="selection" width="55">
20 </el-table-column> 22 </el-table-column>
21 <el-table-column prop="sdWaybill" label="运单号" width="120px" > 23 <el-table-column prop="sdWaybill" label="运单号" width="120px" >
@@ -40,82 +42,89 @@ @@ -40,82 +42,89 @@
40 <span v-if="scope.row.status == 1" style="color: #5BB75B">已发送</span> 42 <span v-if="scope.row.status == 1" style="color: #5BB75B">已发送</span>
41 </template> 43 </template>
42 </el-table-column> 44 </el-table-column>
43 - <el-table-column label="操作" min-width="150"> 45 + <el-table-column label="操作" min-width="180px" fixed="right">
44 <template slot-scope="scope"> 46 <template slot-scope="scope">
45 - <el-button size="small" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>  
46 - <el-button type="danger" size="small" @click="handleDel(scope.$index, scope.row)">删除</el-button> 47 + <el-button type="primary" icon="el-icon-edit" size="mini" @click="handleEdit(scope.$index, scope.row)">编辑</el-button>
  48 + <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDel(scope.$index, scope.row)">删除</el-button>
47 <!-- <el-button type="primary" size="small" @click="print(scope.$index, scope.row)">打印</el-button>--> 49 <!-- <el-button type="primary" size="small" @click="print(scope.$index, scope.row)">打印</el-button>-->
48 </template> 50 </template>
49 </el-table-column> 51 </el-table-column>
50 </el-table> 52 </el-table>
51 <!--编辑界面--> 53 <!--编辑界面-->
52 - <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false">  
53 - <el-form :model="editForm" label-width="100px" :rules="editFormRules" ref="editForm">  
54 - <el-form-item label="ID">  
55 - <span>{{editForm.id}}</span>  
56 - </el-form-item>  
57 - 54 + <el-dialog title="编辑" :visible.sync="editFormVisible" :close-on-click-modal="false" width="60%" text-align="center" tyle="margin-top: -20px">
  55 + <el-form :model="editForm" :rules="editFormRules" ref="editForm" align="center" label-width="145px" style="margin-top: -10px">
58 <el-row> 56 <el-row>
59 - <el-col :span="8">  
60 - <el-form-item label="主单号" prop="sdWaybill">  
61 - <el-input v-model="editForm.sdWaybill" @change="onAwba()" auto-complete="on" placeholder="主单号"></el-input>  
62 - </el-form-item>  
63 - </el-col>  
64 - <el-col :span="8">  
65 - <el-form-item label="承运人" prop="carrier">  
66 - <el-input v-model="editForm.carrier" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="承运人"></el-input> 57 + <el-col :span="4">
  58 + <el-form-item label="ID">
  59 + <span>{{editForm.id}}</span>
67 </el-form-item> 60 </el-form-item>
68 </el-col> 61 </el-col>
69 </el-row> 62 </el-row>
70 <el-row> 63 <el-row>
71 - <el-col :span="8">  
72 - <el-form-item label="航班号" prop="flightno">  
73 - <el-input v-model="editForm.flightno" auto-complete="on" placeholder="航班号"></el-input> 64 + <el-col :span="8" style="margin-right: 20px">
  65 + <el-form-item label="" prop="sdWaybill">
  66 + <el-input v-model="editForm.sdWaybill" @change="onAwba()" auto-complete="on" placeholder="主单号" style="width:300px" size="small">
  67 + <template slot="prepend" >主单号</template>
  68 + </el-input>
74 </el-form-item> 69 </el-form-item>
75 </el-col> 70 </el-col>
76 - <el-col :span="9">  
77 - <el-form-item label="航班日期" prop="flightdate">  
78 - <el-date-picker  
79 - v-model="editForm.flightdate"  
80 - type="date"  
81 - placeholder="选择日期">  
82 - </el-date-picker> 71 + <el-col :span="8">
  72 + <el-form-item label="" prop="carrier">
  73 + <el-input v-model="editForm.carrier" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="承运人" style="width:300px" size="small">
  74 + <template slot="prepend" >承运人</template>
  75 + </el-input>
83 </el-form-item> 76 </el-form-item>
84 </el-col> 77 </el-col>
85 </el-row> 78 </el-row>
86 <el-row> 79 <el-row>
87 - <el-col :span="8">  
88 - <el-form-item label="目的站" prop="destination">  
89 - <el-input v-model="editForm.destination" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="目的站"></el-input> 80 + <el-col :span="8" style="margin-right: 20px">
  81 + <el-form-item label="" prop="flightno">
  82 + <el-input v-model="editForm.flightno" auto-complete="on" placeholder="航班号" style="width:300px" size="small">
  83 + <template slot="prepend" >航班号</template>
  84 + </el-input>
90 </el-form-item> 85 </el-form-item>
91 </el-col> 86 </el-col>
92 <el-col :span="8"> 87 <el-col :span="8">
93 - <el-form-item label="件数" prop="piece">  
94 - <el-input v-model="editForm.piece" oninput="value=value.replace(/[^\d]/g,'')" auto-complete="on" placeholder="件数"></el-input> 88 + <el-form-item label="" prop="destination">
  89 + <el-input v-model="editForm.destination" onkeyup="this.value=this.value.toUpperCase()"
  90 + auto-complete="on" placeholder="目的站" style="width:300px" size="small">
  91 + <template slot="prepend" >目的站</template>
  92 + </el-input>
95 </el-form-item> 93 </el-form-item>
96 </el-col> 94 </el-col>
97 </el-row> 95 </el-row>
98 <el-row> 96 <el-row>
99 - <el-col :span="7">  
100 - <el-form-item label="重量" prop="weight">  
101 - <el-input v-model="editForm.weight" oninput ="value=value.replace(/[^0-9.]/g,'')" auto-complete="on" placeholder="重量"></el-input>  
102 - </el-form-item>  
103 - </el-col>  
104 - <el-col :span="7">  
105 - <el-form-item label="货物品名" prop="cargoName">  
106 - <el-input type="textarea" v-model="editForm.cargoName" auto-complete="on" placeholder="货物品名"></el-input> 97 +
  98 + <el-col :span="8" style="margin-right: 20px">
  99 + <el-form-item label="" prop="piece">
  100 + <el-input v-model="editForm.piece" oninput="value=value.replace(/[^\d]/g,'')"
  101 + auto-complete="on" placeholder="件数" style="width:300px" size="small">
  102 + <template slot="prepend" >件数</template>
  103 + </el-input>
107 </el-form-item> 104 </el-form-item>
108 </el-col> 105 </el-col>
109 - <el-col :span="7">  
110 - <el-form-item label="货物类型" prop="cargoType">  
111 - <el-cascader v-model="editForm.cargoType" :options="cargoTypes" :show-all-levels="false"></el-cascader> 106 + <el-col :span="8">
  107 + <el-form-item label="" prop="flightdate">
  108 + <el-date-picker
  109 + v-model="editForm.flightdate"
  110 + type="date" style="width:300px" size="small"
  111 + placeholder="请选择航班日期">
  112 + </el-date-picker>
112 </el-form-item> 113 </el-form-item>
113 </el-col> 114 </el-col>
114 </el-row> 115 </el-row>
115 <el-row> 116 <el-row>
116 - <el-col :span="7">  
117 - <el-form-item label="海关关区" prop="customcode">  
118 - <el-select v-model="editForm.customcode" placeholder="请选择"> 117 + <el-col :span="8" style="margin-right: 20px">
  118 + <el-form-item label="" prop="weight">
  119 + <el-input v-model="editForm.weight" oninput ="value=value.replace(/[^0-9.]/g,'')"
  120 + auto-complete="on" placeholder="重量" style="width:300px" size="small">
  121 + <template slot="prepend" >重量</template>
  122 + </el-input>
  123 + </el-form-item>
  124 + </el-col>
  125 + <el-col :span="8">
  126 + <el-form-item label="" prop="customcode">
  127 + <el-select v-model="editForm.customcode" placeholder="请选择海关关区" style="width:300px" size="small">
119 <el-option 128 <el-option
120 v-for="item in options" 129 v-for="item in options"
121 :key="item.value" 130 :key="item.value"
@@ -125,108 +134,159 @@ @@ -125,108 +134,159 @@
125 </el-select> 134 </el-select>
126 </el-form-item> 135 </el-form-item>
127 </el-col> 136 </el-col>
128 - <el-col :span="7">  
129 - <el-form-item label="航协编号" prop="sdIataNumber">  
130 - <el-input v-model="editForm.sdIataNumber" auto-complete="on" placeholder="航协编号"></el-input> 137 + </el-row>
  138 + <el-row>
  139 + <el-col :span="8" style="margin-right: 20px">
  140 + <el-form-item label="" prop="cargoName">
  141 + <el-input v-model="editForm.cargoName" auto-complete="on" placeholder="货物品名" style="width:300px" size="small">
  142 + <template slot="prepend" >货物品名</template>
  143 + </el-input>
131 </el-form-item> 144 </el-form-item>
132 </el-col> 145 </el-col>
133 - <el-col :span="7">  
134 - <el-form-item label="运输条件鉴定书" label-width="110px" prop="sdTransportCertificate">  
135 - <el-input v-model="editForm.sdTransportCertificate" auto-complete="on" placeholder="运输条件鉴定书"></el-input> 146 +
  147 + <el-col :span="8">
  148 + <el-form-item label="" prop="cargoType">
  149 + <el-cascader v-model="editForm.cargoType" :options="cargoTypes"
  150 + :show-all-levels="false" placeholder="请选择货物类型" style="width:300px" size="small">
  151 + </el-cascader>
136 </el-form-item> 152 </el-form-item>
137 </el-col> 153 </el-col>
138 </el-row> 154 </el-row>
139 <el-row> 155 <el-row>
140 - <el-col :span="20">  
141 - <el-form-item label="航空货运销售代理人名称" label-width="180px" prop="sdCargoAgentName">  
142 - <el-input v-model="editForm.sdCargoAgentName" auto-complete="on" placeholder="航空货运销售代理人名称"></el-input> 156 + <el-col :span="8" style="margin-right: 20px">
  157 + <el-form-item label="" prop="sdIataNumber">
  158 + <el-input v-model="editForm.sdIataNumber" auto-complete="on" placeholder="航协编号" style="width:300px" size="small">
  159 + <template slot="prepend" >航协编号</template>
  160 + </el-input>
143 </el-form-item> 161 </el-form-item>
144 </el-col> 162 </el-col>
  163 + <el-col :span="8">
  164 + <el-form-item label="" prop="sdTransportCertificate">
  165 + <el-input v-model="editForm.sdTransportCertificate" auto-complete="on" placeholder="运输条件鉴定书" style="width:300px" size="small">
  166 + <template slot="prepend" >运输条件鉴定书</template>
  167 + </el-input>
  168 + </el-form-item>
  169 + </el-col>
  170 + </el-row>
  171 + <el-row>
  172 +
145 </el-row> 173 </el-row>
146 <el-row> 174 <el-row>
147 - <el-col :span="20">  
148 - <el-form-item label="航空货物托运人名称" label-width="170px" prop="sdCargoShipperName">  
149 - <el-input v-model="editForm.sdCargoShipperName" auto-complete="on" placeholder="航空货物托运人名称"></el-input> 175 + <el-col :span="19">
  176 + <el-form-item label="" prop="sdCargoShipperName">
  177 + <el-input v-model="editForm.sdCargoShipperName" auto-complete="on" placeholder="航空货物托运人名称" size="small">
  178 + <template slot="prepend" >航空货物托运人名称</template>
  179 + </el-input>
150 </el-form-item> 180 </el-form-item>
151 </el-col> 181 </el-col>
152 </el-row> 182 </el-row>
153 <el-row> 183 <el-row>
154 - <el-col :span="20">  
155 - <el-form-item label="航空公司同意运输证明" label-width="170px" prop="sdTransportationProve">  
156 - <el-input v-model="editForm.sdTransportationProve" auto-complete="on" placeholder="航空公司同意运输证明"></el-input> 184 + <el-col :span="19">
  185 + <el-form-item label="" prop="sdTransportationProve">
  186 + <el-input v-model="editForm.sdTransportationProve" auto-complete="on" placeholder="航空公司同意运输证明" size="small">
  187 + <template slot="prepend" >航空公司同意运输证明</template>
  188 + </el-input>
  189 + </el-form-item>
  190 + </el-col>
  191 + <el-col :span="19">
  192 + <el-form-item label="" prop="sdCargoAgentName">
  193 + <el-input v-model="editForm.sdCargoAgentName" auto-complete="on" placeholder="航空货运销售代理人名称" size="small">
  194 + <template slot="prepend" >航空货运销售代理人名称</template>
  195 + </el-input>
157 </el-form-item> 196 </el-form-item>
158 </el-col> 197 </el-col>
159 </el-row> 198 </el-row>
160 </el-form> 199 </el-form>
161 - <div slot="footer" class="dialog-footer">  
162 - <el-button type="primary" @click.native="editSubmit(0)">暂存</el-button>  
163 - <el-button type="primary" @click.native="editSubmit(1)">保存并发送</el-button> 200 + <div slot="footer" class="dialog-footer" align="center">
  201 + <el-button type="primary" size="medium" style="width: 100px" @click.native="editSubmit(0)">暂存</el-button>
  202 + <el-button type="success" size="medium" style="width: 120px" @click.native="editSubmit(1)">保存并发送</el-button>
164 </div> 203 </div>
165 </el-dialog> 204 </el-dialog>
166 <!--新增界面--> 205 <!--新增界面-->
167 - <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false">  
168 - <el-form :model="addForm" label-width="100px" :rules="addFormRules" ref="addForm"> 206 + <el-dialog title="新增" :visible.sync="addFormVisible" :close-on-click-modal="false" tyle="margin-top: -20px"
  207 + width="60%" text-align="center">
  208 + <el-form :model="addForm" label-width="145px" status-icon style="margin-top: -10px" align="center" :rules="addFormRules" ref="addForm">
169 <el-row> 209 <el-row>
170 - <el-col :span="8">  
171 - <el-form-item label="主单号" prop="sdWaybill">  
172 - <el-input v-model="addForm.sdWaybill" @change="onAwba()" auto-complete="on" placeholder="主单号"></el-input> 210 + <el-col :span="8" style="margin-right: 20px">
  211 + <el-form-item label="" prop="sdWaybill">
  212 + <el-input v-model="addForm.sdWaybill" @change="onAwba()" auto-complete="on" placeholder="主单号"
  213 + style="width:300px" size="small">
  214 + <template slot="prepend" >主单号</template>
  215 + </el-input>
173 </el-form-item> 216 </el-form-item>
174 </el-col> 217 </el-col>
175 <el-col :span="8"> 218 <el-col :span="8">
176 - <el-form-item label="承运人" prop="carrier">  
177 - <el-input v-model="addForm.carrier" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="承运人"></el-input> 219 + <el-form-item label="" prop="carrier">
  220 + <el-input v-model="addForm.carrier" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="承运人" style="width:300px" size="small">
  221 + <template slot="prepend" >承运人</template>
  222 + </el-input>
178 </el-form-item> 223 </el-form-item>
179 </el-col> 224 </el-col>
180 </el-row> 225 </el-row>
181 <el-row> 226 <el-row>
182 - <el-col :span="8">  
183 - <el-form-item label="航班号" prop="flightno">  
184 - <el-input v-model="addForm.flightno" auto-complete="on" placeholder="航班号"></el-input> 227 + <el-col :span="8" style="margin-right: 20px">
  228 + <el-form-item label="" prop="flightno">
  229 + <el-input v-model="addForm.flightno" auto-complete="on" placeholder="航班号" style="width:300px" size="small">
  230 + <template slot="prepend" >航班号</template>
  231 + </el-input>
185 </el-form-item> 232 </el-form-item>
186 </el-col> 233 </el-col>
187 - <el-col :span="9">  
188 - <el-form-item label="航班日期" prop="flightdate">  
189 - <el-date-picker  
190 - v-model="addForm.flightdate"  
191 - type="date"  
192 - placeholder="选择日期">  
193 - </el-date-picker> 234 + <el-col :span="8">
  235 + <el-form-item label="" prop="destination">
  236 + <el-input v-model="addForm.destination" onkeyup="this.value=this.value.toUpperCase()"
  237 + auto-complete="on" placeholder="目的站" style="width:300px" size="small">
  238 + <template slot="prepend" >目的站</template>
  239 + </el-input>
194 </el-form-item> 240 </el-form-item>
195 </el-col> 241 </el-col>
196 </el-row> 242 </el-row>
197 <el-row> 243 <el-row>
198 - <el-col :span="8">  
199 - <el-form-item label="目的站" prop="destination">  
200 - <el-input v-model="addForm.destination" onkeyup="this.value=this.value.toUpperCase()" auto-complete="on" placeholder="目的站"></el-input> 244 + <el-col :span="8" style="margin-right: 20px">
  245 + <el-form-item label="" prop="weight">
  246 + <el-input v-model="addForm.weight" oninput ="value=value.replace(/[^0-9.]/g,'')"
  247 + auto-complete="on" placeholder="重量" style="width:300px" size="small">
  248 + <template slot="prepend" >重&nbsp;&nbsp;&nbsp;&nbsp;量</template>
  249 + </el-input>
201 </el-form-item> 250 </el-form-item>
202 </el-col> 251 </el-col>
  252 +
203 <el-col :span="8"> 253 <el-col :span="8">
204 - <el-form-item label="件数" prop="piece">  
205 - <el-input v-model="addForm.piece" oninput="value=value.replace(/[^\d]/g,'')" auto-complete="on" placeholder="件数"></el-input> 254 + <el-form-item label="" prop="piece">
  255 + <el-input v-model="addForm.piece" oninput="value=value.replace(/[^\d]/g,'')"
  256 + auto-complete="on" placeholder="件数" style="width:300px" size="small">
  257 + <template slot="prepend" >件&nbsp;&nbsp;&nbsp;&nbsp;数</template>
  258 + </el-input>
206 </el-form-item> 259 </el-form-item>
207 </el-col> 260 </el-col>
208 </el-row> 261 </el-row>
209 <el-row> 262 <el-row>
210 - <el-col :span="7">  
211 - <el-form-item label="重量" prop="weight">  
212 - <el-input v-model="addForm.weight" oninput ="value=value.replace(/[^0-9.]/g,'')" auto-complete="on" placeholder="重量"></el-input> 263 + <el-col :span="8" style="margin-right: 20px">
  264 + <el-form-item label="" prop="sdIataNumber">
  265 + <el-input v-model="addForm.sdIataNumber" auto-complete="on" placeholder="航协编号" style="width:300px" size="small">
  266 + <template slot="prepend" >航协编号</template>
  267 + </el-input>
213 </el-form-item> 268 </el-form-item>
214 </el-col> 269 </el-col>
215 - <el-col :span="7">  
216 - <el-form-item label="货物品名" prop="cargoName">  
217 - <el-input type="textarea" v-model="addForm.cargoName" auto-complete="on" placeholder="货物品名"></el-input>  
218 - </el-form-item>  
219 - </el-col>  
220 - <el-col :span="7">  
221 - <el-form-item label="货物类型" prop="cargoType">  
222 - <el-cascader v-model="addForm.cargoType" :options="cargoTypes" :show-all-levels="false"></el-cascader> 270 + <el-col :span="8" >
  271 + <el-form-item label="" prop="flightdate">
  272 + <el-date-picker
  273 + v-model="addForm.flightdate"
  274 + type="date"
  275 + placeholder="选择日期" style="width:300px" size="small">
  276 + </el-date-picker>
223 </el-form-item> 277 </el-form-item>
224 </el-col> 278 </el-col>
225 </el-row> 279 </el-row>
226 <el-row> 280 <el-row>
227 - <el-col :span="7">  
228 - <el-form-item label="海关关区" prop="customcode">  
229 - <el-select v-model="addForm.customcode" placeholder="请选择"> 281 + <el-col :span="8" style="margin-right: 20px">
  282 + <el-form-item label="" prop="cargoType">
  283 + <el-cascader placeholder="请选择货物类型" v-model="addForm.cargoType" :options="cargoTypes" :show-all-levels="false" style="width:300px" size="small">
  284 + </el-cascader>
  285 + </el-form-item>
  286 + </el-col>
  287 + <el-col :span="8">
  288 + <el-form-item label="" prop="customcode">
  289 + <el-select v-model="addForm.customcode" placeholder="请选择海关关区" style="width:300px" size="small">
230 <el-option 290 <el-option
231 v-for="item in options" 291 v-for="item in options"
232 :key="item.value" 292 :key="item.value"
@@ -236,42 +296,57 @@ @@ -236,42 +296,57 @@
236 </el-select> 296 </el-select>
237 </el-form-item> 297 </el-form-item>
238 </el-col> 298 </el-col>
239 - <el-col :span="7">  
240 - <el-form-item label="航协编号" prop="sdIataNumber">  
241 - <el-input v-model="addForm.sdIataNumber" auto-complete="on" placeholder="航协编号"></el-input>  
242 - </el-form-item> 299 + </el-row>
  300 + <el-row>
  301 + <el-col :span="8" style="margin-right: 20px">
  302 + <el-form-item label="" prop="sdTransportCertificate">
  303 + <el-input v-model="addForm.sdTransportCertificate" auto-complete="on" placeholder="运输条件鉴定书" style="width:300px" size="small">
  304 + <template slot="prepend" >运输条件鉴定书</template>
  305 + </el-input>
  306 + </el-form-item>
243 </el-col> 307 </el-col>
244 - <el-col :span="7">  
245 - <el-form-item label="运输条件鉴定书" label-width="110px" prop="sdTransportCertificate">  
246 - <el-input v-model="addForm.sdTransportCertificate" auto-complete="on" placeholder="运输条件鉴定书"></el-input> 308 + <el-col :span="8">
  309 + <el-form-item label="" prop="cargoName">
  310 + <el-input type="textarea" v-model="addForm.cargoName" auto-complete="on"
  311 + placeholder="请输入货物品名" style="width:300px" size="small">
  312 + </el-input>
247 </el-form-item> 313 </el-form-item>
248 </el-col> 314 </el-col>
249 </el-row> 315 </el-row>
250 <el-row> 316 <el-row>
251 - <el-col :span="20">  
252 - <el-form-item label="航空货运销售代理人名称" label-width="180px" prop="sdCargoAgentName">  
253 - <el-input v-model="addForm.sdCargoAgentName" auto-complete="on" placeholder="航空货运销售代理人名称"></el-input> 317 + <el-col :span="20" >
  318 + <el-form-item label="" prop="sdCargoAgentName">
  319 + <el-input v-model="addForm.sdCargoAgentName" auto-complete="on" placeholder="航空货运销售代理人名称"
  320 + style="width:620px" size="small">
  321 + <template slot="prepend" >航空货运销售代理人名称</template>
  322 + </el-input>
254 </el-form-item> 323 </el-form-item>
255 </el-col> 324 </el-col>
256 </el-row> 325 </el-row>
257 <el-row> 326 <el-row>
258 <el-col :span="20"> 327 <el-col :span="20">
259 - <el-form-item label="航空货物托运人名称" label-width="170px" prop="sdCargoShipperName">  
260 - <el-input v-model="addForm.sdCargoShipperName" auto-complete="on" placeholder="航空货物托运人名称"></el-input> 328 + <el-form-item label="" prop="sdCargoShipperName">
  329 + <el-input v-model="addForm.sdCargoShipperName" auto-complete="on" placeholder="航空货物托运人名称"
  330 + style="width:620px" size="small">
  331 + <template slot="prepend" >航空&nbsp;&nbsp;货物&nbsp;&nbsp;托运人&nbsp;&nbsp;名称</template>
  332 + </el-input>
261 </el-form-item> 333 </el-form-item>
262 </el-col> 334 </el-col>
263 </el-row> 335 </el-row>
264 <el-row> 336 <el-row>
265 <el-col :span="20"> 337 <el-col :span="20">
266 - <el-form-item label="航空公司同意运输证明" label-width="170px" prop="sdTransportationProve">  
267 - <el-input v-model="addForm.sdTransportationProve" auto-complete="on" placeholder="航空公司同意运输证明"></el-input> 338 + <el-form-item label="" prop="sdTransportationProve">
  339 + <el-input v-model="addForm.sdTransportationProve" auto-complete="on" placeholder="航空公司同意运输证明"
  340 + style="width:620px" size="small">
  341 + <template slot="prepend" >航空&nbsp;公司&nbsp;同意&nbsp;运输&nbsp;证明</template>
  342 + </el-input>
268 </el-form-item> 343 </el-form-item>
269 </el-col> 344 </el-col>
270 </el-row> 345 </el-row>
271 </el-form> 346 </el-form>
272 - <div slot="footer" class="dialog-footer">  
273 - <el-button type="primary" @click.native="addSubmit(0)">暂存</el-button>  
274 - <el-button type="primary" @click.native="addSubmit(1)">保存并发送</el-button> 347 + <div slot="footer" class="dialog-footer" align="center">
  348 + <el-button type="primary" size="medium" style="width: 100px" @click.native="addSubmit(0)">暂存</el-button>
  349 + <el-button type="success" size="medium" style="width: 120px" @click.native="addSubmit(1)">保存并发送</el-button>
275 </div> 350 </div>
276 </el-dialog> 351 </el-dialog>
277 <!--打印界面--> 352 <!--打印界面-->
@@ -1289,4 +1364,14 @@ @@ -1289,4 +1364,14 @@
1289 }, 1364 },
1290 1365
1291 } 1366 }
1292 -</script>  
  1367 +</script>
  1368 +<style>
  1369 + .el-input-group__prepend {
  1370 + background-color: #6F8294;
  1371 + color:#ffffff
  1372 + }
  1373 + .el-input__inner{
  1374 + background-color: #F7F7F7;
  1375 + }
  1376 +
  1377 +</style>