diff --git a/public/static/tpl/import_supplier_fee_tpl.xls b/public/static/tpl/import_supplier_fee_tpl.xls index 448f8568..708e2c34 100644 Binary files a/public/static/tpl/import_supplier_fee_tpl.xls and b/public/static/tpl/import_supplier_fee_tpl.xls differ diff --git a/src/api/emis/emisTmsSiteBatch.js b/src/api/emis/emisTmsSiteBatch.js index ea991245..fec59476 100644 --- a/src/api/emis/emisTmsSiteBatch.js +++ b/src/api/emis/emisTmsSiteBatch.js @@ -18,13 +18,14 @@ export function getEmisTmsSiteBatch(id) { } // 根据供应商编码和运输号获取批次信息 -export function listBySupplerAndCarNo(supplierCode,carNo) { +export function listBySupplerAndCarNo(supplierCode,carNo,etd) { return request({ url: '/emis/emisTmsSiteBatch/listBySupplerAndCarNo', method: 'get', params: { supplierCode:supplierCode, - carNo:carNo + carNo:carNo, + etd:etd } }) } diff --git a/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue b/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue index a4b0dcdb..606ef36f 100644 --- a/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue +++ b/src/views/emis/emisTmsCostFee/BatchImportCostFee.vue @@ -339,7 +339,7 @@ export default { if (element.hasOwnProperty(key)) { this.$set(orderData,key,element[key]) ; // 解析费用数据 - if(key!='运输单号'&&key!='供应商名称'&&key!='账期'&&key!='备注'){ + if(key!='运输单号'&&key!='供应商名称'&&key!='账期'&&key!='备注'&&key!='成本时间'){ // 获取费用编码 // 单价和币种特殊处理 let indexPos=key.indexOf("单价"); @@ -442,7 +442,8 @@ export default { if(orderData.uploadStatus!=-1){ // 判断批次是否存在 获取批次信息 let carNo=orderData['运输单号']; - let resBatch=await listBySupplerAndCarNo(supplierCode,carNo); + let etd=orderData['成本时间']; + let resBatch=await listBySupplerAndCarNo(supplierCode,carNo,etd); if(resBatch&&resBatch.code==200){ if(resBatch.rows&&resBatch.rows.length==0){ orderData.uploadStatus=-1;