diff --git a/src/components/XdPageContainer/index.vue b/src/components/XdPageContainer/index.vue
index 63f73730..c724eaa1 100644
--- a/src/components/XdPageContainer/index.vue
+++ b/src/components/XdPageContainer/index.vue
@@ -39,14 +39,9 @@ export default {
       let h0 = this.$refs.pageWrapper.offsetHeight;
       let h1 = window.innerHeight;
       let h2 = this.$refs.pageHeader.offsetHeight;
-      console.log("====this.$refs.pageHeader:",this.$refs.pageHeader);
-      console.log("====this.pageWrapper==>h0:",h0);
-      console.log("====this.pageHeader==>h1,h2",h1,h2);
-
       let contentHeight = h1 - h2-190;
       this.contentHeight = contentHeight;
 
-      console.log("====this.contentHeight==>",this.contentHeight);
     }, 500),
   },
 };
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue b/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue
index a2c85bb7..213af9f2 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BatchImportSiteBatch.vue
@@ -96,12 +96,16 @@
 <script>
 import { listEmisTmsSiteBatch, getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, addEmisTmsSiteBatch, updateEmisTmsSiteBatch } from "@/api/emis/emisTmsSiteBatch";
 import { listSimpleEmisSite } from "@/api/emis/emisSite";
+import { listSimpleEmisSupplier } from "@/api/emis/emisSupplier";
+import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
+import { listEmisWaybill } from "@/api/emis/emisWaybill";
 
 import { parseTime } from "@/utils/custom";
 import {timeDiffTime,timeFormat} from '@/utils/dateUtils'
 import { formatSearchStr,deepClone } from '@/utils/index'
 import { result } from "lodash";
 import XLSX from 'xlsx'
+import moment from 'moment'
 
 export default {
   name: "BatchWaybillRecord",
@@ -268,7 +272,7 @@ export default {
                 transType: element['运输方式'],
                 startSiteCode: element['起始网点'],
                 nextSiteCode: element['下一网点'],
-                etd: parseTime(element['发出时间']),
+                etd: element['发出时间'],
                 carNo: element['运输号'],
                 destCountry: element['目的国家'],
                 destCountryName: null,
@@ -314,7 +318,7 @@ export default {
 
                   // 检查数据后发送
                   let res=await this.uploadAndCheckData(orderItem)
-
+                  console.log("====uploadAndCheckData===mmm1====>",res);
                   let rstData=res.data;
                   if(rstData.result=='success'){
                     orderItem.uploadStatus=1;
@@ -323,7 +327,7 @@ export default {
                   }
                   else{
                     orderItem.uploadStatus=-1;
-                    orderItem.errorInfo=rstData.msg;
+                    orderItem.errorInfo=res.msg;
                   }
 
                 }
@@ -335,7 +339,7 @@ export default {
           }
     },
 
-    async uploadAndCheckData(item){
+    async uploadAndCheckData(itemData){
       let postForm = {
         id: null,
         batchNo: null,
@@ -367,15 +371,67 @@ export default {
         totalParcelQty: null,
         totalWaybillQty: null,
         totalVolume: null,
-        totalWeight: null
+        totalWeight: null,
+
+        // 批次明细列表
+        batchDtlList:null,
       };
 
-      // 获取批次号
-      let resPack = await getTmsGroupBatchNo();
-      postForm.batchNo = resPack.data;
+      postForm.destCountry=itemData.destCountry;
+      postForm.packNum=itemData.packNum;
+      postForm.transWeight=itemData.transWeight;
+      postForm.etd=itemData.etd;
 
+      // 检查单号是否存在
+      if(!(itemData.billCode) ){
+        let rst = {
+          code:500,
+          msg:'加入单号不能为空',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+
+      if(!(itemData.carNo) ){
+        let rst = {
+          code:500,
+          msg:'运输号不能为空',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+
+      if(!(itemData.supplierName) ){
+        let rst = {
+          code:500,
+          msg:'供应商不能为空',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+
+
+      postForm.carNo=itemData.carNo;
+
+      if(!(itemData.etd) ){
+        let rst = {
+          code:500,
+          msg:'发出日期不能为空',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+      postForm.etd=itemData.etd;
       // 转换运输类型
-      let transTypeDict=this.dict.type.emis_big_batch_type.find(e=>e.label=item.transType);
+      const transTypeDict=this.dict.type.emis_biz_shipping_method.find(item=>item.label==itemData.transType);
       if(transTypeDict==null){
         let rst = {
           code:500,
@@ -386,32 +442,137 @@ export default {
         }
         return rst;
       }
-      postForm.transType=transTypeDict.value;
-      // dicts: ['emis_waybill_status', 'emis_payment_type', 'emis_biz_shipping_method', 'emis_qujian_fangshi', 'cebp_return_status','emis_declare_mode','emis_customs_clear','emis_big_batch_type'],
-
-      // 计算网点是否存在
-      let qSiteParam = {
-        pageNum:1,
-        pageSize:1,
-        siteName:item.startSiteCode
-      };
-      let resSite = await listSimpleEmisSite(qSiteParam);
-      if(!resSite || resSite.code != 200){
+      postForm.transType=Number(transTypeDict.value);
+      // 批次类型
+      let batchTypeDict=this.dict.type.emis_big_batch_type.find(item=>item.label==itemData.batchType);
+      if(batchTypeDict==null){
         let rst = {
           code:500,
-          msg:resSite && resSite.msg || '起始网点不存在',
+          msg:'批次类型不存在',
           data:{
             result:'fail'
           }
         }
         return rst;
       }
+      postForm.batchType=batchTypeDict.value;
 
+      let startSite = await this.getSiteBySiteName(itemData.startSiteCode);
+      if(startSite==null||startSite==undefined){
+        let rst = {
+          code:500,
+          msg:'起始网点不存在',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+      postForm.startSiteCode=startSite.siteCode;
+      postForm.startSiteName=startSite.siteName;
+      postForm.startSiteSizeCode3=startSite.sizeCode3||'-';
 
+      // 下一网点
+      let nextSite = await this.getSiteBySiteName(itemData.nextSiteCode);
+      if(nextSite==null||nextSite==undefined){
+        let rst = {
+          code:500,
+          msg:'下一网点不存在',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+      postForm.nextSiteCode=nextSite.siteCode;
+      postForm.nextSiteName=nextSite.siteName;
+      postForm.nextSiteSizeCode3=nextSite.sizeCode3||'-';
+
+      // 供应商
+      let supplier=await this.getSupplierByName(itemData.supplierName);
+      if(supplier==null){
+        let rst = {
+          code:500,
+          msg:'供应商不存在',
+          data:{
+            result:'fail'
+          }
+        }
+        return rst;
+      }
+      postForm.supplierCode=supplier.code;
+      postForm.supplierName=supplier.name;
+      postForm.supplierNameEn=supplier.nameEn||'-';
+
+      // 获取批次号
+      let resPack = await getTmsGroupBatchNo();
+      postForm.batchNo = resPack.data;
 
       // 计算批次名称
+      let batchName=this.calcBatchName(postForm);
+      postForm.batchName = batchName;
 
+      // 计算子单
+      let totalParcelQty=0;
+      let totalWeight=0;
+      let totalVolume=0;
 
+      postForm.batchDtlList = [];
+      let bcList=itemData.billCode.trim().split(/[；\;\,\，\n]/)||[];
+
+      for(let i = 0; i < bcList.length; i++){
+          let billcode = bcList[i].trim();
+          let billRes = await listEmisWaybill(
+            {
+              billCode:billcode,
+              params:{
+                isNeedBatch:1,
+                batchType:postForm.batchType
+              }
+            }
+          );
+
+          if(!billRes || billRes.code != 200){
+            let rst = {
+              code:500,
+              msg:billRes && billRes.msg,
+              data:{
+                result:'fail'
+              }
+            }
+            return rst;
+          }
+          else if(!billRes.rows || billRes.rows.length < 1){
+            let rst = {
+              code:500,
+              msg:'运单不存在或状态异常(已签收,已占用,已派送),不能组批次: ' + billcode,
+              data:{
+                result:'fail'
+              }
+            }
+            return rst;
+          }
+
+          let itemBill = billRes.rows[0];
+          let packDetail = {
+            batchNo: postForm.batchNo,
+            billCode: billcode,
+            groupStatus: "1",//已组批次
+          };
+
+          totalParcelQty +=itemBill.parcelQty;
+          totalWeight +=itemBill.billWeight;
+          totalVolume +=itemBill.totalVolume;
+
+          postForm.batchDtlList.push(packDetail);
+      }
+
+      postForm.totalWaybillQty=postForm.batchDtlList.length;
+      postForm.totalParcelQty=totalParcelQty;
+      postForm.totalWeight=totalWeight.toFixed(2);
+      postForm.totalVolume=totalVolume.toFixed(4);
+
+      // 插入数据
       let response = await addEmisTmsSiteBatch(postForm);
       if(!response || response.code != 200){
         let rst = {
@@ -433,7 +594,91 @@ export default {
         }
         return rst;
       }
+    },
+    // 批次名称计算
+    calcBatchName(postForm){
+      /*
+      1、批次名称规则：
+        1)快递(E)：
+        快递(E)-南京分拨中心(NJ)-东航(DH)-昆明(KM)-250113-提单号
+        ENJDHKM250113+提单号
+        2)空运(A)：
+        空运(A)-南京分拨中心(NJ)-南航(NH)-昆明(KM)-250113-提单号
+        ANJNHKM250113+提单号
+        3)陆运(L)：
+        陆运(L)-南京分拨中心(NJ)-九通(JT)-昆明(KM)-250113-车牌
+        LNJJTKM250113+车牌
+        4)海运(S)：
+        海运(S)-上海-西港-250113-提单号
+        SSHXG250113+提单号
+        5)铁路(R)：
+        铁路(R)-上海-南宁-250113-集装箱号
+        RSHNN250113+集装箱号
+        6)国内进仓(D)：
+        上海-顺丰-南京分拨中心-250113-运单号/订单号  （顺丰、跨越、百世、安能、中通、申通、货拉拉、运满满等）
+        DSHNN250113+运单号/订单号
+      */
+      let startPrefix="N";
 
+      if(postForm.transType==1){
+        // 快递(E)-南京分拨中心(NJ)-东航(DH)-昆明(KM)-250113-提单号
+        startPrefix = "E";
+      }
+      else if(postForm.transType==2){
+        //  空运(A)-南京分拨中心(NJ)-南航(NH)-昆明(KM)-250113-提单号
+        startPrefix="A"
+      }
+      else if(postForm.transType==3){
+        //  陆运(L)-南京分拨中心(NJ)-九通(JT)-昆明(KM)-250113-车牌
+        startPrefix="L"
+      }
+      else if(postForm.transType==4){
+        //  海运(S)-上海-供应商-西港-250113-提单号
+        startPrefix="S"
+      }
+      else if(postForm.transType==5){
+        //  铁路(R)-上海-南宁-250113-集装箱号
+        startPrefix="R"
+      }
+      else if(postForm.transType==6){
+        //  国内进仓(D)-上海-供应商-南宁-250113-集装箱号
+        startPrefix="D"
+      }
+      let yymmdd = moment(new Date(postForm.etd)).format('YYMMDD');
+      return startPrefix+postForm.startSiteSizeCode3+""+postForm.supplierNameEn+""+postForm.nextSiteSizeCode3+yymmdd+postForm.carNo;
+    //  postForm.batchName =
+    },
+    async getSiteBySiteName(siteName){
+      // 计算网点是否存在
+      let qParam = {
+        pageNum:1,
+        pageSize:1,
+        siteName:siteName
+      };
+      let resStartSite = await listSimpleEmisSite(qParam);
+      if(!resStartSite || resStartSite.code != 200){
+        return null;
+      }
+      if(resStartSite.rows==null || resStartSite.rows.length==0){
+        return null;
+      }
+      return resStartSite.rows[0];
+    },
+    async getSupplierByName(supplierName){
+      // 计算网点是否存在
+      let qParam = {
+        pageNum:1,
+        pageSize:1,
+        name:supplierName
+      };
+      let res= await listSimpleEmisSupplier(qParam);
+      if(!res || res.code != 200){
+        return null;
+      }
+      if(res.rows==null || res.rows.length==0){
+        return null;
+      }
+      return res.rows[0];
     },
     /** 搜索按钮操作 */
     handleQuery() {