运单利润统计,调整

This commit is contained in:
wuteng 2026-01-27 18:36:15 +08:00
parent a7628477cb
commit f4e1e2fe9b

View File

@ -82,17 +82,19 @@
</el-form-item>
<el-form-item label="批次是否完整" prop="params.blIsBatchOk" label-width="120px">
<el-select clearable v-model="queryParams.params.blIsBatchOk" placeholder="请选择">
<el-option :key="1" label="是" value="1">是</el-option>
<el-option :key="0" label="否" value="-1">否</el-option>
</el-select>
<el-form-item label="批次状态" prop="params.batchStatus" label-width="120px">
<el-select clearable v-model="queryParams.params.batchStatus" placeholder="请选择">
<el-option :key="1" label="已完成" value="1">已完成</el-option>
<el-option :key="2" label="未完成" value="2">未完成</el-option>
<el-option :key="3" label="部分完成" value="3">部分完成</el-option>
</el-select>
</el-form-item>
<el-form-item label="成本是否完整" prop="params.blIsCostFeeOk" label-width="120px">
<el-select clearable v-model="queryParams.params.blIsCostFeeOk" placeholder="请选择">
<el-option :key="1" label="是" value="1">是</el-option>
<el-option :key="0" label="否" value="-1">否</el-option>
</el-select>
<el-form-item label="成本状态" prop="params.costStatus" label-width="120px">
<el-select clearable v-model="queryParams.params.costStatus" placeholder="请选择">
<el-option :key="1" label="已完成" value="1">已完成</el-option>
<el-option :key="2" label="未完成" value="2">未完成</el-option>
<el-option :key="3" label="部分完成" value="3">部分完成</el-option>
</el-select>
</el-form-item>
</SearchForm>
<XdTable
@ -168,7 +170,11 @@
<!-- <el-table-column :label="$t('标准费')" align="center" prop="standardFee" min-width="100" /> -->
<el-table-column :label="$t('运单费用')" align="center" prop="billFee" min-width="110" :sortable="true"/>
<el-table-column :label="$t('运输成本')" align="center" prop="costFee" min-width="110" :sortable="true"/>
<el-table-column :label="$t('运单利润')" align="center" prop="billProfit" min-width="110" :sortable="true"/>
<el-table-column :label="$t('理赔金额')" align="center" prop="satisfyMoney" min-width="110" :sortable="true"/>
<el-table-column :label="$t('折让金额')" align="center" prop="allowanceMoney" min-width="110" :sortable="true"/>
<el-table-column :label="$t('抵扣金额')" align="center" prop="deductionMoney" min-width="110" :sortable="true"/>
<el-table-column :label="$t('其他金额')" align="center" prop="otherMoney" min-width="110" :sortable="true"/>
<el-table-column :label="$t('运单毛利润')" align="center" prop="billProfit" min-width="150" :sortable="true"/>
<!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="130" :sortable="true" /> -->
<el-table-column :label="$t('快件类型')" align="center" prop="kjlx" width="180" :show-overflow-tooltip="true">
<template slot-scope="scope">
@ -231,12 +237,12 @@
<el-table-column :label="$t('录单备注')" align="center" prop="waybillDetail.remark" min-width="80" :show-overflow-tooltip="true" />
<el-table-column :label="$t('回款联系人')" align="center" prop="waybillDetail.payee" min-width="120" :sortable="true" />
<el-table-column :label="$t('销售联系人')" align="center" prop="waybillDetail.salesmen" min-width="120" :sortable="true" />
<el-table-column :label="$t('是否定制账单')" align="center" prop="blMerge" min-width="120" >
<!-- <el-table-column :label="$t('是否定制账单')" align="center" prop="blMerge" min-width="120" >
<template slot-scope="scope">
<span v-if="scope.row.blMerge=='0'" >否</span>
<el-tag v-if="scope.row.blMerge=='1'" type="success">是</el-tag>
</template>
</el-table-column>
</el-table-column> -->
<el-table-column :label="$t('问题件')" align="center" prop="waybillDetail.blIsQuestion" min-width="150" >
<template slot-scope="scope">
<el-tag v-if="scope.row.waybillDetail.blIsQuestion==1" type="danger">是</el-tag>
@ -245,6 +251,20 @@
</el-table-column>
<el-table-column :label="$t('问题件类型')" align="center" prop="waybillDetail.problemTypeName" width="150" :show-overflow-tooltip="true" :sortable="true" />
<el-table-column :label="$t('问题件原因')" align="center" prop="waybillDetail.problemCause" width="150" :show-overflow-tooltip="true" />
<el-table-column :label="$t('批次状态')" align="center" prop="batchStatus" width="150" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<el-tag v-if="scope.row.batchStatus=='1'" type="success">已完成</el-tag>
<el-tag v-if="scope.row.batchStatus=='2'" type="info">未完成</el-tag>
<el-tag v-if="scope.row.batchStatus=='3'" type="warning">部分完成</el-tag>
</template>
</el-table-column>
<el-table-column :label="$t('成本状态')" align="center" prop="costStatus" width="150" :show-overflow-tooltip="true" >
<template slot-scope="scope">
<el-tag v-if="scope.row.costStatus=='1'" type="success">已完成</el-tag>
<el-tag v-if="scope.row.costStatus=='2'" type="info">未完成</el-tag>
<el-tag v-if="scope.row.costStatus=='3'" type="warning">部分完成</el-tag>
</template>
</el-table-column>
</XdTable>
<el-dialog :title="openTraceInfoTitle" :visible.sync="openTraceInfo" width="95%" :close-on-click-modal="false" :destroy-on-close="true" v-dialogDrag append-to-body>
@ -380,158 +400,9 @@ export default {
remark: null,
delFlag: null,
params:{
customerCode: null,
customerName: null,
receiveCustomerCode: null,
receiveCustomerName: null,
thirdCustomerCode: null,
thirdCustomerName: null,
receiveName: null,
receiveCompany: null,
receiveMobile: null,
receiveTel: null,
receiveCountry: null,
receiveProvince: null,
receiveCity: null,
receiveCounty: null,
receiveTown: null,
receiveAddress: null,
receivePostcode: null,
receivePcd: null,
sendName: null,
sendCompany: null,
sendMobile: null,
sendTel: null,
sendCountry: null,
sendProvince: null,
sendCity: null,
sendCounty: null,
sendTown: null,
sendAddress: null,
sendPostcode: null,
sendPcd: null,
paymentType: null,
calcFeeType: null,
custNo: null,
transLineType: null,
productType: null,
timeType: null,
meterType: null,
customsClear: null,
customsEclaration: null,
estimateDate: null,
packType: null,
dispatchMethod: null,
pickupMethod: null,
pickStartDate: null,
pickFinishDate: null,
pickFailReason: null,
intoWarehouseCode: null,
intoWarehouseName: null,
intoWarehouseAddress: null,
intoWarehouseContact: null,
intoWarehousePhone: null,
intoWarehouseBillCode: null,
warehouseInNo: null,
customerDeliveryBeginTime: null,
customerDeliveryEndTime: null,
goodsType: null,
goodsInfo: null,
goodsPics: null,
blPrepareInFreight: null,
prepareInEstFee: null,
prepareInRealFee: null,
prepareInExpress: null,
prepareInBillCode: null,
prepareInRemark: null,
prepareInSupplier: null,
totalWeight: null,
totalVolume: null,
parcelQty: null,
billWeight: null,
volumeWeight: null,
currency: null,
settlementWeight: null,
feeWeight: null,
freight: null,
blOverLong: null,
blBill: null,
blOverWeight: null,
overWeightNumber: null,
feeRemark: null,
thirdCode: null,
realValue: null,
blInsure: null,
insureValue: null,
insureValueCurrency: null,
insureFeeCurrency: null,
insureFee: null,
insureRemark: null,
insureSiteCode: null,
insureDate: null,
blPrint: null,
printManCode: null,
printSite: null,
printDate: null,
printCount: null,
blDispFd: null,
transferCode: null,
transferBillcode: null,
dispFdDate: null,
dispFdReason: null,
currentSiteCode: null,
lastSiteCode: null,
registerSiteCode: null,
registerDate: null,
registerManCode: null,
takePieceEmployeeCode: null,
sendSiteCode: null,
sendDate: null,
dispatchManCode: null,
dispatchDate: null,
dispatchSiteCode: null,
produceBillDate: null,
produceBillSiteCode: null,
produceBillManCode: null,
destinationCode: null,
destinationProvince: null,
destinationCity: null,
destinationCounty: null,
dispatchUnderlingSiteCode: null,
destinationCenterCode: null,
marketManCode: null,
payee: null,
salesmen: null,
operateEmployeeCode: null,
blIsQuestion: null,
problemType: null,
problemCause: null,
problemDelayDays: null,
blMessage: null,
blAcceptMessage: null,
blGenSubbill: null,
signMan: null,
signManCode: null,
signSiteCode: null,
signDate: null,
billPicSendRmk: null,
billPicDispatchRmk: null,
timezoneOffset: null,
delFlag: null,
remark: null,
blSign:null,
mergeStatus:null,
problemQueryType:null,
problemQueryIds:null,
params:{
blIsBatchOk:null,
blIsCostFeeOk:null,
}
}
batchStatus:null,
costStatus:null,
}
},
};
},
@ -984,6 +855,26 @@ export default {
if (j === 'waybillDetail.paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
}
if (j === 'batchStatus') {
if (v['batchStatus'] == '1') {
return '已完成';
}
else if (v['batchStatus'] == '2') {
return '未完成';
} else if (v['batchStatus'] === '3') {
return '部分完成';
}
}
if (j === 'costStatus') {
if (v['costStatus'] == '1') {
return '已完成';
}
else if (v['costStatus'] == '2') {
return '未完成';
} else if (v['costStatus'] === '3') {
return '部分完成';
}
}
return v[j]
}))
},