|
...
|
...
|
@@ -70,13 +70,6 @@ |
|
|
|
:tree-props="{children: 'children', hasChildren: 'hasChildren'}">
|
|
|
|
<el-table-column type="selection" width="55">
|
|
|
|
</el-table-column>
|
|
|
|
<!-- <el-table-column label="航班信息" width="90" align="center">-->
|
|
|
|
<!-- <template slot-scope="scope">-->
|
|
|
|
<!-- <p class="tableInline">{{scope.row.carrier}}{{scope.row.flightno}}</p>-->
|
|
|
|
<!-- <p class="tableInline">{{scope.row.flightdate}}</p>-->
|
|
|
|
<!-- <p class="tableInline">{{scope.row.originstation}}-{{scope.row.destinationstation}}</p>-->
|
|
|
|
<!-- </template>-->
|
|
|
|
<!-- </el-table-column>-->
|
|
|
|
<el-table-column label="运单号" width="200" align="center">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<span class="tableInline" v-if="scope.row.awbh !==''">{{scope.row.awbh}}</span>
|
|
...
|
...
|
@@ -384,6 +377,7 @@ |
|
|
|
</el-row>
|
|
|
|
<div class="grid-content content" style="font-size: 10px">
|
|
|
|
发货人信息
|
|
|
|
<el-button type="success" @click="consignerSelect()">选择发货人信息</el-button>
|
|
|
|
</div>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="3">
|
|
...
|
...
|
@@ -459,6 +453,7 @@ |
|
|
|
</el-row>
|
|
|
|
<div class="grid-content content" style="font-size: 10px">
|
|
|
|
收货人信息
|
|
|
|
<el-button type="success" @click="consigneeSelect()">选择收货人信息</el-button>
|
|
|
|
</div>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="3">
|
|
...
|
...
|
@@ -638,6 +633,82 @@ |
|
|
|
<el-button type="primary" @click="sendDelete()">发送</el-button>
|
|
|
|
</div>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
<el-dialog title="发货人信息" :visible.sync="dialogSelectVisible" width="50%">
|
|
|
|
<!--工具条-->
|
|
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
|
<el-form :inline="true" :model="consignerQuery">
|
|
|
|
<el-form-item>
|
|
|
|
<el-input v-model="consignerQuery.companyName" placeholder="关键字查询"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button type="primary" v-on:click="consignerSelect()">查询</el-button>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form>
|
|
|
|
</el-col>
|
|
|
|
<el-table v-loading="listLoading" :data="consignerList" stripe style="font-size: 12px"
|
|
|
|
border >
|
|
|
|
<el-table-column type="selection" width="55">
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="序号" type="index">
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="companyName" label="发货人公司" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="conCity" label="发货人城市" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="country" label="发货人国家代码" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="conPhone" label="发货人电话" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="enterprise" label="发货人企业代码" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button type="success" @click="consignerClick(scope.row)">选择</el-button>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
<pagination background layout="total, prev, pager, next" v-show="consignerQuery.total>0" :total="consignerQuery.total" :page.sync="consignerQuery.pageSize" :limit.sync="consignerQuery.limitSize"
|
|
|
|
@pagination="consignerSelect()"/>
|
|
|
|
</el-dialog>
|
|
|
|
<el-dialog title="收货人信息" :visible.sync="dialogNeeVisible" width="50%">
|
|
|
|
<!--工具条-->
|
|
|
|
<el-col :span="24" class="toolbar" style="padding-bottom: 0px;">
|
|
|
|
<el-form :inline="true" :model="consignerQuery">
|
|
|
|
<el-form-item>
|
|
|
|
<el-input v-model="consigneeQuery.companyName" placeholder="关键字查询"></el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button type="primary" v-on:click="consigneeSelect()">查询</el-button>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form>
|
|
|
|
</el-col>
|
|
|
|
<el-table v-loading="listLoading" :data="consigneeList" stripe style="font-size: 12px"
|
|
|
|
border >
|
|
|
|
<el-table-column type="selection" width="55">
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="序号" type="index">
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="companyName" label="收货人公司" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="conCity" label="收货人城市" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="country" label="收货人国家代码" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="conPhone" label="收货人电话" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="enterprise" label="收货人企业代码" >
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button type="success" @click="consigneeClick(scope.row)">选择</el-button>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
<pagination background layout="total, prev, pager, next" v-show="consigneeQuery.total>0" :total="consigneeQuery.total" :page.sync="consigneeQuery.pageSize" :limit.sync="consigneeQuery.limitSize"
|
|
|
|
@pagination="consignerSelect()"/>
|
|
|
|
</el-dialog>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
</template>
|
|
|
|
<script>
|
|
...
|
...
|
@@ -659,6 +730,8 @@ |
|
|
|
} from '@/api/exitPre'
|
|
|
|
import {Message} from "element-ui";
|
|
|
|
import {getResponseForParam} from '@/api/responseDetail'
|
|
|
|
import { getList} from '../../api/consigner/consigner';
|
|
|
|
import { getList as neeList} from '../../api/consigner/consignee';
|
|
|
|
import {
|
|
|
|
validAwb,
|
|
|
|
validAlphabets,
|
|
...
|
...
|
@@ -706,6 +779,22 @@ |
|
|
|
func: treeToArray,
|
|
|
|
total: 1,
|
|
|
|
isAdmin: false,
|
|
|
|
consignerList: [],
|
|
|
|
dialogNeeVisible: false,
|
|
|
|
consigneeList: [],
|
|
|
|
consignerQuery: {
|
|
|
|
companyName: '',
|
|
|
|
total: 0,
|
|
|
|
pageSize: 1,
|
|
|
|
limitSize: 5,
|
|
|
|
},
|
|
|
|
consigneeQuery: {
|
|
|
|
companyName: '',
|
|
|
|
total: 0,
|
|
|
|
pageSize: 1,
|
|
|
|
limitSize: 5,
|
|
|
|
},
|
|
|
|
dialogSelectVisible: false,
|
|
|
|
preQuery: {
|
|
|
|
pageSize: 1,
|
|
|
|
limitSize: 30,
|
|
...
|
...
|
@@ -1228,6 +1317,77 @@ |
|
|
|
handleSelectionChange() {
|
|
|
|
|
|
|
|
},
|
|
|
|
// 远程获取发货人信息
|
|
|
|
consignerSelect(){
|
|
|
|
this.dialogSelectVisible = true;
|
|
|
|
this.listLoading = true;
|
|
|
|
let para = {
|
|
|
|
pageSize: this.consignerQuery.pageSize,
|
|
|
|
limitSize: this.consignerQuery.limitSize,
|
|
|
|
companyName: this.consignerQuery.companyName
|
|
|
|
};
|
|
|
|
getList(para).then((res) => {
|
|
|
|
this.consignerQuery.total = res.data.data.total;
|
|
|
|
this.consignerList = res.data.data.list;
|
|
|
|
this.listLoading = false;
|
|
|
|
}).catch((error) => {
|
|
|
|
this.listLoading = false;
|
|
|
|
if(null!= error.response && error.response!==undefined){
|
|
|
|
let status= error.response.status;
|
|
|
|
let msg = error.response.statusText;
|
|
|
|
alert(status+msg);
|
|
|
|
}else {
|
|
|
|
alert(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
},
|
|
|
|
// 远程获取收货人信息
|
|
|
|
consigneeSelect(){
|
|
|
|
this.dialogNeeVisible = true;
|
|
|
|
this.listLoading = true;
|
|
|
|
let para = {
|
|
|
|
pageSize: this.consigneeQuery.pageSize,
|
|
|
|
limitSize: this.consigneeQuery.limitSize,
|
|
|
|
companyName: this.consigneeQuery.companyName
|
|
|
|
};
|
|
|
|
neeList(para).then((res) => {
|
|
|
|
this.consigneeQuery.total = res.data.data.total;
|
|
|
|
this.consigneeList = res.data.data.list;
|
|
|
|
this.listLoading = false;
|
|
|
|
}).catch((error) => {
|
|
|
|
this.listLoading = false;
|
|
|
|
if(null!= error.response && error.response!==undefined){
|
|
|
|
let status= error.response.status;
|
|
|
|
let msg = error.response.statusText;
|
|
|
|
alert(status+msg);
|
|
|
|
}else {
|
|
|
|
alert(error);
|
|
|
|
}
|
|
|
|
|
|
|
|
});
|
|
|
|
},
|
|
|
|
// 发货人信息赋值
|
|
|
|
consignerClick(val){
|
|
|
|
this.preModel.awbinfo.shprname=val.conName;
|
|
|
|
this.preModel.awbinfo.shpraddress=val.conAddress;
|
|
|
|
this.preModel.awbinfo.scityid=val.conCity;
|
|
|
|
this.preModel.awbinfo.shprtel=val.conPhone;
|
|
|
|
this.preModel.awbinfo.shpaeocode=val.conAeo;
|
|
|
|
this.preModel.awbinfo.shprcountyr=val.country;
|
|
|
|
this.dialogSelectVisible = false;
|
|
|
|
},
|
|
|
|
// 收货人信息赋值
|
|
|
|
consigneeClick(val){
|
|
|
|
console.log(val);
|
|
|
|
this.preModel.awbinfo.cnsnname=val.conName;
|
|
|
|
this.preModel.awbinfo.cnsnaddress=val.conAddress;
|
|
|
|
this.preModel.awbinfo.ecityid=val.conCity;
|
|
|
|
this.preModel.awbinfo.cnsntel=val.conPhone;
|
|
|
|
this.preModel.awbinfo.cnsaeocode=val.conAeo;
|
|
|
|
this.preModel.awbinfo.cnscountyr=val.country;
|
|
|
|
this.dialogNeeVisible = false;
|
|
|
|
},
|
|
|
|
// >>>>>>>>>>>>>>>>搜索<<<<<<<<<<<<<<<<<<
|
|
|
|
handleSerach() {
|
|
|
|
// this.preQuery.flightno = undefined
|
...
|
...
|
|
