|
...
|
...
|
@@ -15,7 +15,7 @@ |
|
|
|
<div class="grid-content">
|
|
|
|
<span class="titleSpan">航班号：{{this.preQuery.carrier}}{{this.preQuery.flightno}}</span>
|
|
|
|
<span class="titleSpan">航班日期：{{this.preQuery.flightdate}}</span>
|
|
|
|
<!-- <span class="titleSpan">航段：{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span>-->
|
|
|
|
<span class="titleSpan">航段：{{this.preQuery.originstation}}-{{this.preQuery.destinationstation}}</span>
|
|
|
|
</div>
|
|
|
|
</el-col>
|
|
|
|
</div>
|
|
...
|
...
|
@@ -38,21 +38,21 @@ |
|
|
|
</div>
|
|
|
|
</el-col>
|
|
|
|
<div class="grid-content el-btn">
|
|
|
|
<el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查询</el-button>
|
|
|
|
<el-button v-if="preQuery.flightno === undefined && preData.length<1" type="primary"
|
|
|
|
<el-button type="warning" style="width:150px" icon="el-icon-search" @click="handleSerach">查  询</el-button>
|
|
|
|
<el-button v-if="preQuery.flightno === undefined && preData.length<1" type="success"
|
|
|
|
style="width:150px" icon="el-icon-plus"
|
|
|
|
@click="handleAddpre">新增预配舱单
|
|
|
|
</el-button>
|
|
|
|
<el-button @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">
|
|
|
|
批量发送申报
|
|
|
|
<el-button icon="el-icon-plus" @click="handleAwbSend('')" v-if="batchChooseFlag" style="width:150px" type="primary">
|
|
|
|
批量申报
|
|
|
|
</el-button>
|
|
|
|
<el-button @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">
|
|
|
|
批量发送修改申报
|
|
|
|
<el-button icon="el-icon-edit" @click="handleAwbEdit('')" v-if="batchChooseFlag" style="width:150px" type="success">
|
|
|
|
批量修改申报
|
|
|
|
</el-button>
|
|
|
|
<el-button @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">
|
|
|
|
批量发送删除申报
|
|
|
|
<el-button icon="el-icon-delete" @click="handleSendDelete('')" v-if="batchChooseFlag" style="width:150px" type="danger">
|
|
|
|
批量删除申报
|
|
|
|
</el-button>
|
|
|
|
<el-button @click="download" style="width:150px" type="success">
|
|
|
|
<el-button icon="el-icon-download" @click="download" style="width:150px" type="success">
|
|
|
|
模板下载
|
|
|
|
</el-button>
|
|
|
|
<el-upload
|
|
...
|
...
|
@@ -117,7 +117,7 @@ |
|
|
|
{{scope.row.weight}}
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="货物描述" width="120" align="center">
|
|
|
|
<el-table-column label="货物描述" width="120" align="center" show-overflow-tooltip>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
{{scope.row.goodsname}}
|
|
|
|
</template>
|
|
...
|
...
|
@@ -156,58 +156,55 @@ |
|
|
|
<span v-if="scope.row.status ==='25'">已发送修改报</span>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column prop="receipt" label="回执信息" align="center">
|
|
|
|
<el-table-column prop="receipt" label="回执信息" align="center" show-overflow-tooltip>
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-tag v-if="scope.row.status=='01' || scope.row.status=='11'" type="success">
|
|
|
|
{{scope.row.ext5}}
|
|
|
|
</el-tag>
|
|
|
|
<el-tag v-else-if="scope.row.status=='02' || scope.row.status=='03'" type="warning">
|
|
|
|
{{scope.row.ext5}}
|
|
|
|
</el-tag>
|
|
|
|
<el-tag v-else-if="scope.row.status=='12' || scope.row.status=='13'" type="danger">
|
|
|
|
{{scope.row.ext5}}
|
|
|
|
</el-tag>
|
|
|
|
<el-tag v-else>
|
|
|
|
{{scope.row.ext5}}
|
|
|
|
</el-tag>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作" width="450px" fixed="right" align="center">
|
|
|
|
<template slot-scope="scope" >
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="5" style="margin-right: 10px">
|
|
|
|
<el-button type="danger" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="5" style="margin-right: 10px">
|
|
|
|
<el-button type="warning" icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="5" style="margin-right: 10px">
|
|
|
|
<el-button type="info" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
|
|
|
|
:disabled="scope.row.status === '22'">更改状态
|
|
|
|
</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="5" style="margin-right: 10px">
|
|
|
|
<el-button type="primary" icon="el-icon-plus" v-if="scope.row.awbh ===''"
|
|
|
|
<el-row type="flex" justify="space-between">
|
|
|
|
<el-button icon="el-icon-view" @click="handleSend(scope.row)">收发明细</el-button>
|
|
|
|
<el-button type="success" icon="el-icon-plus" v-if="scope.row.awbh ===''"
|
|
|
|
@click="handleAddAwbh(scope.row)">新增分单
|
|
|
|
</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-button type="warning" icon="el-icon-edit" @click="handleAwbStatus(scope.row)"
|
|
|
|
:disabled="scope.row.status === '22'">更改状态
|
|
|
|
</el-button>
|
|
|
|
|
|
|
|
<el-button type="danger" icon="el-icon-delete" v-if="isAdmin" @click="handleAwbDelete(scope.row)">删除运单</el-button>
|
|
|
|
</el-row>
|
|
|
|
<el-row>
|
|
|
|
<el-col :span="7" style="margin-right: 10px">
|
|
|
|
<el-button type="primary" icon="el-icon-plus" style="width: 130px" @click="handleAwbSend(scope.row.uuid)"
|
|
|
|
:disabled="addStatus(scope.row.status)">发送预配舱单报
|
|
|
|
<el-row type="flex" justify="space-between">
|
|
|
|
<el-button type="primary" icon="el-icon-plus" @click="handleAwbSend(scope.row.uuid)"
|
|
|
|
:disabled="addStatus(scope.row.status)">预配申报
|
|
|
|
</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="7" style="margin-right: 10px">
|
|
|
|
<el-button type="success" icon="el-icon-plus" style="width: 130px" @click="handleAwbEdit(scope.row.uuid)"
|
|
|
|
:disabled="editStatus(scope.row.status)">发送预配修改报</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-col :span="7">
|
|
|
|
<el-button type="danger" icon="el-icon-delete" style="width: 130px;margin-bottom: 10px" @click="handleSendDelete(scope.row.uuid)"
|
|
|
|
:disabled="deleteStatus(scope.row.status)">发送预配删除报</el-button>
|
|
|
|
</el-col>
|
|
|
|
<el-button type="success" icon="el-icon-edit" @click="handleAwbEdit(scope.row.uuid)"
|
|
|
|
:disabled="editStatus(scope.row.status)">修改申报</el-button>
|
|
|
|
<el-button type="danger" icon="el-icon-delete" @click="handleSendDelete(scope.row.uuid)"
|
|
|
|
:disabled="deleteStatus(scope.row.status)">删除申报</el-button>
|
|
|
|
</el-row>
|
|
|
|
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
|
|
|
|
|
|
<div class="btnFoot">
|
|
|
|
<el-row>
|
|
|
|
<el-button type="primary" v-if="preQuery.flightno !== undefined || preData.length >0"
|
|
|
|
<el-button type="success" icon="el-icon-plus" v-if="preQuery.flightno !== undefined || preData.length >0"
|
|
|
|
@click="handleAddpreInfo">新增预配舱单
|
|
|
|
</el-button>
|
|
|
|
<el-button type="primary" @click="handelBackStep"
|
|
|
|
v-if="preQuery.flightno !== undefined || preData.length >0">返回
|
|
|
|
<el-button type="primary" icon="el-icon-back" @click="handelBackStep"
|
|
|
|
v-if="preQuery.flightno !== undefined || preData.length >0">返  回
|
|
|
|
</el-button>
|
|
|
|
</el-row>
|
|
|
|
</div>
|
|
...
|
...
|
@@ -728,10 +725,12 @@ |
|
|
|
<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="关键字查询" size="small"></el-input>
|
|
|
|
<el-input v-model="consignerQuery.companyName" placeholder="公司名称" size="small">
|
|
|
|
<template slot="prepend">公司名称</template>
|
|
|
|
</el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button type="primary" size="small" v-on:click="consignerSelect()">查询</el-button>
|
|
|
|
<el-button type="primary" icon="el-icon-plus" size="small" v-on:click="consignerSelect()">查  询</el-button>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form>
|
|
|
|
</el-col>
|
|
...
|
...
|
@@ -753,7 +752,7 @@ |
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button type="success" size="mini" @click="consignerClick(scope.row)">选择</el-button>
|
|
|
|
<el-button type="success" size="mini" icon="el-icon-thumb" @click="consignerClick(scope.row)">选  择</el-button>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
...
|
...
|
@@ -765,10 +764,12 @@ |
|
|
|
<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="关键字查询" size="small"></el-input>
|
|
|
|
<el-input v-model="consigneeQuery.companyName" placeholder="公司名称" size="small">
|
|
|
|
<template slot="prepend">公司名称</template>
|
|
|
|
</el-input>
|
|
|
|
</el-form-item>
|
|
|
|
<el-form-item>
|
|
|
|
<el-button type="primary" v-on:click="consigneeSelect()" size="small">查询</el-button>
|
|
|
|
<el-button type="primary" icon="el-icon-plus" v-on:click="consigneeSelect()" size="small">查  询</el-button>
|
|
|
|
</el-form-item>
|
|
|
|
</el-form>
|
|
|
|
</el-col>
|
|
...
|
...
|
@@ -790,7 +791,7 @@ |
|
|
|
</el-table-column>
|
|
|
|
<el-table-column label="操作">
|
|
|
|
<template slot-scope="scope">
|
|
|
|
<el-button type="success" @click="consigneeClick(scope.row)" size="small">选择</el-button>
|
|
|
|
<el-button type="success" icon="el-icon-thumb" @click="consigneeClick(scope.row)" size="small">选  择</el-button>
|
|
|
|
</template>
|
|
|
|
</el-table-column>
|
|
|
|
</el-table>
|
|
...
|
...
|
@@ -1127,6 +1128,21 @@ |
|
|
|
this.preQuery.awba = this.$route.params.flightData.awba.substring(0, 3) + "-" + this.$route.params.flightData.awba.substring(3)
|
|
|
|
}
|
|
|
|
this.getList()
|
|
|
|
}else {
|
|
|
|
this.preQuery= {
|
|
|
|
pageSize: 1,
|
|
|
|
limitSize: 30,
|
|
|
|
awba: '',
|
|
|
|
carrier: '',
|
|
|
|
flightno: '',
|
|
|
|
flightdate: '',
|
|
|
|
originstation: '',
|
|
|
|
destinationstation: '',
|
|
|
|
userId:loginedUserInfo().userId,
|
|
|
|
customCode:'',
|
|
|
|
enterpriseId:loginedUserInfo().companyId,
|
|
|
|
messageType: ''
|
|
|
|
}
|
|
|
|
}
|
|
|
|
this.getCountryList()
|
|
|
|
let username = JSON.parse(sessionStorage.getItem('user')).username
|
|
...
|
...
|
@@ -1551,7 +1567,6 @@ |
|
|
|
},
|
|
|
|
// 收货人信息赋值
|
|
|
|
consigneeClick(val){
|
|
|
|
console.log(val);
|
|
|
|
this.preModel.awbinfo.cnsnname=val.conName;
|
|
|
|
this.preModel.awbinfo.cnsnaddress=val.conAddress;
|
|
|
|
this.preModel.awbinfo.ecityid=val.conCity;
|
...
|
...
|
|
