From 37226e7b494068e5e1f896c576bd2aad01551ad2 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Mon, 21 Jul 2025 16:42:05 +0800
Subject: [PATCH] md

---
 public/static/tpl/import_supplier_fee_tpl.xls | Bin 25600 -> 25600 bytes
 src/api/emis/emisTmsSiteBatch.js              |   5 +++--
 .../emisTmsCostFee/BatchImportCostFee.vue     |   5 +++--
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/public/static/tpl/import_supplier_fee_tpl.xls b/public/static/tpl/import_supplier_fee_tpl.xls
index 448f8568daae406cd30ba332e8084c1cfd10833a..708e2c34678f63e23bc3147fd11da809a0a22fba 100644
GIT binary patch
delta 4545
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

delta 4278
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

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;