This commit is contained in:
linfso 2025-07-01 15:31:20 +08:00
parent 2e9294f5bd
commit 97961f2945

View File

@ -217,7 +217,7 @@
border
size="mini"
storageName="waitBatchDtlList_main_240706"
storageName="waitBatchDtlList_main_240708"
ref="refTable"
:data="waitBatchDtlList"
@ -288,7 +288,7 @@
<el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
<el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
<el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
<el-table-column :label="$t('收件人')" align="center" prop="reciever.name" min-width="150" />
<el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
<el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
<template slot-scope="scope">
<span class="ellipsis">{{ scope.row.receiveCompany }}</span>
@ -1033,116 +1033,116 @@ export default {
return ++index
}
if (j === 'kjlx') {
return v['waybillDetail']['sendSiteName']+'--'+v['waybillDetail']['dispatchUnderlingSiteName'];
return v['sendSiteName']+'--'+v['dispatchUnderlingSiteName'];
}
if (j === 'fjr') {
return v['sendName']+'--'+v['receiveName'];
}
if (j === 'receiveCountryName') {
return v['waybillDetail']['receiveCountryName'];
return v['receiveCountryName'];
}
if (j === 'sendCountryName') {
return v['waybillDetail']['sendCountryName'];
return v['sendCountryName'];
}
if (j === 'estimateDate') {
return v['waybillDetail']['estimateDate'];
return v['estimateDate'];
}
if (j === 'sendSiteName') {
return v['waybillDetail']['sendSiteName'];
return v['sendSiteName'];
}
if (j === 'sendName') {
return v['waybillDetail']['sendName'];
return v['sendName'];
}
if (j === 'receiveName') {
return v['waybillDetail']['receiveName'];
return v['receiveName'];
}
if (j === 'sendDate') {
return v['waybillDetail']['sendDate'];
return v['sendDate'];
}
if (j === 'sendCompany') {
return v['waybillDetail']['sendCompany'];
return v['sendCompany'];
}
if (j === 'receiveCompany') {
return v['waybillDetail']['receiveCompany'];
return v['receiveCompany'];
}
if (j === 'transLineTypeName') {
return v['waybillDetail']['transLineTypeName'];
return v['transLineTypeName'];
}
if (j === 'productTypeName') {
return v['waybillDetail']['productTypeName'];
return v['productTypeName'];
}
if (j === 'sendName') {
return v['waybillDetail']['sendName'];
return v['sendName'];
}
if (j === 'parcelQty') {
return v['waybillDetail']['parcelQty'];
return v['parcelQty'];
}
if (j === 'billWeight') {
return v['waybillDetail']['billWeight'];
return v['billWeight'];
}
if (j === 'volumeWeight') {
return v['waybillDetail']['volumeWeight'];
return v['volumeWeight'];
}
if (j === 'totalVolume') {
return v['waybillDetail']['totalVolume'];
return v['totalVolume'];
}
if (j === 'settlementWeight') {
return v['waybillDetail']['settlementWeight'];
return v['settlementWeight'];
}
if (j === 'freight') {
return v['waybillDetail']['freight'];
return v['freight'];
}
if (j === 'realFee') {
return v['waybillDetail']['realFee'];
return v['realFee'];
}
if (j === 'remark') {
return v['waybillDetail']['remark'];
return v['remark'];
}
if (j === 'feeRemark') {
return v['waybillDetail']['feeRemark'];
return v['feeRemark'];
}
if (j === 'salesmen') {
return v['waybillDetail']['salesmen'];
return v['salesmen'];
}
if (j === 'payee') {
return v['waybillDetail']['payee'];
return v['payee'];
}
if (j === 'payee') {
return v['waybillDetail']['payee'];
return v['payee'];
}
if (j === 'problemTypeName') {
return v['waybillDetail']['problemTypeName'];
return v['problemTypeName'];
}
if (j === 'problemCause') {
return v['waybillDetail']['problemCause'];
return v['problemCause'];
}
if (j === 'sendMobile') {
@ -1150,28 +1150,28 @@ export default {
}
if (j === 'calcFeeType') {
return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['waybillDetail']['calcFeeType']);
return this.selectDictLabel(this.dict.type.emis_calc_fee_type,v['calcFeeType']);
}
if (j === 'waybillDetail.paymentStatus') {
return this.selectDictLabel(this.dict.type.emis_payment_status,v['waybillDetail']['paymentStatus']);
return this.selectDictLabel(this.dict.type.emis_payment_status,v['paymentStatus']);
}
if (j === 'pickupMethod') {
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['waybillDetail']['pickupMethod']);
return this.selectDictLabel(this.dict.type.emis_qujian_fangshi,v['pickupMethod']);
}
if (j === 'customsEclaration') {
return this.selectDictLabel(this.dict.type.emis_declare_mode,v['waybillDetail']['customsEclaration']);
return this.selectDictLabel(this.dict.type.emis_declare_mode,v['customsEclaration']);
}
if (j === 'customsClear') {
return this.selectDictLabel(this.dict.type.emis_customs_clear,v['waybillDetail']['customsClear']);
return this.selectDictLabel(this.dict.type.emis_customs_clear,v['customsClear']);
}
if (j === 'packType') {
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['waybillDetail']['packType']);
return this.selectDictLabels(this.dict.type.emis_tab_packing_type,v['packType']);
}
if (j === 'dispatchMethod') {
if(v['waybillDetail']['dispatchMethod'] == 1){
if(v['dispatchMethod'] == 1){
return '派送';
}else{
return '自提';
@ -1183,28 +1183,28 @@ export default {
if (j === 'blMessage') {
if(v['waybillDetail']['blMessage'] == 1){
if(v['blMessage'] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blAcceptMessage') {
if(v['waybillDetail']['blAcceptMessage'] == 1){
if(v['blAcceptMessage'] == 1){
return '发送';
}else{
return '不发送';
}
}
if (j === 'blSign') {
if(v['waybillDetail']['blSign'] == 1){
if(v['blSign'] == 1){
return '已签收';
}else{
return '未签收';
}
}
if (j === 'paymentType') {
return this.selectDictLabel(this.dict.type.emis_payment_type,v['waybillDetail']['paymentType']);
return this.selectDictLabel(this.dict.type.emis_payment_type,v['paymentType']);
}
return v[j]
}))