|
@@ -70,13 +70,6 @@ |
|
@@ -70,13 +70,6 @@ |
|
70
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
70
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
|
71
|
<el-table-column type="selection" width="55">
|
71
|
<el-table-column type="selection" width="55">
|
|
72
|
</el-table-column>
|
72
|
</el-table-column>
|
|
73
|
-<!-- <el-table-column label="航班信息" width="90" align="center">-->
|
|
|
|
74
|
-<!-- <template slot-scope="scope">-->
|
|
|
|
75
|
-<!-- <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>-->
|
|
|
|
76
|
-<!-- <p class="tableInline">{{scope.row.flightdate}}</p>-->
|
|
|
|
77
|
-<!-- <p class="tableInline">{{scope.row.originstation}}-{{scope.row.destinationstation}}</p>-->
|
|
|
|
78
|
-<!-- </template>-->
|
|
|
|
79
|
-<!-- </el-table-column>-->
|
|
|
|
80
|
<el-table-column label="运单号" width="200" align="center">
|
73
|
<el-table-column label="运单号" width="200" align="center">
|
|
81
|
<template slot-scope="scope">
|
74
|
<template slot-scope="scope">
|
|
82
|
<span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>
|
75
|
<span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>
|
|
@@ -384,6 +377,7 @@ |
|
@@ -384,6 +377,7 @@ |
|
384
|
</el-row>
|
377
|
</el-row>
|
|
385
|
<div class="grid-content content" style="font-size: 10px">
|
378
|
<div class="grid-content content" style="font-size: 10px">
|
|
386
|
发货人信息
|
379
|
发货人信息
|
|
|
|
380
|
+ <el-button type="success" @click="consignerSelect()">选择发货人信息</el-button>
|
|
387
|
</div>
|
381
|
</div>
|
|
388
|
<el-row>
|
382
|
<el-row>
|
|
389
|
<el-col :span="3">
|
383
|
<el-col :span="3">
|
|
@@ -459,6 +453,7 @@ |
|
@@ -459,6 +453,7 @@ |
|
459
|
</el-row>
|
453
|
</el-row>
|
|
460
|
<div class="grid-content content" style="font-size: 10px">
|
454
|
<div class="grid-content content" style="font-size: 10px">
|
|
461
|
收货人信息
|
455
|
收货人信息
|
|
|
|
456
|
+ <el-button type="success" @click="consigneeSelect()">选择收货人信息</el-button>
|
|
462
|
</div>
|
457
|
</div>
|
|
463
|
<el-row>
|
458
|
<el-row>
|
|
464
|
<el-col :span="3">
|
459
|
<el-col :span="3">
|
|
@@ -638,6 +633,82 @@ |
|
@@ -638,6 +633,82 @@ |
|
638
|
<el-button type="primary" @click="sendDelete()">发送</el-button>
|
633
|
<el-button type="primary" @click="sendDelete()">发送</el-button>
|
|
639
|
</div>
|
634
|
</div>
|
|
640
|
</el-dialog>
|
635
|
</el-dialog>
|
|
|
|
636
|
+
|
|
|
|
637
|
+ <el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="50%">
|
|
|
|
638
|
+ <!--工具条-->
|
|
|
|
639
|
+ <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
|
640
|
+ <el-form :inline="true" :model="consignerQuery">
|
|
|
|
641
|
+ <el-form-item>
|
|
|
|
642
|
+ <el-input v-model="consignerQuery.companyName" placeholder="关键字查询"></el-input>
|
|
|
|
643
|
+ </el-form-item>
|
|
|
|
644
|
+ <el-form-item>
|
|
|
|
645
|
+ <el-button type="primary" v-on:click="consignerSelect()">查询</el-button>
|
|
|
|
646
|
+ </el-form-item>
|
|
|
|
647
|
+ </el-form>
|
|
|
|
648
|
+ </el-col>
|
|
|
|
649
|
+ <el-table v-loading="listLoading" :data="consignerList" stripe style="font-size: 12px"
|
|
|
|
650
|
+ border >
|
|
|
|
651
|
+ <el-table-column type="selection" width="55">
|
|
|
|
652
|
+ </el-table-column>
|
|
|
|
653
|
+ <el-table-column label="序号" type="index">
|
|
|
|
654
|
+ </el-table-column>
|
|
|
|
655
|
+ <el-table-column prop="companyName" label="发货人公司" >
|
|
|
|
656
|
+ </el-table-column>
|
|
|
|
657
|
+ <el-table-column prop="conCity" label="发货人城市" >
|
|
|
|
658
|
+ </el-table-column>
|
|
|
|
659
|
+ <el-table-column prop="country" label="发货人国家代码" >
|
|
|
|
660
|
+ </el-table-column>
|
|
|
|
661
|
+ <el-table-column prop="conPhone" label="发货人电话" >
|
|
|
|
662
|
+ </el-table-column>
|
|
|
|
663
|
+ <el-table-column prop="enterprise" label="发货人企业代码" >
|
|
|
|
664
|
+ </el-table-column>
|
|
|
|
665
|
+ <el-table-column label="操作">
|
|
|
|
666
|
+ <template slot-scope="scope">
|
|
|
|
667
|
+ <el-button type="success" @click="consignerClick(scope.row)">选择</el-button>
|
|
|
|
668
|
+ </template>
|
|
|
|
669
|
+ </el-table-column>
|
|
|
|
670
|
+ </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"
|
|
|
|
672
|
+ @pagination="consignerSelect()"/>
|
|
|
|
673
|
+ </el-dialog>
|
|
|
|
674
|
+ <el-dialog title="收货人信息" :visible.sync="dialogNeeVisible" width="50%">
|
|
|
|
675
|
+ <!--工具条-->
|
|
|
|
676
|
+ <el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
|
677
|
+ <el-form :inline="true" :model="consignerQuery">
|
|
|
|
678
|
+ <el-form-item>
|
|
|
|
679
|
+ <el-input v-model="consigneeQuery.companyName" placeholder="关键字查询"></el-input>
|
|
|
|
680
|
+ </el-form-item>
|
|
|
|
681
|
+ <el-form-item>
|
|
|
|
682
|
+ <el-button type="primary" v-on:click="consigneeSelect()">查询</el-button>
|
|
|
|
683
|
+ </el-form-item>
|
|
|
|
684
|
+ </el-form>
|
|
|
|
685
|
+ </el-col>
|
|
|
|
686
|
+ <el-table v-loading="listLoading" :data="consigneeList" stripe style="font-size: 12px"
|
|
|
|
687
|
+ border >
|
|
|
|
688
|
+ <el-table-column type="selection" width="55">
|
|
|
|
689
|
+ </el-table-column>
|
|
|
|
690
|
+ <el-table-column label="序号" type="index">
|
|
|
|
691
|
+ </el-table-column>
|
|
|
|
692
|
+ <el-table-column prop="companyName" label="收货人公司" >
|
|
|
|
693
|
+ </el-table-column>
|
|
|
|
694
|
+ <el-table-column prop="conCity" label="收货人城市" >
|
|
|
|
695
|
+ </el-table-column>
|
|
|
|
696
|
+ <el-table-column prop="country" label="收货人国家代码" >
|
|
|
|
697
|
+ </el-table-column>
|
|
|
|
698
|
+ <el-table-column prop="conPhone" label="收货人电话" >
|
|
|
|
699
|
+ </el-table-column>
|
|
|
|
700
|
+ <el-table-column prop="enterprise" label="收货人企业代码" >
|
|
|
|
701
|
+ </el-table-column>
|
|
|
|
702
|
+ <el-table-column label="操作">
|
|
|
|
703
|
+ <template slot-scope="scope">
|
|
|
|
704
|
+ <el-button type="success" @click="consigneeClick(scope.row)">选择</el-button>
|
|
|
|
705
|
+ </template>
|
|
|
|
706
|
+ </el-table-column>
|
|
|
|
707
|
+ </el-table>
|
|
|
|
708
|
+ <pagination background layout="total, prev, pager, next" v-show="consigneeQuery.total>0" :total="consigneeQuery.total" :page.sync="consigneeQuery.pageSize" :limit.sync="consigneeQuery.limitSize"
|
|
|
|
709
|
+ @pagination="consignerSelect()"/>
|
|
|
|
710
|
+ </el-dialog>
|
|
|
|
711
|
+
|
|
641
|
</div>
|
712
|
</div>
|
|
642
|
</template>
|
713
|
</template>
|
|
643
|
<script>
|
714
|
<script>
|
|
@@ -659,6 +730,8 @@ |
|
@@ -659,6 +730,8 @@ |
|
659
|
} from '@/api/exitPre'
|
730
|
} from '@/api/exitPre'
|
|
660
|
import {Message} from "element-ui";
|
731
|
import {Message} from "element-ui";
|
|
661
|
import {getResponseForParam} from '@/api/responseDetail'
|
732
|
import {getResponseForParam} from '@/api/responseDetail'
|
|
|
|
733
|
+ import { getList} from '../../api/consigner/consigner';
|
|
|
|
734
|
+ import { getList as neeList} from '../../api/consigner/consignee';
|
|
662
|
import {
|
735
|
import {
|
|
663
|
validAwb,
|
736
|
validAwb,
|
|
664
|
validAlphabets,
|
737
|
validAlphabets,
|
|
@@ -706,6 +779,22 @@ |
|
@@ -706,6 +779,22 @@ |
|
706
|
func: treeToArray,
|
779
|
func: treeToArray,
|
|
707
|
total: 1,
|
780
|
total: 1,
|
|
708
|
isAdmin: false,
|
781
|
isAdmin: false,
|
|
|
|
782
|
+ consignerList: [],
|
|
|
|
783
|
+ dialogNeeVisible: false,
|
|
|
|
784
|
+ consigneeList: [],
|
|
|
|
785
|
+ consignerQuery: {
|
|
|
|
786
|
+ companyName: '',
|
|
|
|
787
|
+ total: 0,
|
|
|
|
788
|
+ pageSize: 1,
|
|
|
|
789
|
+ limitSize: 5,
|
|
|
|
790
|
+ },
|
|
|
|
791
|
+ consigneeQuery: {
|
|
|
|
792
|
+ companyName: '',
|
|
|
|
793
|
+ total: 0,
|
|
|
|
794
|
+ pageSize: 1,
|
|
|
|
795
|
+ limitSize: 5,
|
|
|
|
796
|
+ },
|
|
|
|
797
|
+ dialogSelectVisible: false,
|
|
709
|
preQuery: {
|
798
|
preQuery: {
|
|
710
|
pageSize: 1,
|
799
|
pageSize: 1,
|
|
711
|
limitSize: 30,
|
800
|
limitSize: 30,
|
|
@@ -1228,6 +1317,77 @@ |
|
@@ -1228,6 +1317,77 @@ |
|
1228
|
handleSelectionChange() {
|
1317
|
handleSelectionChange() {
|
|
1229
|
|
1318
|
|
|
1230
|
},
|
1319
|
},
|
|
|
|
1320
|
+ // 远程获取发货人信息
|
|
|
|
1321
|
+ consignerSelect(){
|
|
|
|
1322
|
+ this.dialogSelectVisible = true;
|
|
|
|
1323
|
+ this.listLoading = true;
|
|
|
|
1324
|
+ let para = {
|
|
|
|
1325
|
+ pageSize: this.consignerQuery.pageSize,
|
|
|
|
1326
|
+ limitSize: this.consignerQuery.limitSize,
|
|
|
|
1327
|
+ companyName: this.consignerQuery.companyName
|
|
|
|
1328
|
+ };
|
|
|
|
1329
|
+ getList(para).then((res) => {
|
|
|
|
1330
|
+ this.consignerQuery.total = res.data.data.total;
|
|
|
|
1331
|
+ this.consignerList = res.data.data.list;
|
|
|
|
1332
|
+ this.listLoading = false;
|
|
|
|
1333
|
+ }).catch((error) => {
|
|
|
|
1334
|
+ this.listLoading = false;
|
|
|
|
1335
|
+ if(null!= error.response && error.response!==undefined){
|
|
|
|
1336
|
+ let status= error.response.status;
|
|
|
|
1337
|
+ let msg = error.response.statusText;
|
|
|
|
1338
|
+ alert(status+msg);
|
|
|
|
1339
|
+ }else {
|
|
|
|
1340
|
+ alert(error);
|
|
|
|
1341
|
+ }
|
|
|
|
1342
|
+
|
|
|
|
1343
|
+ });
|
|
|
|
1344
|
+ },
|
|
|
|
1345
|
+ // 远程获取收货人信息
|
|
|
|
1346
|
+ consigneeSelect(){
|
|
|
|
1347
|
+ this.dialogNeeVisible = true;
|
|
|
|
1348
|
+ this.listLoading = true;
|
|
|
|
1349
|
+ let para = {
|
|
|
|
1350
|
+ pageSize: this.consigneeQuery.pageSize,
|
|
|
|
1351
|
+ limitSize: this.consigneeQuery.limitSize,
|
|
|
|
1352
|
+ companyName: this.consigneeQuery.companyName
|
|
|
|
1353
|
+ };
|
|
|
|
1354
|
+ neeList(para).then((res) => {
|
|
|
|
1355
|
+ this.consigneeQuery.total = res.data.data.total;
|
|
|
|
1356
|
+ this.consigneeList = res.data.data.list;
|
|
|
|
1357
|
+ this.listLoading = false;
|
|
|
|
1358
|
+ }).catch((error) => {
|
|
|
|
1359
|
+ this.listLoading = false;
|
|
|
|
1360
|
+ if(null!= error.response && error.response!==undefined){
|
|
|
|
1361
|
+ let status= error.response.status;
|
|
|
|
1362
|
+ let msg = error.response.statusText;
|
|
|
|
1363
|
+ alert(status+msg);
|
|
|
|
1364
|
+ }else {
|
|
|
|
1365
|
+ alert(error);
|
|
|
|
1366
|
+ }
|
|
|
|
1367
|
+
|
|
|
|
1368
|
+ });
|
|
|
|
1369
|
+ },
|
|
|
|
1370
|
+ // 发货人信息赋值
|
|
|
|
1371
|
+ consignerClick(val){
|
|
|
|
1372
|
+ this.preModel.awbinfo.shprname=val.conName;
|
|
|
|
1373
|
+ this.preModel.awbinfo.shpraddress=val.conAddress;
|
|
|
|
1374
|
+ this.preModel.awbinfo.scityid=val.conCity;
|
|
|
|
1375
|
+ this.preModel.awbinfo.shprtel=val.conPhone;
|
|
|
|
1376
|
+ this.preModel.awbinfo.shpaeocode=val.conAeo;
|
|
|
|
1377
|
+ this.preModel.awbinfo.shprcountyr=val.country;
|
|
|
|
1378
|
+ this.dialogSelectVisible = false;
|
|
|
|
1379
|
+ },
|
|
|
|
1380
|
+ // 收货人信息赋值
|
|
|
|
1381
|
+ consigneeClick(val){
|
|
|
|
1382
|
+ console.log(val);
|
|
|
|
1383
|
+ this.preModel.awbinfo.cnsnname=val.conName;
|
|
|
|
1384
|
+ this.preModel.awbinfo.cnsnaddress=val.conAddress;
|
|
|
|
1385
|
+ this.preModel.awbinfo.ecityid=val.conCity;
|
|
|
|
1386
|
+ this.preModel.awbinfo.cnsntel=val.conPhone;
|
|
|
|
1387
|
+ this.preModel.awbinfo.cnsaeocode=val.conAeo;
|
|
|
|
1388
|
+ this.preModel.awbinfo.cnscountyr=val.country;
|
|
|
|
1389
|
+ this.dialogNeeVisible = false;
|
|
|
|
1390
|
+ },
|
|
1231
|
// >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
|
1391
|
// >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
|
|
1232
|
handleSerach() {
|
1392
|
handleSerach() {
|
|
1233
|
// this.preQuery.flightno = undefined
|
1393
|
// this.preQuery.flightno = undefined
|
