朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 df641460eec9586dd4fc4cf7cae6f7a500325bcf 1 个父辈 ca066dee

进港原始舱单界面优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 257 行增加 和 143 行删除
@@ -32,10 +32,9 @@ @@ -32,10 +32,9 @@
32 <div class="grid-content"> 32 <div class="grid-content">
33 <el-col :span="9" class="pub"> 33 <el-col :span="9" class="pub">
34 <div class="grid-content"> 34 <div class="grid-content">
35 - <span>  
36 - 主单号:  
37 - </span>  
38 - <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 180px"></el-input> 35 + <el-input v-model="defaultQuery.awba" placeholder="请输入主单号" style="width: 200px">
  36 + <template slot="prepend">主单号</template>
  37 + </el-input>
39 </div> 38 </div>
40 </el-col> 39 </el-col>
41 <el-col :span="2" class="pub"> 40 <el-col :span="2" class="pub">
@@ -75,7 +74,8 @@ @@ -75,7 +74,8 @@
75 ref="multipleTable" 74 ref="multipleTable"
76 :data="tableData" 75 :data="tableData"
77 tooltip-effect="dark" 76 tooltip-effect="dark"
78 - style="width: 100%" 77 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  78 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small"
79 @selection-change="handleSelectionChange" 79 @selection-change="handleSelectionChange"
80 row-key="uuid" 80 row-key="uuid"
81 border 81 border
@@ -153,7 +153,7 @@ @@ -153,7 +153,7 @@
153 <el-table-column 153 <el-table-column
154 prop="operation" 154 prop="operation"
155 label="操作" 155 label="操作"
156 - width="450" 156 + width="380"
157 show-overflow-tooltip> 157 show-overflow-tooltip>
158 <template slot-scope="scope"> 158 <template slot-scope="scope">
159 <el-row> 159 <el-row>
@@ -178,7 +178,7 @@ @@ -178,7 +178,7 @@
178 size="mini" 178 size="mini"
179 type="primary" 179 type="primary"
180 @click="handleSend(scope.$index, scope.row)" 180 @click="handleSend(scope.$index, scope.row)"
181 - :disabled="btSendStatusFormater(scope.row.status)">发送舱单报 181 + :disabled="btSendStatusFormater(scope.row.status)">发舱单报
182 </el-button> 182 </el-button>
183 <el-button 183 <el-button
184 size="mini" 184 size="mini"
@@ -191,26 +191,24 @@ @@ -191,26 +191,24 @@
191 <el-button 191 <el-button
192 v-if="scope.row.awbh==''||scope.row.awbh==null" 192 v-if="scope.row.awbh==''||scope.row.awbh==null"
193 size="mini" 193 size="mini"
194 - type="success"  
195 @click="Importallocation(scope.$index, scope.row)">分拨申请 194 @click="Importallocation(scope.$index, scope.row)">分拨申请
196 </el-button> 195 </el-button>
197 <el-button 196 <el-button
198 v-else 197 v-else
199 disabled="" 198 disabled=""
200 - size="mini" type="success" 199 + size="mini"
201 @click="Importallocation(scope.$index, scope.row)">分拨申请 200 @click="Importallocation(scope.$index, scope.row)">分拨申请
202 </el-button> 201 </el-button>
203 <!-- style="background-color: #63cdda;color: white"--> 202 <!-- style="background-color: #63cdda;color: white"-->
204 <el-button 203 <el-button
205 v-if="scope.row.awbh==''||scope.row.awbh==null" 204 v-if="scope.row.awbh==''||scope.row.awbh==null"
206 size="mini" 205 size="mini"
207 - type="primary"  
208 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 206 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵
209 </el-button> 207 </el-button>
210 <el-button 208 <el-button
211 v-else 209 v-else
212 disabled="" 210 disabled=""
213 - size="mini" type="primary" 211 + size="mini"
214 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵 212 @click="Allocatearrive(scope.$index, scope.row)">分拨运抵
215 </el-button> 213 </el-button>
216 <!-- style="background-color:#778beb;color: white"--> 214 <!-- style="background-color:#778beb;color: white"-->
@@ -218,13 +216,13 @@ @@ -218,13 +216,13 @@
218 size="mini" 216 size="mini"
219 style="background-color:#f19066;color: white" 217 style="background-color:#f19066;color: white"
220 @click="handleUpdate(scope.$index, scope.row)" 218 @click="handleUpdate(scope.$index, scope.row)"
221 - :disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报 219 + :disabled="btEditStatusFormater(scope.row.status)">发修改报
222 </el-button> 220 </el-button>
223 <el-button 221 <el-button
224 size="mini" 222 size="mini"
225 type="danger" 223 type="danger"
226 @click="handleDelete(scope.$index, scope.row)" 224 @click="handleDelete(scope.$index, scope.row)"
227 - :disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报 225 + :disabled="btDeleStatusFormater(scope.row.status)">发删除报
228 </el-button> 226 </el-button>
229 </el-row> 227 </el-row>
230 228
@@ -244,59 +242,79 @@ @@ -244,59 +242,79 @@
244 <div class="grid-content content">航班信息</div> 242 <div class="grid-content content">航班信息</div>
245 </el-col> 243 </el-col>
246 <el-row class="flightInfo"> 244 <el-row class="flightInfo">
247 - <el-col :span="4">  
248 - <el-form-item label="运单号" prop="awba"> 245 + <el-col :span="5" style="margin-left: -40px">
  246 + <el-form-item prop="awba">
249 <div v-if="dialogStatus === 'update'"> 247 <div v-if="dialogStatus === 'update'">
250 - <el-input disabled="" v-model="ruleForm.awba"></el-input> 248 + <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">
  249 + <template slot="prepend">运单号</template>
  250 + </el-input>
251 </div> 251 </div>
252 <div v-else> 252 <div v-else>
253 - <el-input v-model="ruleForm.awba"></el-input> 253 + <el-input v-model="ruleForm.awba" style="width: 200px"></el-input>
254 </div> 254 </div>
255 </el-form-item> 255 </el-form-item>
256 </el-col> 256 </el-col>
257 - <el-col :span="4">  
258 - <el-form-item label="航班号" prop="flightno">  
259 - <el-input disabled="" v-model="ruleForm.flightno"></el-input> 257 + <el-col :span="5">
  258 + <el-form-item prop="flightno">
  259 + <el-input disabled="" v-model="ruleForm.flightno" style="width: 200px">
  260 + <template slot="prepend">航班号</template>
  261 + </el-input>
  262 + </el-form-item>
  263 + </el-col>
  264 + <el-col :span="6">
  265 + <el-form-item prop="originstation">
  266 + <el-input disabled="" v-model="ruleForm.originstation" style="width: 200px">
  267 + <template slot="prepend">航段</template>
  268 + </el-input>
260 </el-form-item> 269 </el-form-item>
261 </el-col> 270 </el-col>
262 - <el-col :span="5">  
263 - <el-form-item label="航班日期" required>  
264 - <el-col :span="24"> 271 + <el-col :span="7">
  272 + <el-form-item label="" required>
265 <el-form-item prop="flightdate"> 273 <el-form-item prop="flightdate">
  274 + <div class="ip">
  275 + 航班日期
  276 + </div>
266 <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" 277 <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false"
267 v-model="ruleForm.flightdate" 278 v-model="ruleForm.flightdate"
268 - style="width: 100%;"></el-date-picker> 279 + style="width: 125px">
  280 +
  281 + </el-date-picker>
269 </el-form-item> 282 </el-form-item>
270 - </el-col>  
271 </el-form-item> 283 </el-form-item>
272 </el-col> 284 </el-col>
273 - <el-col :span="4">  
274 - <el-form-item label="航段" prop="originstation">  
275 - <el-input disabled="" v-model="ruleForm.originstation"></el-input>  
276 - </el-form-item>  
277 - </el-col>  
278 - <el-col :span="4">  
279 - <el-form-item label="是否分批" prop="splitcode">  
280 - <el-select v-model="ruleForm.splitcode" placeholder=""> 285 + </el-row>
  286 + <el-row class="flightInfo">
  287 + <el-col :span="18" style="margin-left: -40px">
  288 + <el-form-item prop="splitcode">
  289 + <div class="ip">
  290 + 是否分批
  291 + </div>
  292 + <el-select v-model="ruleForm.splitcode" placeholder="" style="width: 110px">
281 <el-option v-for="item in splitcodes" :key="item.value" :label="item.label" 293 <el-option v-for="item in splitcodes" :key="item.value" :label="item.label"
282 :value="item.value"></el-option> 294 :value="item.value"></el-option>
283 </el-select> 295 </el-select>
284 </el-form-item> 296 </el-form-item>
285 </el-col> 297 </el-col>
286 - <el-col :span="3">  
287 - <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> 298 + <el-col :span="2">
  299 + <el-form-item prop="splitcode">
  300 + <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button>
  301 + </el-form-item>
288 </el-col> 302 </el-col>
289 </el-row> 303 </el-row>
290 <el-row class="flightInfo"> 304 <el-row class="flightInfo">
291 - <el-col :span="4"> 305 + <el-col :span="6" style="margin-left: -40px">
292 <div v-if="FenStatus === 'addAwbh'"> 306 <div v-if="FenStatus === 'addAwbh'">
293 - <el-form-item label="分单号" prop="awbh">  
294 - <el-input v-model="ruleForm.awbh"></el-input> 307 + <el-form-item prop="awbh">
  308 + <el-input v-model="ruleForm.awbh" style="width: 200px">
  309 + <template slot="prepend">分单号</template>
  310 + </el-input>
295 </el-form-item> 311 </el-form-item>
296 </div> 312 </div>
297 <div v-else> 313 <div v-else>
298 - <el-form-item style="display: none" label="分单号" prop="awbh">  
299 - <el-input v-model="ruleForm.awbh"></el-input> 314 + <el-form-item style="display: none" prop="awbh" >
  315 + <el-input v-model="ruleForm.awbh" style="width: 200px">
  316 + <template slot="prepend">分单号</template>
  317 + </el-input>
300 </el-form-item> 318 </el-form-item>
301 </div> 319 </div>
302 </el-col> 320 </el-col>
@@ -315,44 +333,64 @@ @@ -315,44 +333,64 @@
315 </el-col> 333 </el-col>
316 </el-row> 334 </el-row>
317 <el-row style="margin-bottom: 0px;"> 335 <el-row style="margin-bottom: 0px;">
318 - <el-col :span="3">  
319 - <el-form-item label="起始站" prop="awbinfo.sairportid" >  
320 - <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input> 336 + <el-col :span="6" style="margin-left: -40px">
  337 + <el-form-item prop="awbinfo.sairportid" >
  338 + <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  339 + <template slot="prepend">起始站</template>
  340 + </el-input>
321 </el-form-item> 341 </el-form-item>
322 </el-col> 342 </el-col>
323 - <el-col :span="3">  
324 - <el-form-item label="承运人1" prop="awbinfo.by1">  
325 - <el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()"></el-input> 343 + <el-col :span="6">
  344 + <el-form-item prop="awbinfo.by1">
  345 + <el-input v-model="ruleForm.awbinfo.by1" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  346 + <template slot="prepend">承运人1</template>
  347 + </el-input>
326 </el-form-item> 348 </el-form-item>
327 </el-col> 349 </el-col>
328 - <el-col :span="3">  
329 - <el-form-item label="到达站1" prop="awbinfo.dest1">  
330 - <el-input v-model="ruleForm.awbinfo.dest1"></el-input> 350 + <el-col :span="6">
  351 + <el-form-item prop="awbinfo.dest1">
  352 + <el-input v-model="ruleForm.awbinfo.dest1" style="width: 200px">
  353 + <template slot="prepend">到达站1</template>
  354 +
  355 + </el-input>
331 </el-form-item> 356 </el-form-item>
332 </el-col> 357 </el-col>
333 - <el-col :span="3">  
334 - <el-form-item label="承运人2" prop="awbinfo.by2">  
335 - <el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()"></el-input> 358 + <el-col :span="6">
  359 + <el-form-item prop="awbinfo.by2">
  360 + <el-input v-model="ruleForm.awbinfo.by2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  361 + <template slot="prepend">承运人2</template>
  362 +
  363 + </el-input>
336 </el-form-item> 364 </el-form-item>
337 </el-col> 365 </el-col>
338 - <el-col :span="3">  
339 - <el-form-item label="到达站2" prop="awbinfo.dest2">  
340 - <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()"></el-input> 366 + </el-row>
  367 + <el-row>
  368 + <el-col :span="6" style="margin-left: -40px">
  369 + <el-form-item prop="awbinfo.dest2">
  370 + <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  371 + <template slot="prepend">到达站2</template>
  372 + </el-input>
341 </el-form-item> 373 </el-form-item>
342 </el-col> 374 </el-col>
343 - <el-col :span="3">  
344 - <el-form-item label="承运人3" prop="awbinfo.by3">  
345 - <el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()"></el-input> 375 + <el-col :span="6">
  376 + <el-form-item prop="awbinfo.by3">
  377 + <el-input v-model="ruleForm.awbinfo.by3" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  378 + <template slot="prepend">承运人3</template>
  379 + </el-input>
346 </el-form-item> 380 </el-form-item>
347 </el-col> 381 </el-col>
348 - <el-col :span="3">  
349 - <el-form-item label="到达站3" prop="awbinfo.dest3">  
350 - <el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()"></el-input> 382 + <el-col :span="6">
  383 + <el-form-item prop="awbinfo.dest3">
  384 + <el-input v-model="ruleForm.awbinfo.dest3" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  385 + <template slot="prepend">到达站3</template>
  386 + </el-input>
351 </el-form-item> 387 </el-form-item>
352 </el-col> 388 </el-col>
353 - <el-col :span="3">  
354 - <el-form-item label="目的站" prop="awbinfo.eairportid">  
355 - <el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()"></el-input> 389 + <el-col :span="6">
  390 + <el-form-item prop="awbinfo.eairportid">
  391 + <el-input v-model="ruleForm.awbinfo.eairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
  392 + <template slot="prepend">目的站</template>
  393 + </el-input>
356 </el-form-item> 394 </el-form-item>
357 </el-col> 395 </el-col>
358 </el-row> 396 </el-row>
@@ -364,58 +402,55 @@ @@ -364,58 +402,55 @@
364 </el-row> 402 </el-row>
365 <el-row style="margin-bottom: 0px;"> 403 <el-row style="margin-bottom: 0px;">
366 <el-row class="product"> 404 <el-row class="product">
367 - <el-col :span="6">  
368 - <el-form-item label="总件数" prop="awbinfo.pcs">  
369 - <el-input type="number" v-model="ruleForm.awbinfo.pcs" ></el-input> 405 + <el-col :span="6" style="margin-left: -40px">
  406 + <el-form-item label="" prop="awbinfo.pcs">
  407 + <el-input type="number" v-model="ruleForm.awbinfo.pcs" style="width: 200px">
  408 + <template slot="prepend">总件数</template>
  409 + </el-input>
370 </el-form-item> 410 </el-form-item>
371 </el-col> 411 </el-col>
372 <el-col :span="6"> 412 <el-col :span="6">
373 - <el-form-item label="总重量" prop="awbinfo.weight">  
374 - <el-input type="number" v-model="ruleForm.awbinfo.weight"></el-input> 413 + <el-form-item label="" prop="awbinfo.weight">
  414 + <el-input type="number" v-model="ruleForm.awbinfo.weight" style="width: 200px">
  415 + <template slot="prepend">总重量</template>
  416 + </el-input>
375 </el-form-item> 417 </el-form-item>
376 </el-col> 418 </el-col>
377 <el-col :span="6"> 419 <el-col :span="6">
378 - <el-form-item label="舱单件数" prop="piece">  
379 - <el-input type="number" v-model="ruleForm.piece"></el-input> 420 + <el-form-item label="" prop="piece">
  421 + <el-input type="number" v-model="ruleForm.piece" style="width: 200px">
  422 + <template slot="prepend">舱单件数</template>
  423 + </el-input>
380 </el-form-item> 424 </el-form-item>
381 </el-col> 425 </el-col>
382 <el-col :span="6"> 426 <el-col :span="6">
383 - <el-form-item label="舱单重量" prop="weight">  
384 - <el-input type="number" v-model="ruleForm.weight"></el-input> 427 + <el-form-item label="" prop="weight">
  428 + <el-input type="number" v-model="ruleForm.weight" style="width: 200px">
  429 + <template slot="prepend">舱单重量</template>
  430 + </el-input>
385 </el-form-item> 431 </el-form-item>
386 </el-col> 432 </el-col>
387 </el-row> 433 </el-row>
388 <el-row class="product"> 434 <el-row class="product">
389 - <el-col :span="6">  
390 - <el-form-item label="特货代码" prop="specopeid">  
391 - <el-input v-model="ruleForm.awbinfo.specopeid"></el-input>  
392 - </el-form-item>  
393 - </el-col>  
394 - <el-col :span="6">  
395 - <el-form-item label="付费方式" prop="paymodel">  
396 - <el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="display:inline">  
397 - <el-option v-for="item in paymodel" :key="item.value" :label="item.label"  
398 - :value="item.value"></el-option>  
399 - </el-select> 435 + <el-col :span="6" style="margin-left: -40px">
  436 + <el-form-item label="" prop="specopeid">
  437 + <el-input v-model="ruleForm.awbinfo.specopeid" style="width: 200px">
  438 + <template slot="prepend">特货代码</template>
  439 + </el-input>
400 </el-form-item> 440 </el-form-item>
401 </el-col> 441 </el-col>
402 - <el-col :span="6">  
403 - <el-form-item label="海关状态" prop="awbinfo.awbtype">  
404 - <el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="display:inline">  
405 - <el-option v-for="(item,index) in customext5" :key="index" :label="item.label"  
406 - :value="item.value"></el-option>  
407 - </el-select>  
408 - </el-form-item>  
409 - </el-col>  
410 - <el-col :span="6">  
411 - <el-form-item label="海关关区" prop="customcode"> 442 + <el-col :span="9" style="margin-left: 55px">
  443 + <el-form-item label="" prop="customcode">
  444 + <div class="ip">
  445 + 海关关区
  446 + </div>
412 <el-select v-model="ruleForm.customcode" 447 <el-select v-model="ruleForm.customcode"
413 filterable 448 filterable
414 allow-create 449 allow-create
415 default-first-option 450 default-first-option
416 remote 451 remote
417 :remote-method="remoteMethod2" 452 :remote-method="remoteMethod2"
418 - :loading="loading" placeholder="请选择" style="display:inline"> 453 + :loading="loading" placeholder="请选择" style="width: 115px">
419 <el-option 454 <el-option
420 v-for="item in customcodes" 455 v-for="item in customcodes"
421 :key="item.customcode" 456 :key="item.customcode"
@@ -427,11 +462,35 @@ @@ -427,11 +462,35 @@
427 </el-select> 462 </el-select>
428 </el-form-item> 463 </el-form-item>
429 </el-col> 464 </el-col>
  465 + <el-col :span="9" style="margin-left: -35px">
  466 + <el-form-item label="" prop="paymodel">
  467 + <div class="ip">
  468 + 付费方式
  469 + </div>
  470 + <el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="width: 110px">
  471 + <el-option v-for="item in paymodel" :key="item.value" :label="item.label"
  472 + :value="item.value"></el-option>
  473 + </el-select>
  474 + </el-form-item>
  475 + </el-col>
430 </el-row> 476 </el-row>
431 <el-row class="product"> 477 <el-row class="product">
432 - <el-col :span="12">  
433 - <el-form-item label="货物描述" prop="goodsname">  
434 - <el-input v-model="ruleForm.goodsname"></el-input> 478 + <el-col :span="12" style="margin-left: -40px" >
  479 + <el-form-item label="" prop="awbinfo.awbtype">
  480 + <div class="ip">
  481 + 海关状态
  482 + </div>
  483 + <el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="width: 110px">
  484 + <el-option v-for="(item,index) in customext5" :key="index" :label="item.label"
  485 + :value="item.value"></el-option>
  486 + </el-select>
  487 + </el-form-item>
  488 + </el-col>
  489 + <el-col :span="8" style="margin-left: -10px">
  490 + <el-form-item label="" prop="goodsname">
  491 + <el-input v-model="ruleForm.goodsname" style="width: 250px">
  492 + <template slot="prepend">货物描述</template>
  493 + </el-input>
435 </el-form-item> 494 </el-form-item>
436 </el-col> 495 </el-col>
437 </el-row> 496 </el-row>
@@ -443,19 +502,39 @@ @@ -443,19 +502,39 @@
443 </el-col> 502 </el-col>
444 </el-row> 503 </el-row>
445 <el-row style="margin-bottom: 0px;"> 504 <el-row style="margin-bottom: 0px;">
446 - <el-col :span="6">  
447 - <el-form-item label="发货人称" prop="awbinfo.shprname">  
448 - <el-input v-model="ruleForm.awbinfo.shprname"></el-input> 505 + <el-col :span="6" style="margin-left: -40px">
  506 + <el-form-item label="" prop="awbinfo.shprname">
  507 + <el-input v-model="ruleForm.awbinfo.shprname" style="width: 200px">
  508 + <template slot="prepend">发货人称</template>
  509 + </el-input>
449 </el-form-item> 510 </el-form-item>
450 </el-col> 511 </el-col>
  512 +
451 <el-col :span="6"> 513 <el-col :span="6">
452 - <el-form-item label="国家代码" prop="awbinfo.shprcountyr"> 514 + <el-form-item label="" prop="awbinfo.shpraddress">
  515 + <el-input v-model="ruleForm.awbinfo.shpraddress" style="width: 200px">
  516 + <template slot="prepend">地址</template>
  517 + </el-input>
  518 + </el-form-item>
  519 + </el-col>
  520 + <el-col :span="5">
  521 + <el-form-item label="" prop="awbinfo.shprtel">
  522 + <el-input v-model="ruleForm.awbinfo.shprtel" style="width: 200px">
  523 + <template slot="prepend">电话</template>
  524 + </el-input>
  525 + </el-form-item>
  526 + </el-col>
  527 + <el-col :span="7">
  528 + <el-form-item label="" prop="awbinfo.shprcountyr">
  529 + <div class="ip">
  530 + 国家代码
  531 + </div>
453 <el-select v-model="ruleForm.awbinfo.shprcountyr" 532 <el-select v-model="ruleForm.awbinfo.shprcountyr"
454 filterable 533 filterable
455 allow-create 534 allow-create
456 default-first-option 535 default-first-option
457 remote 536 remote
458 - :remote-method="remoteMethod" 537 + :remote-method="remoteMethod" style="width: 110px"
459 :loading="loading" placeholder="请选择"> 538 :loading="loading" placeholder="请选择">
460 <el-option 539 <el-option
461 v-for="item in shprcountyrs" 540 v-for="item in shprcountyrs"
@@ -468,16 +547,6 @@ @@ -468,16 +547,6 @@
468 </el-select> 547 </el-select>
469 </el-form-item> 548 </el-form-item>
470 </el-col> 549 </el-col>
471 - <el-col :span="6">  
472 - <el-form-item label="地址" prop="awbinfo.shpraddress">  
473 - <el-input v-model="ruleForm.awbinfo.shpraddress"></el-input>  
474 - </el-form-item>  
475 - </el-col>  
476 - <el-col :span="6">  
477 - <el-form-item label="电话" prop="awbinfo.shprtel">  
478 - <el-input v-model="ruleForm.awbinfo.shprtel"></el-input>  
479 - </el-form-item>  
480 - </el-col>  
481 </el-row> 550 </el-row>
482 <!--收货人信息部分--> 551 <!--收货人信息部分-->
483 <el-row class="flightInfo"> 552 <el-row class="flightInfo">
@@ -486,20 +555,39 @@ @@ -486,20 +555,39 @@
486 </el-col> 555 </el-col>
487 </el-row> 556 </el-row>
488 <el-row style="margin-bottom: 5px"> 557 <el-row style="margin-bottom: 5px">
489 - <el-col :span="6">  
490 - <el-form-item label="收货人称" prop="awbinfo.cnsnname">  
491 - <el-input v-model="ruleForm.awbinfo.cnsnname"></el-input> 558 + <el-col :span="6" style="margin-left: -40px">
  559 + <el-form-item label="" prop="awbinfo.cnsnname">
  560 + <el-input v-model="ruleForm.awbinfo.cnsnname" style="width: 200px">
  561 + <template slot="prepend">收货人称</template>
  562 + </el-input>
492 </el-form-item> 563 </el-form-item>
493 </el-col> 564 </el-col>
494 - <el-col :span="6">  
495 565
496 - <el-form-item label="国家代码" prop="awbinfo.cnscountyr"> 566 + <el-col :span="6">
  567 + <el-form-item label="" prop="awbinfo.cnsnaddress">
  568 + <el-input v-model="ruleForm.awbinfo.cnsnaddress" style="width: 200px">
  569 + <template slot="prepend">地址</template>
  570 + </el-input>
  571 + </el-form-item>
  572 + </el-col>
  573 + <el-col :span="5">
  574 + <el-form-item label="" prop="awbinfo.cnsntel">
  575 + <el-input v-model="ruleForm.awbinfo.cnsntel" style="width: 200px">
  576 + <template slot="prepend">电话</template>
  577 + </el-input>
  578 + </el-form-item>
  579 + </el-col>
  580 + <el-col :span="7">
  581 + <el-form-item label="" prop="awbinfo.cnscountyr">
  582 + <div class="ip">
  583 + 国家代码
  584 + </div>
497 <el-select v-model="ruleForm.awbinfo.cnscountyr" 585 <el-select v-model="ruleForm.awbinfo.cnscountyr"
498 filterable 586 filterable
499 allow-create 587 allow-create
500 default-first-option 588 default-first-option
501 remote 589 remote
502 - :remote-method="remoteMethod" 590 + :remote-method="remoteMethod" style="width: 110px"
503 :loading="loading" placeholder="请选择"> 591 :loading="loading" placeholder="请选择">
504 <el-option 592 <el-option
505 v-for="item in cnscountyrs" 593 v-for="item in cnscountyrs"
@@ -512,16 +600,6 @@ @@ -512,16 +600,6 @@
512 </el-select> 600 </el-select>
513 </el-form-item> 601 </el-form-item>
514 </el-col> 602 </el-col>
515 - <el-col :span="6">  
516 - <el-form-item label="地址" prop="awbinfo.cnsnaddress">  
517 - <el-input v-model="ruleForm.awbinfo.cnsnaddress"></el-input>  
518 - </el-form-item>  
519 - </el-col>  
520 - <el-col :span="6">  
521 - <el-form-item label="电话" prop="awbinfo.cnsntel">  
522 - <el-input v-model="ruleForm.awbinfo.cnsntel"></el-input>  
523 - </el-form-item>  
524 - </el-col>  
525 </el-row> 603 </el-row>
526 <!--分单信息部分--> 604 <!--分单信息部分-->
527 <el-row class="flightInfo"> 605 <el-row class="flightInfo">
@@ -542,7 +620,8 @@ @@ -542,7 +620,8 @@
542 <template> 620 <template>
543 <el-table 621 <el-table
544 :data="tableData2" 622 :data="tableData2"
545 - style="width: 100%"> 623 + style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  624 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
546 <el-table-column 625 <el-table-column
547 prop="awbh" 626 prop="awbh"
548 label="分单号" 627 label="分单号"
@@ -605,7 +684,7 @@ @@ -605,7 +684,7 @@
605 <el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button> 684 <el-button type="primary" size="mini" :disabled="batich" @click="batchaplly()">批量申请</el-button>
606 </div> 685 </div>
607 </el-col> 686 </el-col>
608 - <el-col :span="2" class="pub"> 687 + <el-col :span="1.5" class="pub">
609 <div class="grid-content"> 688 <div class="grid-content">
610 <el-button type="primary" @click="back" size="mini">返回</el-button> 689 <el-button type="primary" @click="back" size="mini">返回</el-button>
611 </div> 690 </div>
@@ -616,7 +695,7 @@ @@ -616,7 +695,7 @@
616 <el-col :span="3.5" class="pub"> 695 <el-col :span="3.5" class="pub">
617 <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div> 696 <div class="grid-content"><span>舱单总件数：{{sumNmmsPrice}}</span></div>
618 </el-col> 697 </el-col>
619 - <el-col :span="7" class="pub"> 698 + <el-col :span="7.5" class="pub">
620 <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div> 699 <div class="grid-content"><span>舱单总重量：{{sumNmmsWeight}}</span></div>
621 </el-col> 700 </el-col>
622 </el-row> 701 </el-row>
@@ -638,17 +717,35 @@ @@ -638,17 +717,35 @@
638 <el-row> 717 <el-row>
639 <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible"> 718 <el-dialog :title="'提交'+Reason[udStatus]+'信息'" :visible.sync="dialogFormVisible">
640 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm"> 719 <el-form :model="Udform" :rules="udrules" ref="Udform" class="demo-ruleForm">
641 - <el-form-item label="操作原因" prop="operreason">  
642 - <el-input type="textarea" v-model="Udform.operreason"></el-input>  
643 - </el-form-item>  
644 - <el-form-item label="操作人" prop="operperson">  
645 - <el-input v-model="Udform.operperson"></el-input>  
646 - </el-form-item>  
647 - <el-form-item label="联系电话" prop="opertel">  
648 - <el-input v-model="Udform.opertel"></el-input>  
649 - </el-form-item> 720 + <el-row style="margin: 10px auto">
  721 + <el-col :span="22">
  722 + <el-form-item label="" prop="operreason">
  723 + <div class="ip">
  724 + 操作原因
  725 + </div>
  726 + <el-input autosize type="textarea" v-model="Udform.operreason" style="width: 80%">
  727 + </el-input>
  728 + </el-form-item>
  729 + </el-col>
  730 + </el-row>
  731 + <el-row>
  732 + <el-col :span="11" style="margin-right: 10px">
  733 + <el-form-item label="" prop="operperson">
  734 + <el-input v-model="Udform.operperson" style="width: 200px">
  735 + <template slot="prepend">操作人</template>
  736 + </el-input>
  737 + </el-form-item>
  738 + </el-col>
  739 + <el-col :span="10">
  740 + <el-form-item label="" prop="opertel">
  741 + <el-input v-model="Udform.opertel" style="width: 250px">
  742 + <template slot="prepend">联系电话</template>
  743 + </el-input>
  744 + </el-form-item>
  745 + </el-col>
  746 + </el-row>
650 </el-form> 747 </el-form>
651 - <div slot="footer" class="dialog-footer"> 748 + <div slot="footer" class="dialog-footer" style="margin-top: 30px" align="center">
652 <el-button @click="dialogFormVisible = false">取 消</el-button> 749 <el-button @click="dialogFormVisible = false">取 消</el-button>
653 <el-button type="primary" @click="udStatus==='delete'?deleteUdForm('Udform'):updateUdForm('Udform')">确 定</el-button> 750 <el-button type="primary" @click="udStatus==='delete'?deleteUdForm('Udform'):updateUdForm('Udform')">确 定</el-button>
654 </div> 751 </div>
@@ -657,7 +754,8 @@ @@ -657,7 +754,8 @@
657 <!--明细列表弹出框--> 754 <!--明细列表弹出框-->
658 <el-row> 755 <el-row>
659 <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%"> 756 <el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
660 - <el-table :data="gridData"> 757 + <el-table :data="gridData" style="border-radius: 10px 10px 0px 0px;line-height: 25px;min-height: 500px"
  758 + :header-cell-style="{background:'#6F8294',color:'#FFFFFF'}" size="small">
661 <el-table-column property="busdate" label="时间" width="160"></el-table-column> 759 <el-table-column property="busdate" label="时间" width="160"></el-table-column>
662 <el-table-column property="operusername" label="操作人" width="130"></el-table-column> 760 <el-table-column property="operusername" label="操作人" width="130"></el-table-column>
663 <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column> 761 <el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
@@ -671,6 +769,22 @@ @@ -671,6 +769,22 @@
671 </template> 769 </template>
672 <!--自定义CSS样式--> 770 <!--自定义CSS样式-->
673 <style scoped> 771 <style scoped>
  772 + .ip{
  773 + max-width: 100px;
  774 + margin-right: -4px;
  775 + display: inline-block;
  776 + background-color: #6F8294;
  777 + color: #ffffff;
  778 + border: 1px solid #DCDFE6;
  779 + vertical-align: middle;
  780 + padding: 0 18px;
  781 + white-space: nowrap;
  782 + border-top-right-radius: 0px;
  783 + border-top-left-radius: 4px;
  784 + border-bottom-left-radius: 4px;
  785 + border-bottom-right-radius: 0px;
  786 + font-size: 10px;
  787 + }
674 .grid-content { 788 .grid-content {
675 height: 36px; 789 height: 36px;
676 line-height: 36px; 790 line-height: 36px;