|
|
|
|
@ -1602,7 +1602,7 @@
|
|
|
|
|
@ok="handleSubimtVess"
|
|
|
|
|
okText="发送"
|
|
|
|
|
:title="vessTitle"
|
|
|
|
|
:width="1300"
|
|
|
|
|
:width="1600"
|
|
|
|
|
:visible="vesselFlag"
|
|
|
|
|
@cancel="vesselFlag = false">
|
|
|
|
|
<a-spin :spinning="vesselLoad">
|
|
|
|
|
@ -1635,6 +1635,11 @@
|
|
|
|
|
<span v-if="record.trans" style="color:green">否</span>
|
|
|
|
|
<span v-if="!record.trans" style="color:red">是</span>
|
|
|
|
|
</span>
|
|
|
|
|
<span slot="vesselInfo" slot-scope="text, record">
|
|
|
|
|
<span>{{ record.vesselName }}</span>/
|
|
|
|
|
<span>{{ record.voyageNumber }}</span>/
|
|
|
|
|
<span>{{ record.serviceCode }}</span>
|
|
|
|
|
</span>
|
|
|
|
|
<a-table
|
|
|
|
|
slot="expandedRowRender"
|
|
|
|
|
slot-scope="record"
|
|
|
|
|
@ -1643,6 +1648,11 @@
|
|
|
|
|
:columns="innerColumnsOne"
|
|
|
|
|
:data-source="record.oceanLegs"
|
|
|
|
|
:pagination="false">
|
|
|
|
|
<span slot="vesselInfo" slot-scope="text, record1">
|
|
|
|
|
<span>{{ record1.vesselName }}</span>/
|
|
|
|
|
<span>{{ record1.voyageNumber }}</span>/
|
|
|
|
|
<span>{{ record1.serviceCode }}</span>
|
|
|
|
|
</span>
|
|
|
|
|
</a-table>
|
|
|
|
|
</a-table>
|
|
|
|
|
|
|
|
|
|
@ -1703,7 +1713,7 @@ const startDetails = {
|
|
|
|
|
cargoid: '',
|
|
|
|
|
ctnList: [],
|
|
|
|
|
tempid: 'C',
|
|
|
|
|
bookingAddr:''
|
|
|
|
|
bookingAddr: ''
|
|
|
|
|
}
|
|
|
|
|
export default {
|
|
|
|
|
components: {
|
|
|
|
|
@ -1866,19 +1876,10 @@ export default {
|
|
|
|
|
key: 'podArrivalDate'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'vesselName',
|
|
|
|
|
title: '船名',
|
|
|
|
|
key: 'vesselName'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'voyageNumber',
|
|
|
|
|
title: '航次',
|
|
|
|
|
key: 'voyageNumber'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'serviceCode',
|
|
|
|
|
title: '航线',
|
|
|
|
|
key: 'serviceCode'
|
|
|
|
|
dataIndex: 'vesselInfo',
|
|
|
|
|
title: '船舶信息',
|
|
|
|
|
key: 'vesselInfo',
|
|
|
|
|
scopedSlots: { customRender: 'vesselInfo' }
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'days',
|
|
|
|
|
@ -1889,7 +1890,28 @@ export default {
|
|
|
|
|
dataIndex: 'trans',
|
|
|
|
|
title: '是否直达',
|
|
|
|
|
key: 'trans',
|
|
|
|
|
width: 80,
|
|
|
|
|
scopedSlots: { customRender: 'trans' }
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'inlandCutOff',
|
|
|
|
|
title: '内陆截至时间',
|
|
|
|
|
key: 'inlandCutOff'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'portCutOff',
|
|
|
|
|
title: '港口截止时间',
|
|
|
|
|
key: 'portCutOff'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'docCutOff',
|
|
|
|
|
title: '内陆截止时间',
|
|
|
|
|
key: 'docCutOff'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'vgmCutOff',
|
|
|
|
|
title: '港口截止时间',
|
|
|
|
|
key: 'vgmCutOff'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
vesscolumnsCOSCO: [
|
|
|
|
|
@ -1931,16 +1953,6 @@ export default {
|
|
|
|
|
title: '预计到达',
|
|
|
|
|
key: 'podArrivalDate'
|
|
|
|
|
}
|
|
|
|
|
// {
|
|
|
|
|
// dataIndex: 'originName',
|
|
|
|
|
// title: '出发地服务',
|
|
|
|
|
// key: 'originName'
|
|
|
|
|
// },
|
|
|
|
|
// {
|
|
|
|
|
// dataIndex: 'originName',
|
|
|
|
|
// title: '到达地服务',
|
|
|
|
|
// key: 'originName'
|
|
|
|
|
// }
|
|
|
|
|
],
|
|
|
|
|
innerColumns: [
|
|
|
|
|
{
|
|
|
|
|
@ -1981,24 +1993,35 @@ export default {
|
|
|
|
|
],
|
|
|
|
|
innerColumnsOne: [
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'inlandCutOff',
|
|
|
|
|
title: '内陆截止时间',
|
|
|
|
|
key: 'inlandCutOff'
|
|
|
|
|
dataIndex: 'polPortName',
|
|
|
|
|
title: '起运港',
|
|
|
|
|
key: 'polPortName'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'portCutOff',
|
|
|
|
|
title: '港口截止时间',
|
|
|
|
|
key: 'portCutOff'
|
|
|
|
|
dataIndex: 'podPortName',
|
|
|
|
|
title: '目的港',
|
|
|
|
|
key: 'podPortName'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'docCutOff',
|
|
|
|
|
title: '文件截止时间',
|
|
|
|
|
key: 'docCutOff'
|
|
|
|
|
dataIndex: 'podETA',
|
|
|
|
|
title: '预抵日期',
|
|
|
|
|
key: 'podETA'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'vgmCutOff',
|
|
|
|
|
title: 'VGM截止时间',
|
|
|
|
|
key: 'vgmCutOff'
|
|
|
|
|
dataIndex: 'polETD',
|
|
|
|
|
title: '开船日期',
|
|
|
|
|
key: 'polETD'
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'vesselInfo',
|
|
|
|
|
title: '船舶信息',
|
|
|
|
|
key: 'vesselInfo',
|
|
|
|
|
scopedSlots: { customRender: 'vesselInfo' }
|
|
|
|
|
},
|
|
|
|
|
{
|
|
|
|
|
dataIndex: 'days',
|
|
|
|
|
title: '航程',
|
|
|
|
|
key: 'days'
|
|
|
|
|
}
|
|
|
|
|
],
|
|
|
|
|
contractnoList: [],
|
|
|
|
|
@ -2965,17 +2988,7 @@ export default {
|
|
|
|
|
})
|
|
|
|
|
}
|
|
|
|
|
if (this.details.carrierid === 'ONE') {
|
|
|
|
|
res.data.forEach(item => {
|
|
|
|
|
item.oceanLegs = []
|
|
|
|
|
item.oceanLegs.push(
|
|
|
|
|
{
|
|
|
|
|
vgmCutOff:item.vgmCutOff,
|
|
|
|
|
docCutOff:item.docCutOff,
|
|
|
|
|
portCutOff:item.portCutOff,
|
|
|
|
|
inlandCutOff:item.inlandCutOff
|
|
|
|
|
}
|
|
|
|
|
)
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
this.vesselList = res.data
|
|
|
|
|
} else {
|
|
|
|
|
|
