This commit is contained in:
linfso 2025-02-19 09:28:12 +08:00
parent eef469acfa
commit 529546a763

View File

@ -242,7 +242,7 @@
</el-table-column> </el-table-column>
<el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" width="120" /> <el-table-column :label="$t('实际重量')" align="center" prop="waybillDetail.billWeight" width="120" />
<el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" /> <el-table-column :label="$t('体积')" align="center" prop="waybillDetail.totalVolume" min-width="80" />
<el-table-column prop="billFee" :label="$t('运费')" align="center" width="100"> <el-table-column prop="freight" :label="$t('运费')" align="center" width="100">
<template slot-scope="scope"> <template slot-scope="scope">
{{scope.row.waybillDetail.freight}} {{scope.row.waybillDetail.freight}}
</template> </template>
@ -475,25 +475,29 @@ export default {
let resBatch=await listEmisTmsSiteBatchDtl({batchNo: item.batchNo}); let resBatch=await listEmisTmsSiteBatchDtl({batchNo: item.batchNo});
if(resBatch.code==200){ if(resBatch.code==200){
if(resBatch.rows&&resBatch.rows.length>0){ if(resBatch.rows&&resBatch.rows.length>0){
billCodeStr=resBatch.rows.map( item=> item.billCode).join(); // billCodeStr=resBatch.rows.map( item=> item.billCode).join();
resBatch.rows.forEach(itemWaybill=>{
let relItem={...itemWaybill};
this.form.billRelList.push(relItem);
});
} }
} }
console.log("==billCodeStr==>",billCodeStr); console.log("==billCodeStr==>",billCodeStr);
let qParam={ // let qParam={
billCode:billCodeStr, // billCode:billCodeStr,
pageNum:1, // pageNum:1,
pageSize:2000 // pageSize:2000
} // }
// 查询子账单 // // 查询子账单
let res=await listEmisSettleSubBill(qParam); // let res=await listEmisSettleSubBill(qParam);
if(res.code==200){ // if(res.code==200){
let subBillList = res.rows; // let subBillList = res.rows;
for(let i=0;i<subBillList.length;i++){ // for(let i=0;i<subBillList.length;i++){
let itemSubBill=subBillList[i]; // let itemSubBill=subBillList[i];
let relItem={...itemSubBill}; // let relItem={...itemSubBill};
this.form.billRelList.push(relItem); // this.form.billRelList.push(relItem);
}; // };
} // }
// 获取运输类型对应的费用类型 // 获取运输类型对应的费用类型
this.form.feeItemList=[]; this.form.feeItemList=[];