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 17:23:03 +08:00
parent d73bdbb303
commit 37df37da4a
5 changed files with 69 additions and 44 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.

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

@ -26,6 +26,14 @@ export function getEmisSupplier(id) {
}) })
} }
export function getSupplierByName(name) {
return request({
url: '/emis/emisSupplier/getSupplierByName',
method: 'get',
params: {name:name}
});
}
export async function getEmisSupplierByCode(code) { export async function getEmisSupplierByCode(code) {
let res= await request({ let res= await request({
url: '/emis/emisSupplier/list', url: '/emis/emisSupplier/list',

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

@ -17,6 +17,18 @@ export function getEmisTmsSiteBatch(id) {
}) })
} }
// 根据供应商编码和运输号获取批次信息
export function getInfoBySupplerAndCarNo(supplierCode,carNo) {
return request({
url: '/emis/emisTmsSiteBatch/getInfoBySupplerAndCarNo',
method: 'get',
params: {
supplierCode:supplierCode,
carNo:carNo
}
})
}
// 新增一级网点TMS组批次 // 新增一级网点TMS组批次
export function addEmisTmsSiteBatch(data) { export function addEmisTmsSiteBatch(data) {
return request({ return request({

6
src/views/emis/emisSupplier/emisSupplierForm.vue
View File

@ -41,7 +41,7 @@
</el-form-item> </el-form-item>
</el-col> </el-col>
<el-col :span="24"> <el-col :span="24">
<el-form-item label="关联费用类型" prop="transType"> <el-form-item label="关联费用类型" prop="feeItemRel">
<el-select multiple clearable filterable v-model="form.feeItemRelArr" placeholder="关联费用" @change="onFeeItemRelChange" style="width:100%" > <el-select multiple clearable filterable v-model="form.feeItemRelArr" placeholder="关联费用" @change="onFeeItemRelChange" style="width:100%" >
<el-option <el-option
v-for="item in dict.type.emis_cost_fee_type" v-for="item in dict.type.emis_cost_fee_type"
@ -116,10 +116,12 @@ export default {
transType: [ transType: [
{ required: true, message: "运输方式不能为空", trigger: ["blur","change"] } { required: true, message: "运输方式不能为空", trigger: ["blur","change"] }
], ],
feeItemRel: [
{ required: true, message: "关联费用不能为空", trigger: ["blur","change"] }
],
bizSite: [ bizSite: [
{ required: true, message: "业务网点不能为空", trigger: ["blur","change"] } { required: true, message: "业务网点不能为空", trigger: ["blur","change"] }
] ]
} }
}; };
}, },

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

@ -133,8 +133,8 @@ import { draftSubmitTmsCostFee } from "@/api/emis/emisTmsCostFee";
import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee"; import { listEmisTmsCostFee, getEmisTmsCostFee, delEmisTmsCostFee, addEmisTmsCostFee, updateEmisTmsCostFee } from "@/api/emis/emisTmsCostFee";
import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill"; import {listEmisSettleSubBill} from "@/api/emis/emisSettleSubBill";
import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl"; import { listEmisTmsSiteBatchDtl} from "@/api/emis/emisTmsSiteBatchDtl";
import { listEmisTmsSiteBatch} from "@/api/emis/emisTmsSiteBatch"; import { listEmisTmsSiteBatch,getInfoBySupplerAndCarNo} from "@/api/emis/emisTmsSiteBatch";
import { listSimpleEmisSupplier } from "@/api/emis/emisSupplier"; import { getSupplierByName } from "@/api/emis/emisSupplier";
import {timeDiffTime,timeFormat} from '@/utils/dateUtils' import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
import { formatSearchStr,deepClone } from '@/utils/index' import { formatSearchStr,deepClone } from '@/utils/index'
@ -341,15 +341,13 @@ export default {
// console.log(`${key}: ${element[key]}`); // console.log(`${key}: ${element[key]}`);
this.$set(orderData,key,element[key]) ; this.$set(orderData,key,element[key]) ;
// 解析费用数据 // 解析费用数据
if(key!='批次号'&&key!='账期'&&key!='备注'){ if(key!='运输单号'&&key!='供应商'&&key!='账期'&&key!='备注'){
// 获取费用编码 // 获取费用编码
// 单价特殊处理 // 单价特殊处理
let indexPos=key.indexOf("单价"); let indexPos=key.indexOf("单价");
// console.log("===key=indexPos=>",key,indexPos);
if(indexPos !== -1 ){ if(indexPos !== -1 ){
let feeTypeStr=key.substring(0,indexPos)+"费"; let feeTypeStr=key.substring(0,indexPos);
// console.log("===feeTypeStr=>",feeTypeStr) console.log("===feeTypeStr=>",feeTypeStr)
if(!(feeTypeStr in that.feeItemMap) ){ if(!(feeTypeStr in that.feeItemMap) ){
orderData.uploadStatus=-1; orderData.uploadStatus=-1;
errorInfo=errorInfo+''+key+','; errorInfo=errorInfo+''+key+',';
@ -389,8 +387,6 @@ export default {
this.$set(orderData,"feeItemList",feeItemList) ; this.$set(orderData,"feeItemList",feeItemList) ;
} }
// console.log("===orderData=>",orderData) // console.log("===orderData=>",orderData)
this.tmpDataList.push(orderData); this.tmpDataList.push(orderData);
@ -449,7 +445,7 @@ export default {
feeItemList:[], feeItemList:[],
}; };
submitOrderForm.batchNo=orderItem['批次号']; // submitOrderForm.batchNo=orderItem['批次号'];
submitOrderForm.billMonth=orderItem['账期']; submitOrderForm.billMonth=orderItem['账期'];
submitOrderForm.remark=orderItem['备注']; submitOrderForm.remark=orderItem['备注'];
submitOrderForm.splitType="1"; submitOrderForm.splitType="1";
@ -457,22 +453,31 @@ export default {
// this.$set(submitOrderForm,'batchNo',orderItem['批次号']); // this.$set(submitOrderForm,'batchNo',orderItem['批次号']);
try{ try{
let batchNo=orderItem['批次号'];
let supplierCode=null;
// 通过供应商名称找到供应商编号，必须完全匹配
let resSuppler= await getSupplierByName(orderItem['供应商名称']);
if(resBatch&&resBatch.code==200){
let supplier = resSuppler.data;
supplierCode=supplier.code;
}else{
orderItem.uploadStatus=-1;
orderItem.errorInfo='供应商不存在';
continue;
}
let batchNo=null;
// 获取批次信息 // 获取批次信息
let qParam = { let qParam = {
pageNum:1, pageNum:1,
pageSize:1, pageSize:1,
batchNo:batchNo, supplierCode:supplierCode,
carNo:orderItem['运输单号']
}; };
let resBatch=await listEmisTmsSiteBatch(qParam); let resBatch=await getInfoBySupplerAndCarNo(qParam);
if(resBatch&&resBatch.code==200){ if(resBatch&&resBatch.code==200){
if(resBatch.rows.length!=1){ let batchItem=resBatch.data;
orderItem.uploadStatus=-1; batchNo=batchItem.batchNo;
orderItem.errorInfo='批次号不存在';
continue;
}
let batchItem=resBatch.rows[0];
submitOrderForm.realTotalWeight=batchItem.transWeight; submitOrderForm.realTotalWeight=batchItem.transWeight;
submitOrderForm.realPieceNumber=batchItem.packNum; submitOrderForm.realPieceNumber=batchItem.packNum;
submitOrderForm.transType=batchItem.transType; submitOrderForm.transType=batchItem.transType;
@ -488,29 +493,28 @@ export default {
submitOrderForm.pieceNumber=batchItem.pieceNumber; submitOrderForm.pieceNumber=batchItem.pieceNumber;
submitOrderForm.totalWeight=batchItem.totalWeight; submitOrderForm.totalWeight=batchItem.totalWeight;
submitOrderForm.totalVolume=batchItem.totalVolume; submitOrderForm.totalVolume=batchItem.totalVolume;
// 获取供应商 // // 获取供应商
let spParams={ // let spParams={
pageNum: 1, // pageNum: 1,
pageSize: 1, // pageSize: 1,
code:batchItem.supplierCode // code:batchItem.supplierCode
} // }
let respSp=await listSimpleEmisSupplier(spParams); // let respSp=await listSimpleEmisSupplier(spParams);
if(respSp&&respSp.code==200){ // if(respSp&&respSp.code==200){
if(respSp.rows.length==0){ // if(respSp.rows.length==0){
orderItem.uploadStatus=-1; // orderItem.uploadStatus=-1;
orderItem.errorInfo='批次对应供应商不存在'; // orderItem.errorInfo='批次对应供应商不存在';
continue; // continue;
} // }
} // }
else{ // else{
orderItem.uploadStatus=-1; // orderItem.uploadStatus=-1;
orderItem.errorInfo='获取供应商失败'; // orderItem.errorInfo='获取供应商失败';
continue; // continue;
} // }
// 费用类型 // 费用类型
this.$set(submitOrderForm,"feeItemList",orderItem.feeItemList) ; this.$set(submitOrderForm,"feeItemList",orderItem.feeItemList) ;
// 获取批次关联运单号 // 获取批次关联运单号
let billRelList=[]; let billRelList=[];
let resBill=await listEmisTmsSiteBatchDtl({batchNo: batchNo}); let resBill=await listEmisTmsSiteBatchDtl({batchNo: batchNo});
@ -529,7 +533,7 @@ export default {
}else{ }else{
orderItem.uploadStatus=-1; orderItem.uploadStatus=-1;
orderItem.errorInfo='批次号不存在'; orderItem.errorInfo='批次不存在';
continue; continue;
} }
@ -567,7 +571,6 @@ export default {
this.orderList = this.orderList.concat(this.tmpDataList); this.orderList = this.orderList.concat(this.tmpDataList);
this.tmpDataList=[]; this.tmpDataList=[];
this.openUploadForm = false; this.openUploadForm = false;
}, },