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

md

Browse Source
This commit is contained in:
linfso 2025-06-17 18:22:58 +08:00
parent 37df37da4a
commit 0277677c84
5 changed files with 46 additions and 53 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/api/common.js
View File

@ -152,14 +152,7 @@ export function getLatestActionList() {
})
}
// 按线路重算批次
export function autoScanSiteBatch(lineCode) {
return request({
url: '/common/autoScanSiteBatch?lineCode='+lineCode,
method: 'get',
timeout: 20000
})
}

8
src/api/emis/emisCommon.js
View File

@ -69,4 +69,12 @@ export function pushToUser(uid,message) {
}
// 按线路重算批次
export function autoScanSiteBatch(lineCode) {
return request({
url: '/emis/common/autoScanSiteBatch?lineCode='+lineCode,
method: 'get',
timeout: 20000
})
}

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

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

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

@ -133,7 +133,7 @@ import { draftSubmitTmsCostFee } from "@/api/emis/emisTmsCostFee";
import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
import { listEmisTmsSiteBatch,getInfoBySupplerAndCarNo} from "@/api/emis/emisTmsSiteBatch";
import { listEmisTmsSiteBatch,listBySupplerAndCarNo} from "@/api/emis/emisTmsSiteBatch";
import { getSupplierByName } from "@/api/emis/emisSupplier";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
@ -341,7 +341,7 @@ export default {
// console.log(`${key}: ${element[key]}`);
this.$set(orderData,key,element[key]) ;
// 解析费用数据
if(key!='运输单号'&&key!='供应商'&&key!='账期'&&key!='备注'){
if(key!='运输单号'&&key!='供应商名称'&&key!='账期'&&key!='备注'){
// 获取费用编码
// 单价特殊处理
let indexPos=key.indexOf("单价");
@ -352,9 +352,11 @@ export default {
orderData.uploadStatus=-1;
errorInfo=errorInfo+''+key+',';
continue
}else{
let feeTypeCode=that.feeItemMap[feeTypeStr]
feeItemPrice[feeTypeCode]=element[key];
}
let feeTypeCode=that.feeItemMap[key]
feeItemPrice[feeTypeCode]=element[key];
}
else{
if(!(key in that.feeItemMap) ){
@ -379,10 +381,12 @@ export default {
orderData.errorInfo="费用类型:["+errorInfo+"]未配置";
}
else{
console.log("===feeItemPrice=>",feeItemPrice)
// 循环处理费用单价
for(let i=0;i<feeItemList.length;i++){
let item=feeItemList[i];
item.price=feeItemPrice[item.feeType];
let price=feeItemPrice[item.feeType];
this.$set(item,"price",price) ;
}
this.$set(orderData,"feeItemList",feeItemList) ;
}
@ -445,20 +449,22 @@ export default {
feeItemList:[],
};
// submitOrderForm.batchNo=orderItem['批次号'];
submitOrderForm.billMonth=orderItem['账期'];
submitOrderForm.remark=orderItem['备注'];
submitOrderForm.splitType="1";
// this.$set(submitOrderForm,'batchNo',orderItem['批次号']);
try{
let supplierCode=null;
// 通过供应商名称找到供应商编号，必须完全匹配
let resSuppler= await getSupplierByName(orderItem['供应商名称']);
if(resBatch&&resBatch.code==200){
if(resSuppler&&resSuppler.code==200){
let supplier = resSuppler.data;
if(supplier==null){
orderItem.uploadStatus=-1;
orderItem.errorInfo='供应商不存在';
continue;
}
supplierCode=supplier.code;
}else{
orderItem.uploadStatus=-1;
@ -468,16 +474,25 @@ export default {
let batchNo=null;
// 获取批次信息
let qParam = {
pageNum:1,
pageSize:1,
supplierCode:supplierCode,
carNo:orderItem['运输单号']
};
let resBatch=await getInfoBySupplerAndCarNo(qParam);
let carNo=orderItem['运输单号'];
let resBatch=await listBySupplerAndCarNo(supplierCode,carNo);
if(resBatch&&resBatch.code==200){
let batchItem=resBatch.data;
if(resBatch.rows&&resBatch.rows.length==0){
orderItem.uploadStatus=-1;
orderItem.errorInfo='批次不存在';
continue;
}
if(resBatch.rows&&resBatch.rows.length>1){
orderItem.uploadStatus=-1;
orderItem.errorInfo='存在多个批次';
continue;
}
let batchItem=resBatch.rows[0];
batchNo=batchItem.batchNo;
submitOrderForm.batchNo=batchNo;
submitOrderForm.realTotalWeight=batchItem.transWeight;
submitOrderForm.realPieceNumber=batchItem.packNum;
submitOrderForm.transType=batchItem.transType;
@ -493,25 +508,6 @@ export default {
submitOrderForm.pieceNumber=batchItem.pieceNumber;
submitOrderForm.totalWeight=batchItem.totalWeight;
submitOrderForm.totalVolume=batchItem.totalVolume;
// // 获取供应商
// let spParams={
// pageNum: 1,
// pageSize: 1,
// code:batchItem.supplierCode
// }
// let respSp=await listSimpleEmisSupplier(spParams);
// if(respSp&&respSp.code==200){
// if(respSp.rows.length==0){
// orderItem.uploadStatus=-1;
// orderItem.errorInfo='批次对应供应商不存在';
// continue;
// }
// }
// else{
// orderItem.uploadStatus=-1;
// orderItem.errorInfo='获取供应商失败';
// continue;
// }
// 费用类型
this.$set(submitOrderForm,"feeItemList",orderItem.feeItemList) ;
@ -529,8 +525,6 @@ export default {
}
}
this.$set(submitOrderForm,"billRelList",billRelList)
}else{
orderItem.uploadStatus=-1;
orderItem.errorInfo='批次不存在';
@ -538,9 +532,9 @@ export default {
}
}catch(e){
console.log("===>e===>",e);
console.log("===>e===>",e,e.message);
orderItem.uploadStatus=-1;
orderItem.errorInfo='数据异常';
orderItem.errorInfo=''+e.message;
continue;
}

4
src/views/emis/emisTransPlanRule/index.vue
View File

@ -156,9 +156,7 @@
import { listEmisTransPlanRule, getEmisTransPlanRule, delEmisTransPlanRule, addEmisTransPlanRule, updateEmisTransPlanRule } from "@/api/emis/emisTransPlanRule";
import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
import { autoScanSiteBatch } from "@/api/common"
import { autoScanSiteBatch } from "@/api/emis/emisCommon"
import emisTransPlanRuleForm from '@/views/emis/emisTransPlanRule/emisTransPlanRuleForm';
import EmisSupplierPicker from '@/views/emis/EmisBaseTools/EmisSupplierPicker';