|
@@ -20,6 +20,12 @@
|
|
|
<template slot="billNo" slot-scope="{row,index}">
|
|
|
<span class="el-button--text" style="cursor: pointer" @click.stop="celJump(row,index)">{{row.billNo}}</span>
|
|
|
</template>
|
|
|
+ <template slot="corpName" slot-scope="{row,index}">
|
|
|
+ <span class="el-button--text" style="cursor: pointer" @click.stop="celJump(row,index)">{{row.corpName}}</span>
|
|
|
+ </template>
|
|
|
+ <template slot="orderNo" slot-scope="{row,index}">
|
|
|
+ <span class="el-button--text" style="cursor: pointer" @click.stop="celJump(row,index)">{{row.orderNo}}</span>
|
|
|
+ </template>
|
|
|
<template slot-scope="{row}" slot="fleetIdSearch">
|
|
|
<crop-select
|
|
|
v-model="row.fleetId"
|
|
@@ -193,6 +199,13 @@ export default {
|
|
|
decimals: 2
|
|
|
}],
|
|
|
column: [{
|
|
|
+ label: '订单号',
|
|
|
+ prop: 'orderNo',
|
|
|
+ overHidden: true,
|
|
|
+ index: 1,
|
|
|
+ width: 140,
|
|
|
+ search: true,
|
|
|
+ },{
|
|
|
label: '到厂时间',
|
|
|
prop: 'arrivalTime',
|
|
|
overHidden: true,
|
|
@@ -257,10 +270,10 @@ export default {
|
|
|
type: 'number',
|
|
|
prop: 'profit'
|
|
|
}, {
|
|
|
- label: '应付陆运费',
|
|
|
+ label: '应收陆运费',
|
|
|
overHidden: true,
|
|
|
index: 9,
|
|
|
- prop: 'landAmountC'
|
|
|
+ prop: 'landAmountD'
|
|
|
}, {
|
|
|
label: '其他',
|
|
|
width: 100,
|
|
@@ -322,6 +335,11 @@ export default {
|
|
|
index: 20,
|
|
|
prop: 'feeRemarksD'
|
|
|
}, {
|
|
|
+ label: '应付陆运费',
|
|
|
+ overHidden: true,
|
|
|
+ index: 20,
|
|
|
+ prop: 'landAmountC'
|
|
|
+ }, {
|
|
|
label: '应付场站费',
|
|
|
width: 100,
|
|
|
precision: 2,
|
|
@@ -576,6 +594,11 @@ export default {
|
|
|
tag: '0',
|
|
|
...params
|
|
|
}
|
|
|
+ if (queryParams.arrivalTime){
|
|
|
+ queryParams.beginArrivalTime=params.arrivalTime[0]
|
|
|
+ queryParams.endArrivalTime=params.arrivalTime[1]
|
|
|
+ delete queryParams.arrivalTime
|
|
|
+ }
|
|
|
this.loading = true;
|
|
|
driverQueryCollection(queryParams).then(res => {
|
|
|
this.goodsList = res.data.data.records
|