作者 xudada

更新优化

... ... @@ -81,9 +81,8 @@
<el-table-column
fixed="left"
label="修改状态"
width="140">
width="100">
<template slot-scope="scope">
<el-button @click="handleClick(scope.row)" type="text" size="small">修改状态</el-button>
<el-button v-if="scope.row.turntype=='MT6202'" type="text" @click="seeimport(scope.row)" size="mini">分拨申请</el-button>
<el-button v-else type="text" @click="seearrive(scope.row)" size="mini">分拨运抵</el-button>
</template>
... ... @@ -146,13 +145,13 @@
v-if="scope.row.turntype=='MT6202'"
size="mini"
type="primary"
@click="importDetail(scope.$index, scope.row)">收发明细
@click="handleDetail(scope.$index, scope.row)">收发明细
</el-button>
<el-button
v-else
size="mini"
type="primary"
@click="arriveDetail(scope.$index, scope.row)">收发明细
@click="handleDetail(scope.$index, scope.row)">收发明细
</el-button>
<el-button
v-if="scope.row.turntype=='MT6202'"
... ... @@ -204,7 +203,7 @@
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 20, 300, 400]"
:page-sizes="[100, 200, 300, 400]"
:page-size="pageSize"
layout="total, sizes, prev, pager, next, jumper"
:total="total">
... ... @@ -481,6 +480,18 @@
</div>
</el-dialog>
</el-row>
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
<el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
<el-table-column property="cusrestext" label="回执内容"></el-table-column>
</el-table>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
... ... @@ -492,8 +503,12 @@
.sel{display: inline;}
.mark{height:24px;}
.bg{height:24px;text-align: center;line-height:24px;min-height: 24px}
.el-input-group{
display: table;
}
</style>
<script>
import{addResponse,selectResponseList} from "../../api/InResponse";
import { QueryData,ediAllocat,sendCreateMt6202,sendRemoveMt6202,sendCreateMt3202,sendRemoveMt3202 } from '../../api/Allocat'
export default{
data(){
... ... @@ -693,9 +708,23 @@
dialogFormVisible: false,
rows:{},
loading:false,
dialogTableVisible:false,
gridData:[]
}
},
methods:{
//回执收发明细
handleDetail(index,row){
if(row.flightno.length>4){
row.flightno=row.flightno.substring(2);
}
let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:row.turntype}
selectResponseList(params).then(res=>{
this.dialogTableVisible=true;
let response=res.data.data;
this.gridData=response;
});
},
//状态适配
formatStatus:function (row,column) {
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
... ... @@ -730,16 +759,11 @@
this.Udform.carrier=row.carrier;
this.Udform.flightno=row.flightno.substring(2);
this.Udform.flightdate=row.flightdate;
this.Udform.bustype='MT5201';
this.Udform.bustype='MT6202';
this.Udform.busdate=Date.parse(new Date());
this.Udform.busweight=row.weight;
this.Udform.buspiece=row.piece;
this.Udform.opertype='发送分拨申请删除报';
if(row.flightno.length>4){
row.flightno=row.flightno;
}else{
row.flightno=row.carrier+row.flightno;
};
if(row.awbh==null){
row.awbh="";
}
... ... @@ -797,6 +821,7 @@
},
//发送分拨运抵报
arriveSend(index,row){
const map = {'mt3202':row}
sendCreateMt3202(map).then(res=>{
let response=res.data;
... ... @@ -822,16 +847,11 @@
this.Udform.carrier=row.carrier;
this.Udform.flightno=row.flightno.substring(2);
this.Udform.flightdate=row.flightdate;
this.Udform.bustype='MT5201';
this.Udform.bustype='MT3202';
this.Udform.busdate=Date.parse(new Date());
this.Udform.busweight=row.weight;
this.Udform.buspiece=row.piece;
this.Udform.opertype='发送分拨运抵删除报';
if(row.flightno.length>4){
row.flightno=row.flightno;
}else{
row.flightno=row.carrier+row.flightno;
};
if(row.awbh==null){
row.awbh="";
}
... ...
... ... @@ -3,8 +3,8 @@
<el-main >
<!--检索条件-->
<el-row>
<el-col :span="4">
<div>
<el-col :span="5">
<div class="block">
<el-input v-model="vcarrier" placeholder="">
<template slot="prepend">航班号</template>
</el-input>
... ... @@ -90,6 +90,11 @@
</el-container>
</template>
<style scoped>
.el-input-group{
display: table;
}
</style>
<script>
import { selectFlightLists } from '../../api/mt1201'
... ...
... ... @@ -72,10 +72,17 @@
width="50">
</el-table-column>
<el-table-column
prop="waybill"
label="运单号"
width="160"
width="185"
show-overflow-tooltip>
<template slot-scope="scope">
<span v-if="scope.row.awbh==''||scope.row.awbh==null">
{{scope.row.awba}}
</span>
<span v-else>
{{scope.row.awbh}}
</span>
</template>
</el-table-column>
<el-table-column
prop="awbinfo.pcs"
... ... @@ -119,7 +126,7 @@
<el-table-column
prop="operation"
label="操作"
width="750"
width="850"
show-overflow-tooltip>
<template slot-scope="scope">
<el-button
... ... @@ -142,17 +149,20 @@
<el-button
size="mini"
type="primary"
@click="handleSend(scope.$index, scope.row)">发送舱单报
@click="handleSend(scope.$index, scope.row)"
:disabled="btSendStatusFormater(scope.row.status)">发送舱单报
</el-button>
<el-button
size="mini"
type="primary"
@click="handleUpdate(scope.$index, scope.row)">发送舱单修改报
@click="handleUpdate(scope.$index, scope.row)"
:disabled="btEditStatusFormater(scope.row.status)">发送舱单修改报
</el-button>
<el-button
size="mini"
type="primary"
@click="handleDelete(scope.$index, scope.row)">发送舱单删除报
@click="handleDelete(scope.$index, scope.row)"
:disabled="btDeleStatusFormater(scope.row.status)">发送舱单删除报
</el-button>
<el-button
v-if="scope.row.awbh==''||scope.row.awbh==null"
... ... @@ -180,6 +190,11 @@
type="primary"
@click="Allocatearrive(scope.$index, scope.row)">分拨运抵
</el-button>
<el-button
size="mini"
type="primary"
@click="UpdateStatus(scope.$index, scope.row)">更改状态
</el-button>
</template>
</el-table-column>
</el-table>
... ... @@ -601,6 +616,18 @@
</div>
</el-dialog>
</el-row>
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
<el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
<el-table-column property="cusrestext" label="回执内容"></el-table-column>
</el-table>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
... ... @@ -658,7 +685,7 @@
<script>
import { getMt1201List,addMt1201,ediMt1201,getFenList,getCountryCode,selectCustomcode,sendCreateMt1201,sendEditeMt1201,sendRemoveMt1201 } from '../../api/mt1201'
import{addResponse} from "../../api/InResponse";
import{addResponse,selectResponseList} from "../../api/InResponse";
export default {
data() {
... ... @@ -727,7 +754,7 @@
cnsrctcname: undefined,
cnsrctctel: undefined,
cargonm: undefined,
sairportid: undefined,
sairportid: '',
dest1city: undefined,
by1: undefined,
dest1: undefined,
... ... @@ -808,6 +835,7 @@
busweight:'',
buspiece:'',
opertype:'',
cusrestext:''
},
udrules:{
operreason: [{required: true, message: '请输入操作原因', trigger: 'blur'}],
... ... @@ -816,10 +844,41 @@
},
udStatus:'',
loading:false,
rows:{}
rows:{},
dialogTableVisible:false,
gridData:[]
}
},
methods: {
//回执收发明细
handleDetail(index,row){
if(row.flightno.length>4){
row.flightno=row.flightno.substring(2);
}
let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:'MT1201'}
selectResponseList(params).then(res=>{
this.dialogTableVisible=true;
let response=res.data.data;
this.gridData=response;
});
},
//更改状态
UpdateStatus(column,row){
this.$confirm("是否发送更改状态", "确认消息", {
distinguishCancelAndClose: true,
confirmButtonText: '确认更改',
cancelButtonText: '取消更改'
}).then(() => {
row.status = '22';
}).catch(action => {
this.$message({
type: 'info',
message: action === 'cancel'
? '取消状态更改'
: '状态更改取消'
})
})
},
//状态识别
formatStatus: function(row,column){
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
... ... @@ -827,6 +886,28 @@
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//发送舱单报按钮判定事件
btSendStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
}else if(status=='22' ) {
return false;
}
},
btEditStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
}else if(status=='22' ) {
return false;
}
},
btDeleStatusFormater:(status) => {
if(status=='23' || status=='24'||status=='25'){
return true;
}else if(status=='22' ) {
return false;
}
},
/*多选框功能*/
handleSelectionChange(val) {
this.multipleSelection = val;
... ... @@ -869,6 +950,7 @@
//console.log(res);
this.code=response.code;
if(this.code=='200'){
row.status='23'
this.outerVisible = false;
this.centerDialogVisible=true;
this.msg=response.msg;
... ... @@ -894,10 +976,8 @@
this.Udform.buspiece=row.piece;
this.Udform.opertype='发送舱单删除报';
if(row.flightno.length>4){
row.flightno=row.flightno;
}else{
row.flightno=row.carrier+row.flightno;
};
row.flightno=row.flightno.substring(2);
}
this.rows=row;
},
//提交发送舱单删除报表单
... ... @@ -910,12 +990,14 @@
'awbh':this.rows.awbh,
'reason' :this.Udform.operreason,
'contactName':this.Udform.operperson,
'contactTel':this.Udform.opertel}
'contactTel':this.Udform.opertel,
'carrier':this.Udform.carrier}
sendRemoveMt1201(map).then(res=>{
let response=res.data;
//console.log(res);
this.code=response.code;
if(this.code=='200'){
this.rows.status='24'
this.dialogFormVisible=false;
this.outerVisible = false;
this.centerDialogVisible=true;
... ... @@ -962,6 +1044,7 @@
//console.log(res);
this.code=response.code;
if(this.code=='200'){
this.rows.status='25'
this.dialogFormVisible=false;
this.outerVisible = false;
this.centerDialogVisible=true;
... ...
... ... @@ -106,7 +106,7 @@
<el-button
size="mini"
type="primary"
@click="handleEdit(scope.$index, scope.row)">收发明细</el-button>
@click="handleDetail(scope.$index, scope.row)">收发明细</el-button>
<el-button
v-if="scope.row.awbh==''||scope.row.awbh==null"
size="mini"
... ... @@ -361,6 +361,18 @@
</div>
</el-dialog>
</el-row>
<!--明细列表弹出框-->
<el-row>
<el-dialog title="回执明细列表" :visible.sync="dialogTableVisible" width="70%">
<el-table :data="gridData">
<el-table-column property="busdate" label="时间" width="160"></el-table-column>
<el-table-column property="username" label="操作人" width="130"></el-table-column>
<el-table-column property="buspiece" label="发送件数" width="130"></el-table-column>
<el-table-column property="busweight" label="发送重量" width="130"></el-table-column>
<el-table-column property="cusrestext" label="回执内容"></el-table-column>
</el-table>
</el-dialog>
</el-row>
</el-main>
</el-container>
</template>
... ... @@ -399,6 +411,7 @@
</style>
<script>
import{addResponse,selectResponseList} from "../../api/InResponse";
import { getMt5201List,addMt5201,ediMt5201,delMt5201,sendCreateMt520x,sendRemoveMt520x,selectCustomcode} from '../../api/mt5201'
export default {
data() {
... ... @@ -487,9 +500,23 @@
dialogFormVisible: false,
rows:{},
loading:false,
dialogTableVisible:false,
gridData:[]
}
},
methods: {
//回执收发明细
handleDetail(index,row){
if(row.flightno.length>4){
row.flightno=row.flightno.substring(2);
}
let params={awbano:row.awba,awbhno:row.awbh,carrier:row.carrier,flightno:row.flightno,flightdate:row.flightdate,bustype:'MT5201'}
selectResponseList(params).then(res=>{
this.dialogTableVisible=true;
let response=res.data.data;
this.gridData=response;
});
},
//状态适配
formatStatus:function (row,column) {
return row.status=='01'?'接受申报':row.status=='02'?'待人工审核':row.status=='03'?'退单'
... ... @@ -555,10 +582,8 @@
this.Udform.buspiece=row.piece;
this.Udform.opertype='发送理货删除报';
if(row.flightno.length>4){
row.flightno=row.flightno;
}else{
row.flightno=row.carrier+row.flightno;
};
row.flightno=row.flightno.substring(2);
}
if(row.awbh==null){
row.awbh="";
}
... ... @@ -575,7 +600,8 @@
'reason' :this.Udform.operreason,
'contactName':this.Udform.operperson,
'contactTel':this.Udform.opertel,
'rcfdep':this.rows.rcfdep}
'rcfdep':this.rows.rcfdep,
'carrier':this.rows.carrier}
sendRemoveMt520x(map).then(res=>{
let response=res.data;
//console.log(res);
... ...
... ... @@ -15,7 +15,7 @@
</el-col>
<el-col :span="5">
<div class="grid-content">
<el-input placeholder="" v-model="defaultQuery.carrier">
<el-input placeholder="" v-model="vcarrier">
<template slot="prepend">承运人</template>
</el-input>
</div>
... ... @@ -89,6 +89,7 @@
:data="tableData"
tooltip-effect="dark"
style="width: 100%"
:default-sort = "{prop: 'date', order: 'descending'}"
@selection-change="handleSelectionChange">
<el-table-column
type="selection"
... ... @@ -97,7 +98,7 @@
<el-table-column
fixed="left"
label="操作"
width="135">
width="75">
<template slot-scope="scope">
<el-button
v-if="scope.row.stype=='MT1201'"
... ... @@ -105,7 +106,6 @@
<el-button
v-else
@click="handleTally(scope.row)" type="text" size="small">进港理货</el-button>
<el-button @click="handleStuts(scope.row)" type="text" size="small">修改状态</el-button>
</template>
</el-table-column>
<el-table-column
... ... @@ -207,6 +207,9 @@
.tallfense{background-color: #C55124}
.cell{background: #5BB75B}
.cell2{background-color: #12B399}
.el-input-group{
display: table;
}
</style>
<script>
import { QueryData } from '../../api/wayDeclaration'
... ... @@ -226,13 +229,13 @@
value: '01',
label: '选择状态'
}, {
value: '02',
value: '22',
label: '未发送'
}, {
value: '03',
value: '23',
label: '已发舱单报'
}, {
value: '04',
value: '03',
label: '舱单报退单'
}],
options2: [
... ... @@ -276,14 +279,13 @@
:row.status=='21'?'可自动发送':row.status=='22'?'未发送':row.status=='23'?'已发送新增报'
:row.status=='24'?'已发送删除报':row.status=='25'?'已发送修改报':'';
},
//修改状态
handleStuts(){},
//条件查询方法
QueryData(){
let params={currentPage:this.currentPage,pageSize:this.pageSize,awba:this.defaultQuery.awba,carrier:this.defaultQuery.carrier,
flightno:this.defaultQuery.flightno,flightdate:this.defaultQuery.flightdate,status:this.defaultQuery.status,messageType:this.defaultQuery.messageType};
this.listLoading = true;
QueryData(params).then(res =>{
console.log(res)
let response=res.data.data;
this.tableData=response.list;
this.total=response.total;
... ... @@ -309,7 +311,17 @@
var s = (date.getSeconds() < 10 ? '0'+date.getSeconds() : date.getSeconds());
return Y+M+D+h+m+s;
},
},
computed:{
vcarrier:{
get:function () {
return this.defaultQuery.carrier;
},
set:function (val) {
this.defaultQuery.carrier=val.toUpperCase();
}
}
},
}
</script>
\ No newline at end of file
... ...