aike/emis-frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request '货物组批次加入运单接口加参数‘carNo’' (#167) from master-dev into master

Browse Source 
Reviewed-on: http://git.xdadan.loc/tanex/emis-frontend/pulls/167
This commit is contained in:
wuteng 2025-12-15 16:49:36 +08:00
commit eed017ad9e
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
public/static/tpl/import_supplier_fee_tpl.xls
View File

Binary file not shown.

5
src/api/emis/emisTmsSiteBatch.js
View File

@ -18,14 +18,15 @@ export function getEmisTmsSiteBatch(id) {
}
// 根据供应商编码和运输号获取批次信息
export function listBySupplerAndCarNo(supplierCode,carNo,etd) {
export function listBySupplerAndCarNo(supplierCode,carNo,etd,batchNo) {
return request({
url: '/emis/emisTmsSiteBatch/listBySupplerAndCarNo',
method: 'get',
params: {
supplierCode:supplierCode,
carNo:carNo,
etd:etd
etd:etd,
batchNo:batchNo
}
})
}

7
src/views/emis/emisTmsCostFee/BatchImportCostFee.vue
View File

@ -343,7 +343,7 @@ export default {
if (element.hasOwnProperty(key)) {
this.$set(orderData,key,element[key]) ;
// 解析费用数据
if(key!='运输单号'&&key!='供应商名称'&&key!='账期'&&key!='备注'&&key!='成本时间'){
if(key!='运输单号'&&key!='供应商名称'&&key!='账期'&&key!='备注'&&key!='成本时间'&& key!=='批次号'){
// 获取费用编码
// 单价和币种特殊处理
let indexPos=key.indexOf("单价");
@ -447,8 +447,9 @@ export default {
// 判断批次是否存在 获取批次信息
let carNo=orderData['运输单号'];
let etd=orderData['成本时间'];
let batchNo=orderData['批次号'];
// let resBatch=await listBySupplerAndCarNo(supplierCode,carNo,etd);
let resBatch=await listBySupplerAndCarNo(supplierCode,carNo);
let resBatch=await listBySupplerAndCarNo(supplierCode,carNo,null,batchNo);
if(resBatch&&resBatch.code==200){
if(resBatch.rows&&resBatch.rows.length==0){
orderData.uploadStatus=-1;
@ -462,7 +463,7 @@ export default {
let batchItem=resBatch.rows[0];
if(etd && batchItem.etd!==etd){
orderData.uploadStatus=-1;
orderData.errorInfo='成本时间不一致';
orderData.errorInfo='成本时间不一致';
}else{
this.$set(orderData,"batchItem",batchItem) ;
this.$set(orderData,"batchNo",batchItem.batchNo) ;