朱兆平 / vue_cli · 提交

转到一个项目

作者 小范
提交 9bbba7a6f16f4b16f02db4322de59e9d5f6a25cb 1 个父辈 ffcd4e74

进港原始舱单编辑页面优化

内嵌 并排对比
正在显示 1 个修改的文件 包含 33 行增加 和 32 行删除
@@ -234,15 +234,14 @@ @@ -234,15 +234,14 @@
234 </el-row> 234 </el-row>
235 <!--编辑主单--> 235 <!--编辑主单-->
236 <el-dialog :title="'原始舱单信息'+textMap[dialogStatus]" :visible.sync="outerVisible" width="90%"> 236 <el-dialog :title="'原始舱单信息'+textMap[dialogStatus]" :visible.sync="outerVisible" width="90%">
237 - <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition"  
238 - label-width="78px" size="mini"> 237 + <el-form :model="ruleForm" :rules="rules" ref="ruleForm" :label-position="labelPosition" size="mini">
239 <!--航班信息部分--> 238 <!--航班信息部分-->
240 <el-row class="flightInfo"> 239 <el-row class="flightInfo">
241 <el-col :span="24"> 240 <el-col :span="24">
242 <div class="grid-content content">航班信息</div> 241 <div class="grid-content content">航班信息</div>
243 </el-col> 242 </el-col>
244 <el-row class="flightInfo"> 243 <el-row class="flightInfo">
245 - <el-col :span="5" style="margin-left: -40px"> 244 + <el-col :span="6">
246 <el-form-item prop="awba"> 245 <el-form-item prop="awba">
247 <div v-if="dialogStatus === 'update'"> 246 <div v-if="dialogStatus === 'update'">
248 <el-input disabled="" v-model="ruleForm.awba" style="width: 200px"> 247 <el-input disabled="" v-model="ruleForm.awba" style="width: 200px">
@@ -254,7 +253,7 @@ @@ -254,7 +253,7 @@
254 </div> 253 </div>
255 </el-form-item> 254 </el-form-item>
256 </el-col> 255 </el-col>
257 - <el-col :span="5"> 256 + <el-col :span="6">
258 <el-form-item prop="flightno"> 257 <el-form-item prop="flightno">
259 <el-input disabled="" v-model="ruleForm.flightno" style="width: 200px"> 258 <el-input disabled="" v-model="ruleForm.flightno" style="width: 200px">
260 <template slot="prepend">航班号</template> 259 <template slot="prepend">航班号</template>
@@ -268,7 +267,7 @@ @@ -268,7 +267,7 @@
268 </el-input> 267 </el-input>
269 </el-form-item> 268 </el-form-item>
270 </el-col> 269 </el-col>
271 - <el-col :span="7"> 270 + <el-col :span="6">
272 <el-form-item label="" required> 271 <el-form-item label="" required>
273 <el-form-item prop="flightdate"> 272 <el-form-item prop="flightdate">
274 <div class="ip"> 273 <div class="ip">
@@ -276,7 +275,7 @@ @@ -276,7 +275,7 @@
276 </div> 275 </div>
277 <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false" 276 <el-date-picker disabled="" type="date" placeholder="选择日期" :clearable="false"
278 v-model="ruleForm.flightdate" 277 v-model="ruleForm.flightdate"
279 - style="width: 125px"> 278 + style="width: 145px">
280 279
281 </el-date-picker> 280 </el-date-picker>
282 </el-form-item> 281 </el-form-item>
@@ -284,7 +283,7 @@ @@ -284,7 +283,7 @@
284 </el-col> 283 </el-col>
285 </el-row> 284 </el-row>
286 <el-row class="flightInfo"> 285 <el-row class="flightInfo">
287 - <el-col :span="18" style="margin-left: -40px"> 286 + <el-col :span="6">
288 <el-form-item prop="splitcode"> 287 <el-form-item prop="splitcode">
289 <div class="ip"> 288 <div class="ip">
290 是否分批 289 是否分批
@@ -295,14 +294,14 @@ @@ -295,14 +294,14 @@
295 </el-select> 294 </el-select>
296 </el-form-item> 295 </el-form-item>
297 </el-col> 296 </el-col>
298 - <el-col :span="2"> 297 + <el-col :span="1.5">
299 <el-form-item prop="splitcode"> 298 <el-form-item prop="splitcode">
300 <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button> 299 <el-button size="mini" type="primary" @click="dialogStatus==='create'?createData('ruleForm'):updateData('ruleForm')" style="float: right">保存</el-button>
301 </el-form-item> 300 </el-form-item>
302 </el-col> 301 </el-col>
303 </el-row> 302 </el-row>
304 <el-row class="flightInfo"> 303 <el-row class="flightInfo">
305 - <el-col :span="6" style="margin-left: -40px"> 304 + <el-col :span="6">
306 <div v-if="FenStatus === 'addAwbh'"> 305 <div v-if="FenStatus === 'addAwbh'">
307 <el-form-item prop="awbh"> 306 <el-form-item prop="awbh">
308 <el-input v-model="ruleForm.awbh" style="width: 200px"> 307 <el-input v-model="ruleForm.awbh" style="width: 200px">
@@ -333,7 +332,7 @@ @@ -333,7 +332,7 @@
333 </el-col> 332 </el-col>
334 </el-row> 333 </el-row>
335 <el-row style="margin-bottom: 0px;"> 334 <el-row style="margin-bottom: 0px;">
336 - <el-col :span="6" style="margin-left: -40px"> 335 + <el-col :span="6">
337 <el-form-item prop="awbinfo.sairportid" > 336 <el-form-item prop="awbinfo.sairportid" >
338 <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> 337 <el-input v-model="ruleForm.awbinfo.sairportid" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
339 <template slot="prepend">起始站</template> 338 <template slot="prepend">起始站</template>
@@ -365,7 +364,7 @@ @@ -365,7 +364,7 @@
365 </el-col> 364 </el-col>
366 </el-row> 365 </el-row>
367 <el-row> 366 <el-row>
368 - <el-col :span="6" style="margin-left: -40px"> 367 + <el-col :span="6">
369 <el-form-item prop="awbinfo.dest2"> 368 <el-form-item prop="awbinfo.dest2">
370 <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px"> 369 <el-input v-model="ruleForm.awbinfo.dest2" onkeyup="this.value=this.value.toUpperCase()" style="width: 200px">
371 <template slot="prepend">到达站2</template> 370 <template slot="prepend">到达站2</template>
@@ -402,7 +401,7 @@ @@ -402,7 +401,7 @@
402 </el-row> 401 </el-row>
403 <el-row style="margin-bottom: 0px;"> 402 <el-row style="margin-bottom: 0px;">
404 <el-row class="product"> 403 <el-row class="product">
405 - <el-col :span="6" style="margin-left: -40px"> 404 + <el-col :span="6">
406 <el-form-item label="" prop="awbinfo.pcs"> 405 <el-form-item label="" prop="awbinfo.pcs">
407 <el-input type="number" v-model="ruleForm.awbinfo.pcs" style="width: 200px"> 406 <el-input type="number" v-model="ruleForm.awbinfo.pcs" style="width: 200px">
408 <template slot="prepend">总件数</template> 407 <template slot="prepend">总件数</template>
@@ -432,14 +431,14 @@ @@ -432,14 +431,14 @@
432 </el-col> 431 </el-col>
433 </el-row> 432 </el-row>
434 <el-row class="product"> 433 <el-row class="product">
435 - <el-col :span="6" style="margin-left: -40px"> 434 + <el-col :span="6">
436 <el-form-item label="" prop="specopeid"> 435 <el-form-item label="" prop="specopeid">
437 <el-input v-model="ruleForm.awbinfo.specopeid" style="width: 200px"> 436 <el-input v-model="ruleForm.awbinfo.specopeid" style="width: 200px">
438 <template slot="prepend">特货代码</template> 437 <template slot="prepend">特货代码</template>
439 </el-input> 438 </el-input>
440 </el-form-item> 439 </el-form-item>
441 </el-col> 440 </el-col>
442 - <el-col :span="9"> 441 + <el-col :span="6">
443 <el-form-item label="" prop="customcode"> 442 <el-form-item label="" prop="customcode">
444 <div class="ip"> 443 <div class="ip">
445 海关关区 444 海关关区
@@ -462,33 +461,33 @@ @@ -462,33 +461,33 @@
462 </el-select> 461 </el-select>
463 </el-form-item> 462 </el-form-item>
464 </el-col> 463 </el-col>
465 - <el-col :span="9" style="margin-left: -135px">  
466 - <el-form-item label="" prop="paymodel"> 464 + <el-col :span="6" >
  465 + <el-form-item label="" prop="awbinfo.awbtype">
467 <div class="ip"> 466 <div class="ip">
468 - 付费方式 467 + 海关状态
469 </div> 468 </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" 469 + <el-select v-model="ruleForm.awbinfo.awbtype" placeholder="" style="width: 110px">
  470 + <el-option v-for="(item,index) in customext5" :key="index" :label="item.label"
472 :value="item.value"></el-option> 471 :value="item.value"></el-option>
473 </el-select> 472 </el-select>
474 </el-form-item> 473 </el-form-item>
475 </el-col> 474 </el-col>
476 - </el-row>  
477 - <el-row class="product">  
478 - <el-col :span="12" style="margin-left: -40px" >  
479 - <el-form-item label="" prop="awbinfo.awbtype"> 475 + <el-col :span="6">
  476 + <el-form-item label="" prop="paymodel">
480 <div class="ip"> 477 <div class="ip">
481 - 海关状态 478 + 付费方式
482 </div> 479 </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" 480 + <el-select v-model="ruleForm.awbinfo.paymodel" placeholder="" style="width: 120px">
  481 + <el-option v-for="item in paymodel" :key="item.value" :label="item.label"
485 :value="item.value"></el-option> 482 :value="item.value"></el-option>
486 </el-select> 483 </el-select>
487 </el-form-item> 484 </el-form-item>
488 </el-col> 485 </el-col>
489 - <el-col :span="8"> 486 + </el-row>
  487 + <el-row class="product">
  488 + <el-col :span="12">
490 <el-form-item label="" prop="goodsname"> 489 <el-form-item label="" prop="goodsname">
491 - <el-input v-model="ruleForm.goodsname" style="width: 250px"> 490 + <el-input v-model="ruleForm.goodsname" style="width: 100%">
492 <template slot="prepend">货物描述</template> 491 <template slot="prepend">货物描述</template>
493 </el-input> 492 </el-input>
494 </el-form-item> 493 </el-form-item>
@@ -502,7 +501,7 @@ @@ -502,7 +501,7 @@
502 </el-col> 501 </el-col>
503 </el-row> 502 </el-row>
504 <el-row style="margin-bottom: 0px;"> 503 <el-row style="margin-bottom: 0px;">
505 - <el-col :span="6" style="margin-left: -40px"> 504 + <el-col :span="6">
506 <el-form-item label="" prop="awbinfo.shprname"> 505 <el-form-item label="" prop="awbinfo.shprname">
507 <el-input v-model="ruleForm.awbinfo.shprname" style="width: 200px"> 506 <el-input v-model="ruleForm.awbinfo.shprname" style="width: 200px">
508 <template slot="prepend">发货人称</template> 507 <template slot="prepend">发货人称</template>
@@ -555,7 +554,7 @@ @@ -555,7 +554,7 @@
555 </el-col> 554 </el-col>
556 </el-row> 555 </el-row>
557 <el-row style="margin-bottom: 5px"> 556 <el-row style="margin-bottom: 5px">
558 - <el-col :span="6" style="margin-left: -40px"> 557 + <el-col :span="6">
559 <el-form-item label="" prop="awbinfo.cnsnname"> 558 <el-form-item label="" prop="awbinfo.cnsnname">
560 <el-input v-model="ruleForm.awbinfo.cnsnname" style="width: 200px"> 559 <el-input v-model="ruleForm.awbinfo.cnsnname" style="width: 200px">
561 <template slot="prepend">收货人称</template> 560 <template slot="prepend">收货人称</template>
@@ -671,7 +670,7 @@ @@ -671,7 +670,7 @@
671 <el-row style="margin-top: 20px"> 670 <el-row style="margin-top: 20px">
672 <el-col :span="2.5" class="pub"> 671 <el-col :span="2.5" class="pub">
673 <div class="grid-content"> 672 <div class="grid-content">
674 - <el-button type="primary" size="mini" v-on:click="addOrig">新增原始舱单</el-button> 673 + <el-button type="primary" size="mini" v-on:click="addOrig()">新增原始舱单</el-button>
675 </div> 674 </div>
676 </el-col> 675 </el-col>
677 <el-col :span="2.5" class="pub"> 676 <el-col :span="2.5" class="pub">
@@ -1169,6 +1168,9 @@ @@ -1169,6 +1168,9 @@
1169 this.FenQuery.originstation=this.defaultQuery.originstation; 1168 this.FenQuery.originstation=this.defaultQuery.originstation;
1170 this.FenQuery.destinationstation=row.destinationstation; 1169 this.FenQuery.destinationstation=row.destinationstation;
1171 this.getFenList(this.FenQuery); 1170 this.getFenList(this.FenQuery);
  1171 + // this.$nextTick(function () {
  1172 + // this.$refs.formName.resetFields();
  1173 + // });
1172 }, 1174 },
1173 /*编辑分单信息*/ 1175 /*编辑分单信息*/
1174 handleFen(index,row){ 1176 handleFen(index,row){
@@ -1178,7 +1180,6 @@ @@ -1178,7 +1180,6 @@
1178 this.ruleForm=row; 1180 this.ruleForm=row;
1179 this.ruleForm.flightno=row.carrier+row.flightno; 1181 this.ruleForm.flightno=row.carrier+row.flightno;
1180 this.ruleForm.originstation=row.originstation+"-"+row.destinationstation; 1182 this.ruleForm.originstation=row.originstation+"-"+row.destinationstation;
1181 -  
1182 }, 1183 },
1183 //发送舱单报 1184 //发送舱单报
1184 handleSend(index,row){ 1185 handleSend(index,row){