diff --git a/src/api/emis/emisTmsSiteBatch.js b/src/api/emis/emisTmsSiteBatch.js
index fddf6c9e..ea991245 100644
--- a/src/api/emis/emisTmsSiteBatch.js
+++ b/src/api/emis/emisTmsSiteBatch.js
@@ -46,6 +46,14 @@ export function addAllEmisTmsSiteBatch(data) {
   })
 }
 
+export function editAllEmisTmsSiteBatch(data) {
+  return request({
+    url: '/emis/emisTmsSiteBatch/editAll',
+    method: 'post',
+    data: data
+  })
+}
+
 export function batchEdit(data) {
   return request({
     url: '/emis/emisTmsSiteBatch/batchEdit',
diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 470a8afa..95123db3 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -292,7 +292,6 @@ export default {
                   }
 
                   let selNodes=document.querySelectorAll(".seled");
-                  console.log("===selNodes==>",selNodes)
                   if(selNodes!=null&&selNodes.length>0){
                     for (var i = 0; i < selNodes.length; i++) {
                       selNodes[i].classList.remove("seled")
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 4adf6381..061c9656 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -8,7 +8,6 @@
               <el-col :span="6">
                 <el-form-item :label="$t('批次号')" prop="batchNo">
                   <el-input v-model="form.batchNo" placeholder="自动生成"  disabled />
-                  <!-- <span>{{ form.batchNo }}</span> -->
                 </el-form-item>
               </el-col>
               <el-col :span="10">
@@ -218,20 +217,19 @@
         border
         size="mini"
 
-        storageName="emisCoPackDetail_main_240702"
-
+        storageName="waitBatchDtlList_main_240706"
         ref="refTable"
+        :data="waitBatchDtlList"
 
-        id="emisCoPackDetail"
-        :data="emisCoPackDetail"
-        :showSearch.sync="showSearch"
+        :queryParams="queryParams"
+        @selection-change="handleSelectionChange"
+      >
+      <!-- :showSearch.sync="showSearch"
         :queryParams="queryParams"
 
         @queryTable="getWaybillList"
-        @selection-change="handleCoPackSelectionChange"
         @sort-change="handleSortChange"
-
-      >
+         -->
         <div slot="toolbar">
           <el-row :gutter="10" class="mb8">
             <el-col :span="1.5"  v-if="!disabled">
@@ -249,7 +247,7 @@
                 plain
                 size="mini"
                 @click="handleCoPackListDelete"
-                :disabled="coMultiple"
+                :disabled="multiple"
               >移除运单</el-button>
             </el-col>
             <el-col :span="1.5" v-if="this.form.id!=null">
@@ -290,7 +288,7 @@
         <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
         <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
         <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
-        <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="150" />
+        <el-table-column :label="$t('收件人')" align="center" prop="reciever.name" min-width="150" />
         <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100">
           <template slot-scope="scope">
             <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
@@ -319,7 +317,7 @@
         </el-table-column>
         <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
         <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" :show-overflow-tooltip="true" />
-        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" :show-overflow-tooltip="true" >
+        <el-table-column :label="$t('寄件公司')" align="center" prop="sendeCompany" min-width="100" :show-overflow-tooltip="true" >
           <template slot-scope="scope">
             <span class="ellipsis">{{ scope.row.sendCompany }}</span>
           </template>
@@ -340,8 +338,8 @@
         <el-form ref="formBatch"  size="mini" label-width="60px">
          <el-row>
           <el-col :span="24">
-            <el-form-item :label="$t('运单号')" prop="formBatchBillList">
-              <el-input v-model="formBatchBillList" type="textarea" :rows="8" placeholder="运单号"  />
+            <el-form-item :label="$t('运单号')" prop="inputBatchBillCode">
+              <el-input v-model="inputBatchBillCode" type="textarea" :rows="8" placeholder="运单号"  />
             </el-form-item>
           </el-col>
          </el-row>
@@ -356,17 +354,13 @@
 </template>
 
 <script>
-import { listEmisTmsSiteBatch, 
-  getTmsGroupBatchNo, getEmisTmsSiteBatch, delEmisTmsSiteBatch, 
-  addEmisTmsSiteBatch, updateEmisTmsSiteBatch,
-  scanSiteBatch, addAllEmisTmsSiteBatch
-
+import {  
+  getTmsGroupBatchNo, getEmisTmsSiteBatch, 
+  scanSiteBatch, addAllEmisTmsSiteBatch,editAllEmisTmsSiteBatch
 } from "@/api/emis/emisTmsSiteBatch";
-import { listEmisTmsSiteBatchDtl, delEmisTmsSiteBatchDtl, addEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
-import { addEmisTmsSiteBatchLoading, listEmisTmsSiteBatchLoading, updateEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading";
-import { getWaybillDetail,listEmisWaybill } from "@/api/emis/emisWaybill";
-import { listSimpleEmisSite } from "@/api/emis/emisSite";
-// import { getWaybillDetail} from "@/api/emis/emisWaybill";
+import { listEmisTmsSiteBatchDtl } from "@/api/emis/emisTmsSiteBatchDtl";
+import { listEmisTmsSiteBatchLoading } from "@/api/emis/emisTmsSiteBatchLoading";
+import { getEmisWaybillByBillCode } from "@/api/emis/emisWaybill";
 
 import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
 import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
@@ -407,9 +401,6 @@ export default {
     return {
       // 遮罩层
       loading: false,
-      loading2: false,
-      loadingWait: false,
-      loadingDone: false,
       isDoing:false,
       // 选中数组
       ids: [],
@@ -418,9 +409,6 @@ export default {
       // 非多个禁用
       multiple: true,
 
-      coSingle: true,
-      coMultiple: true,
-
       addWayBillDisabled: true,
       // packDisabled: true,
       activeName:'third',
@@ -496,20 +484,11 @@ export default {
 
       openBatch: false,
       titleBatch: "",
-      formBatchBillList:"",
+      inputBatchBillCode:"",
+
+      waitBatchDtlList:[],
 
-      // 新增/修改包详情数据
-      emisCoPackDetail:[],
       blUnpack:"1",
-      // 追加的运单查询数据
-      wayBillData: {
-        pageNum: 1,
-        pageSize: 20,
-        params:{
-          dataTimeType: '1',
-          queryOrderType: '1'
-        }
-      },
       // 追加的运单数据
       emisWayBillList:[],
       wayBillotal:0,
@@ -521,23 +500,14 @@ export default {
       titleWayBill:null,
       openWayBillForm:false,
 
-      tempCoPackList:[],
-      coSelection:[],
-      //区分当前是新增还是修改
-      coPackType:'',
-
-      // 临时存储已有组批次的运单号
-      tempExistCoPackWayBillList:[],
+      // 临时存储
       tempCoPackInfo:{},
 
       // 弹出展示层
       id:null,
       titleView:"",
       openView: false,
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
+
       tableData:[
         { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
         { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
@@ -666,31 +636,71 @@ export default {
         }
       }
 
-      console.log("====>batchName===>",this.form.batchName);
-
     },
-    async initData() {
-
-      console.log("==this.isCopy=>",this.isCopy);
 
+  initData() {
       if(this.batchId !=null) {
-        this.showBatchInfo(this.batchId);
-        this.coPackType = "edit";
+        this.loading = true;
+        getEmisTmsSiteBatch(this.batchId).then(response => {
+          this.form = response.data;
+
+          // 获取装载信息
+          this.initLoadingInfo(this.form.batchNo);
+
+          // 获取关联运单信息
+          this.initBatchBillRel(this.form.batchNo);
+
+          this.loading = false;
+        });
       }else{
           this.reset();
-
+      
           this.form.startSiteCode=this.$store.getters.ownerSiteCode;
           this.form.batchType='1';
-          this.coPackType = "add";
-
-           this.form.batchNo = null;
-          let resPack = await getTmsGroupBatchNo();
-          this.form.batchNo = resPack.data;
-
+          this.form.batchNo = null;
+          getTmsGroupBatchNo().then(resPack=>{
+            this.form.batchNo = resPack.data;
+          });
+        
           this.form.batchDate=parseTime(new Date());
-
       }
     },
+
+    initLoadingInfo(batchNo){
+
+      listEmisTmsSiteBatchLoading({batchNo: batchNo}).then(response => {
+          this.tempCoPackInfo.tableData = [
+          { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
+          { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
+          { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
+        ];
+        this.tempCoPackInfo.tableDataId=[
+          { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
+          { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
+          { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
+        ];
+
+        let rows=response.rows;
+        for(let i = 0; i < rows.length;i++){
+            let rowItem=rows[i];
+            this.tempCoPackInfo.tableDataId[rowItem.row][rowItem.col] = rowItem.id;
+            this.tempCoPackInfo.tableData[rowItem.row][rowItem.col] = rowItem.posDesc;
+            this.tableData[rowItem.row][rowItem.col] = rowItem.posDesc;
+        }
+      });
+    },
+
+    initBatchBillRel(batchNo){
+      this.waitBatchDtlList=[];
+      listEmisTmsSiteBatchDtl({batchNo: batchNo}).then(response => {
+        let rows=response.rows;
+        let cvtBillList=rows.map(item=>{
+          return item.waybillDetail
+        });
+        this.waitBatchDtlList=cvtBillList;
+      });
+    },
+    
      // 表单重置
      reset() {
       this.form = {
@@ -728,244 +738,13 @@ export default {
         opMan: null,
         remark: null,
         tenantId: null,
+
+        loadingList:[],
+        batchDtlList:[],
       };
       this.resetForm("form");
     },
 
-    async showBatchInfo(batchId){
-      this.coPackType="edit";
-
-      let response = await getEmisTmsSiteBatch(batchId);
-      if(!response || response.code != 200){
-        this.$modal.msgError(response && response.msg || "未知错误");
-        return;
-      }
-      this.form = {...response.data};
-      let batchNo=this.form.batchNo+'';
-
-      if(this.isCopy){
-          this.form.batchNo = null;
-          let resPack = await getTmsGroupBatchNo();
-          this.form.batchNo = resPack.data;
-
-          this.form.id = null;
-          this.coPackType = "add";
-          this.form.batchDate=parseTime(new Date());
-      }
-
-      this.emisCoPackDetail=[];
-      let resList = await listEmisTmsSiteBatchDtl({batchNo: batchNo});
-      if(!resList || resList.code != 200){
-        this.$modal.msgError(resList && resList.msg || "未知错误");
-        return;
-      }
-      this.tempExistCoPackWayBillList = resList.rows;
-      //临时存储，用于运单号校验
-      this.tempCoPackInfo = this.form;
-      let cvtBillList=this.tempExistCoPackWayBillList.map(item=>item.waybillDetail);
-
-      // for(let p = 0; p < resList.rows.length;p++){
-      //   this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
-      // }
-      this.emisCoPackDetail=cvtBillList;
-      
-      this.form.packStatus = this.tempCoPackInfo.packStatus;
-      this.form.scanDate = this.tempCoPackInfo.scanDate;
-
-      let resLoadingList = await listEmisTmsSiteBatchLoading({batchNo: batchNo});
-      if(!resLoadingList || resLoadingList.code != 200){
-        this.$modal.msgError(resLoadingList && resLoadingList.msg || "未知错误");
-        return;
-      }
-
-      this.tempCoPackInfo.tableData = [
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      this.tempCoPackInfo.tableDataId=[
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      for(let p = 0; p < resLoadingList.rows.length;p++){
-        this.tempCoPackInfo.tableDataId[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].id;
-        this.tempCoPackInfo.tableData[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].posDesc;
-        this.tableData[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].posDesc;
-        // this.emisCoPackDetail.push(resLoadingList.rows[p].waybillDetail);
-      }
-
-      this.computeTotal();
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "修改组批次";
-
-
-      console.log("===>111==>this.form===>",this.form);
-
-    },
-
-    getWaybillList(){
-
-    },
-    handleQueryWait(){
-      this.single = true;
-      this.multiple = true;
-      if(null != this.dateTimeRange && '' != this.dateTimeRange){
-        this.queryWaitParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryWaitParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      // this.queryWaitParams.packNo = this.queryParams.packNo;
-      this.queryWaitParams.receiveCountry = this.queryParams.receiveCountry;
-      this.queryWaitParams.sendCountry = this.queryParams.sendCountry;
-
-      if(this.queryParams.billCode){
-        let qBillCode=formatSearchStr(this.queryParams.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.queryParams.params.queryOrderType == "0"){
-          this.queryWaitParams.batchNo=newBillCodeStr;
-          this.queryWaitParams.billCode=null;
-        }else{
-          // 处理子单号
-          this.queryWaitParams.billCode=newBillCodeStr;
-          this.queryWaitParams.batchNo=null;
-        }
-      }
-
-      this.loadingWait = true;
-      this.queryWaitParams.params.isNeedBatch = 1;
-      this.queryWaitParams.params.batchType = this.form.batchType;
-
-      listEmisWaybill(this.queryWaitParams).then(response => {
-        this.loadingWait = false;
-        if(response.code != 200){
-          this.$modal.msgError(response.msg);
-          return;
-        }
-        this.emisTmsWaitPackList = response.rows;
-        // this.emisCoPackDetail = response.rows;
-        console.log(this)
-        this.waitTotal = response.total;
-      })
-    },
-    handleWaitSelectionChange(selection){
-      // selection.length > 0 ? this.packDisabled = false : this.packDisabled=true;
-      this.waitPackList = selection;
-    },
-    async handleQueryDone(){
-      this.single = true;
-      this.multiple = true;
-      this.loadingDone = true;
-      if(null != this.dateTimeRange && '' != this.dateTimeRange){
-        this.queryDoneParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryDoneParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      // this.queryDoneParams.packNo = this.queryParams.packNo;
-      if(this.queryParams.billCode){
-        let qBillCode=formatSearchStr(this.queryParams.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.queryParams.params.queryOrderType == "0"){
-          this.queryDoneParams.batchNo=newBillCodeStr;
-          this.queryDoneParams.billCode=null;
-        }else{
-          // 处理子单号
-          this.queryDoneParams.billCode=newBillCodeStr;
-          this.queryDoneParams.batchNo=null;
-        }
-      }
-
-      this.queryDoneParams.receiveCountry = this.queryParams.receiveCountry;
-      this.queryDoneParams.sendCountry = this.queryParams.sendCountry;
-      let resList = await listEmisTmsSiteBatchDtl(this.queryDoneParams);
-      this.loadingDone = false;
-      if(!resList || resList.code != 200){
-        this.$modal.msgError(resList && resList.msg || "未知错误");
-        return;
-      }
-      //this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
-      this.doneTotal = resList.total;
-      this.emisTmsDonePackList = [];
-      for(let p = 0; p < resList.rows.length;p++){
-        let obj = {...resList.rows[p].waybillDetail};
-        obj.packNo = resList.rows[p].packNo;
-        this.emisTmsDonePackList.push(obj);
-      }
-    },
-    handleDoneSelectionChange(){
-
-    },
-    handleQueryWayBill(){
-      this.loading2 = true;
-      if (null != this.wayBillData.dateTimeRange && '' != this.wayBillData.dateTimeRange) {
-        if(this.wayBillData.dataTimeType == '1'){
-          // 下单时间
-          this.wayBillData.params.beginOrderDate = dateToStr(new Date(this.wayBillData.dateTimeRange[0]));
-          this.wayBillData.params.endOrderDate = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
-        }else if(this.wayBillData.dataTimeType == '0'){
-          // 录单时间
-          this.wayBillData.params.beginCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[0]));
-          this.wayBillData.params.endCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
-        }
-      }
-      if(this.wayBillData.billCode){
-        let qBillCode=formatSearchStr(this.wayBillData.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.wayBillData.params.queryOrderType == "0"){
-          this.wayBillData.orderSN=newBillCodeStr;
-          this.wayBillData.billCode=null;
-        }else{
-          // 处理子单号
-          this.wayBillData.billCode=newBillCodeStr;
-          this.wayBillData.orderSN=null;
-        }
-      }
-      this.wayBillData.params.isNeedBatch = 1;
-      this.wayBillData.params.batchType = this.form.batchType;
-      listEmisWaybill(this.wayBillData).then(response => {
-        this.loading2 = false;
-        if(response.code != 200){
-          this.$modal.msgError(response.msg);
-          return;
-        }
-        this.emisWayBillList = response.rows;
-        // this.emisCoPackDetail = response.rows;
-        console.log(this)
-        this.wayBillotal = response.total;
-      })
-    },
     onSupplierSelect(item){
       console.log("==onSupplierSelect===>",item);
       if(!item){
@@ -1012,390 +791,127 @@ export default {
       // 计算批次名称
       this.calcBatchName();
     },
-    onDateSelect(value){
-      console.log("date picker---->", value)
-      this.dateTimeRange=value;
-      if(this.queryParams.params.queryOrderDateType == '1'){
-        // 下单时间
-        this.queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-    },
-    onWayBillDateSelect(value){
-      console.log("date picker---->", value)
-      this.wayBillData.dateTimeRange=value;
-    },
 
-    submitSaveBatchForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          this.handleAddCoPack();
-        }
-        });
-    },
-
-    async handleAddCoPack(){
-
-      if(this.emisCoPackDetail.length == 0){
-        this.$modal.msgError("请先选择至少一条运单信息")
+     submitSaveBatchForm() {
+      if(this.waitBatchDtlList.length == 0){
+        this.$modal.msgError("请加入批次运单列表")
         return;
       }
 
-      // 新增
-      if(this.coPackType == "add")
-      {
-
-        this.isDoing=true;
-        if(this.isCopy){
-          this.form.id=null;
-        }
-        this.form.batchDtlList=[];
-        this.form.loadingList=[];
-        for(let i = 0; i< this.emisCoPackDetail.length;i++){
-          let packDetail = {
-            batchNo:this.form.batchNo,
-            billCode: this.emisCoPackDetail[i].billCode,
-            scanDate: this.emisCoPackDetail[i].scanDate,
-            scanStatus: this.emisCoPackDetail[i].scanStatus,
-            groupStatus: "1",//已组批次
-            scanMan: this.emisCoPackDetail[i].scanMan,
-            scanSite: this.emisCoPackDetail[i].scanSite,
-          };
-          this.form.batchDtlList.push(packDetail);
-          // let response = await addEmisTmsSiteBatchDtl(packDetail);
-          // if(!response || response.code != 200){
-          //   this.isDoing=false;
-          //   this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-          //   return;
-          // }
-          this.waitPackList=[];
-        }
-
-        // 新增配载数据 tableData
-        for(let lr = 0; lr < 3; lr++){
-          for(let ll = 0; ll < 6; ll++){
-            let batchLoadingData = {
-              batchNo: this.form.batchNo,
-              posNo:lr+":"+ll+":1",
-              row: lr,
-              col: ll,
-              layer: 1,
-              posDesc:this.tableData[lr][ll],
-              remark:"",
-              tenantId:"",
-            }
-            this.form.loadingList.push(batchLoadingData);
-            // let resLD = await addEmisTmsSiteBatchLoading(batchLoadingData);
-            // if(!resLD || resLD.code != 200){
-            //   this.isDoing=false;
-            //   this.$modal.msgError(resLD && resLD.msg || '组批次配载明细新增失败')
-            //   return;
-            // }
+      this.$refs["form"].validate(async valid => {
+        if (valid) {
+      
+          if(this.isCopy){
+            this.form.id=null;
           }
-        }
-        try {
-          let response = await addAllEmisTmsSiteBatch(this.form);
-        } catch (error) {
-          this.isDoing=false;
-          this.$modal.msgError(response && response.msg || '新增组批次失败')
-        }       
-        
-        // 批次重算
-        try{
-          let resScan=await scanSiteBatch(this.form.batchNo);
-        }
-        catch(e){
-          console.log(e)
-        }
+    
+          this.form.batchDtlList=[];
+          for(let i = 0; i< this.waitBatchDtlList.length;i++){
+            let item=this.waitBatchDtlList[i];
 
-        this.isDoing=false;
+            let packDetail = {
+              batchNo:this.form.batchNo,
+              billCode: item.billCode,
+              scanDate: null,
+              scanStatus: "0",
+              groupStatus: "1",//已组批次
+              scanMan: null,
+              scanSite: null,
+            };
+            this.form.batchDtlList.push(packDetail);
+          }
+       
 
-      }
-      else if(this.coPackType == "edit"){
-        // 修改
-        this.isDoing=true;
-
-        let res = await updateEmisTmsSiteBatch(this.form);
-        if(!res || res.code != 200){
-          this.isDoing=false;
-          this.$modal.msgError(res && res.msg || '未知错误')
-          return;
-        }
-
-        // 修改配载数据
-        for(let lr = 0; lr < 3; lr++){
-          for(let ll = 0; ll < 6; ll++){
-            if(this.tempCoPackInfo.tableData[lr][ll] != this.tableData[lr][ll]){
+          // 新增配载数据 tableData
+          this.form.loadingList=[];
+          for(let lr = 0; lr < 3; lr++){
+            for(let ll = 0; ll < 6; ll++){
               let batchLoadingData = {
-                id: this.tempCoPackInfo.tableDataId[lr][ll],
+                batchNo: this.form.batchNo,
+                posNo:lr+":"+ll+":1",
+                row: lr,
+                col: ll,
+                layer: 1,
                 posDesc:this.tableData[lr][ll],
+                remark:"",
+                tenantId:"",
               }
-              let resLD = await updateEmisTmsSiteBatchLoading(batchLoadingData);
-              if(!resLD || resLD.code != 200){
-                this.isDoing=false;
-                this.$modal.msgError(resLD && resLD.msg || '组批次配载明细新增失败')
-                return;
-              }
+              this.form.loadingList.push(batchLoadingData);
             }
           }
-        }
 
-         // 批次重算
-         try{
-          let resScan=await scanSiteBatch(this.form.batchNo);
-        }
-        catch(e){
-          console.log(e)
-        }
-      }
-      this.isDoing=false;
-      this.$modal.msgSuccess('操作成功！');
-      this.$emit("on-changed");
+          if (this.form.id != null) {
+            this.isDoing=true;
+            try{
+              const ret=await editAllEmisTmsSiteBatch(this.form);
+              this.isDoing=false;
+              this.$modal.msgSuccess("修改成功");
+              this.$emit("on-changed");
+            }catch(e){
+              this.isDoing=false;
+              // this.$modal.msgError(e);
+            }
 
+            scanSiteBatch(this.form.batchNo).then(res=>{});
+            
+          } else {
+            this.isDoing=true;
+            try{
+              let res=await addAllEmisTmsSiteBatch(this.form);
+              this.isDoing=false;
+              this.$modal.msgSuccess("新增成功");
+              this.$emit("on-changed");
+            }catch(e){
+              this.isDoing=false;
+              // this.$modal.msgError(e);
+            }
+            scanSiteBatch(this.form.batchNo).then(res=>{ });
+          }
+        }
+      });
     },
-
     handleCancelCo(){
       this.form={};
       this.blUnpack="1";
-      this.emisCoPackDetail=[];
+      this.waitBatchDtlList=[];
       this.$emit("on-cancel");
     },
-    handleWayBillSelectionChange(selection){
-      this.tempCoPackList = selection;
-      this.tempCoPackList.length > 0 ? this.addWayBillDisabled = false : this.addWayBillDisabled = true;
-    },
+
     async addBillToBatch(){
-      if(this.formBatchBillList==null || this.formBatchBillList==''){
+      if(this.inputBatchBillCode==null || this.inputBatchBillCode==''){
         this.$modal.msgError("请输入单号");
         return;
       }
-      let billCodeList=this.formBatchBillList.trim().split(/[；\;\,\，\n]/)||[];
-
-      for(let i = 0; i < billCodeList.length; i++){
-        let billcode = billCodeList[i].trim();
-        if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
-
-          let billRes = await listEmisWaybill(
-            {
-              billCode:billcode,
-              params:{
-                isNeedBatch:1,
-                batchType:this.form.batchType
-              }
-            }
-          );
-          if(!billRes || billRes.code != 200){
-            this.$modal.msgError(billRes && billRes.msg)
-            return;
-          }else if(!billRes.rows || billRes.rows.length < 1){
-            this.$modal.msgError('运单不存在或状态异常(已签收,已占用,已派送),不能组批次: ' + billcode)
-            return;
-          }
-          let item = billRes.rows[0];
-          if(this.coPackType=="edit")
-          {
-            let packDetail = {
-              batchNo: this.form.batchNo,
-              billCode: item.billCode,
-              scanDate: item.scanDate,
-              scanStatus: item.scanStatus,
-              groupStatus: "1",//已组批次
-              scanMan: item.scanMan,
-              scanSite: item.scanSite,
-              createBy: this.$store.getters.empCode,
-              createTime: parseTime(new Date())
-            };
-            try{
-              let response = await addEmisTmsSiteBatchDtl(packDetail);
-              this.emisCoPackDetail.push(item);
-            }catch(e){
-              console.log('e',e)
-              return;
-            }
-            
-          }else{
-            this.emisCoPackDetail.push(item);
-          }
+      let billCodeArr=this.inputBatchBillCode.trim().split(/[；\;\,\，\n]/)||[];
+      for(let i = 0; i < billCodeArr.length; i++){
+        let billcode = billCodeArr[i].trim();
+        if(this.waitBatchDtlList.filter(wb => wb.billCode == billcode).length == 0){
+          getEmisWaybillByBillCode(billcode).then(res=>{
+            let item=res.data;
+            this.waitBatchDtlList.push(item);
+            this.computeTotal();
+          });
         }
       }
       this.titleBatch="";
       this.openBatch=false;
-      this.formBatchBillList = "";
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
-      this.computeTotal();
-      // 更新主表
-      if(this.coPackType=="edit"){
-        let res = await updateEmisTmsSiteBatch(this.form);
-        if(!res || res.code != 200){
-          this.$modal.msgError(res && res.msg || '未知错误')
-          return;
-        }
-        else{
-          // 批次重算
-          try{
-            scanSiteBatch(this.form.batchNo);
-          }
-          catch(e){
-            console.log(e)
-          }
-        }
-      }
-    },
-    async handleCoAdd(){
-      this.tempCoPackList.forEach(async (item) => {
-        if(this.emisCoPackDetail.filter(wb => wb.billCode == item.billCode).length == 0){
-          this.emisCoPackDetail.push(item);
-          if(this.coPackType=="edit"){
-            let packDetail = {
-              batchNo: this.form.batchNo,
-              billCode: item.billCode,
-              scanDate: item.scanDate,
-              scanStatus: item.scanStatus,
-              groupStatus: "1",//已组批次
-              scanMan: item.scanMan,
-              scanSite: item.scanSite,
-              createBy: this.$store.getters.empCode,
-              createTime: parseTime(new Date())
-            };
-            let response = await addEmisTmsSiteBatchDtl(packDetail);
-            if(!response || response.code != 200){
-              this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-              return;
-            }
-          }
-        }
-      })
-      this.titleWayBill="";
-      this.openWayBillForm=false;
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
-      this.computeTotal();
-      // 更新主表
-      if(this.coPackType=="edit"){
-        let res = await updateEmisTmsSiteBatch(this.form);
-        if(!res || res.code != 200){
-          this.$modal.msgError(res && res.msg || '未知错误')
-          return;
-        }
-        else{
-          // 批次重算
-          try{
-            let resScan=await scanSiteBatch(this.form.batchNo);
-          }
-          catch(e){
-            console.log(e)
-          }
-        }
-      }
-    },
-    handleCloseWayBill(){
-      this.titleWayBill="";
-      this.openWayBillForm=false;
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
+      this.inputBatchBillCode = "";
+      
     },
     handleCoPackListDelete(){
-
-      if(this.coPackType == "edit"){
-        this.$confirm('确认删除该条数据吗？', '确认信息')
-          .then(async (isPass) => {
-            if (isPass) {
-              //计算要删除的运单, “删除”按钮的操作逻辑
-              // let tempDelList = [];
-              // 计算出选中的数据是已存在还是新增的；
-              let idsArrTemp=[];
-              for(let gti=0; gti < this.tempExistCoPackWayBillList.length;gti++){
-                if(this.coSelection.filter(item => {
-                  return this.tempExistCoPackWayBillList[gti].billCode == item.billCode
-                }).length > 0){
-                  // 已存在
-                  let res = await delEmisTmsSiteBatchDtl(this.tempExistCoPackWayBillList[gti].id);
-                  if(!res || res.code != 200){
-                    this.$modal.msgError(res && res.msg || '未知错误')
-                    return;
-                  }
-                  idsArrTemp.push(this.tempExistCoPackWayBillList[gti].id)
-                }
-              }
+      this.$confirm('确认删除？', '确认信息')
+          .then( (isPass) => {
+          if (isPass) {
               let newList =[];
-              this.emisCoPackDetail.forEach(item=>{
+              this.waitBatchDtlList.forEach(item=>{
                 if(this.coSelection.filter(cs => cs.billCode == item.billCode) == 0){
                   newList.push(item);
                 }
               });
-              this.emisCoPackDetail = newList;
-              let afterList=[];
-              for(let ai = 0; ai < this.tempExistCoPackWayBillList.length; ai++){
-                console.log(idsArrTemp)
-                console.log(this.tempExistCoPackWayBillList[ai])
-                if(idsArrTemp.indexOf(this.tempExistCoPackWayBillList[ai].id) == -1){
-                  afterList.push(this.tempExistCoPackWayBillList[ai]);
-                }
-              }
-              this.tempExistCoPackWayBillList = afterList;
-              //this.tempExistCoPackWayBillList.filter(item => {idsArrTemp.indexOf(item.id) == -1})
-
+              this.waitBatchDtlList = newList;
               this.computeTotal();
-              // 更新主表
-              this.tempCoPackInfo.destCountry = this.form.destCountry;
-              // this.tempCoPackInfo.sendStiteCode = this.form.sendStiteCode;
-              // this.tempCoPackInfo.sendStiteName = this.form.sendStiteName || null;
-              this.tempCoPackInfo.nextSiteCode = this.form.nextSiteCode;
-              this.tempCoPackInfo.nextSiteName = this.form.nextSiteName;
-              this.tempCoPackInfo.blUnpack = this.blUnpack;
-              this.tempCoPackInfo.totalWaybillQty = this.form.totalWaybillQty;
-              this.tempCoPackInfo.totalParcelQty = this.form.totalParcelQty;
-              this.tempCoPackInfo.totalWeight = this.form.totalWeight;
-              this.tempCoPackInfo.totalVolume = this.form.totalVolume;
-              let res = await updateEmisTmsSiteBatch(this.tempCoPackInfo);
-              if(!res || res.code != 200){
-                this.$modal.msgError(res && res.msg || '未知错误')
-                return;
-              }else{
-                // 批次重算
-                try{
-                  let resScan=await scanSiteBatch(this.form.batchNo);
-                }
-                catch(e){
-                  console.log(e)
-                }
-              }
-              this.$modal.msgSuccess('删除成功')
-            }
-          })
-          .catch()
-      }else{
-        let newList =[];
-        this.emisCoPackDetail.forEach(item=>{
-          if(this.coSelection.filter(cs => cs.billCode == item.billCode) == 0){
-            newList.push(item);
           }
-        });
-        this.emisCoPackDetail = newList;
-        this.computeTotal();
-      }
+      });
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -1414,18 +930,15 @@ export default {
       this.selection = selection;
       this.single = selection.length!==1
       this.multiple = !selection.length
-    },
-    handleCoPackSelectionChange(selection){
-      // this.coSelection = selection.map(item => item.id)
+
       this.coSelection = selection;
-      this.coSingle = selection.length!==1
-      this.coMultiple = !selection.length
+
     },
     computeTotal(){
       let totalParcelQty=0;
       let totalWeight=0;
       let totalVolume=0;
-      this.emisCoPackDetail.forEach(item =>{
+      this.waitBatchDtlList.forEach(item =>{
         totalParcelQty +=item.parcelQty;
         totalWeight +=item.billWeight;
         totalVolume +=item.totalVolume;
@@ -1438,7 +951,7 @@ export default {
         item.nextSiteName = this.form.nextSiteName;
         item.blUnpack = this.blUnpack;
       })
-      this.form.totalWaybillQty=this.emisCoPackDetail.length;
+      this.form.totalWaybillQty=this.waitBatchDtlList.length;
       this.form.totalParcelQty=totalParcelQty;
       this.form.totalWeight=totalWeight.toFixed(2);
       this.form.totalVolume=totalVolume.toFixed(4);
@@ -1456,69 +969,9 @@ export default {
     cancelAddBillToBatch(){
       this.openBatch=false;
       this.titleBatch = "";
-      this.formBatchBillList = "";
+      this.inputBatchBillCode = "";
     },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
-    },
-    /** 修改按钮操作 */
-    async handleUpdate() {
-      // this.form={};
-      let id = this.ids[0]
-      this.coPackType="edit";
-      let response = await getEmisTmsSiteBatch(id);
-      if(!response || response.code != 200){
-        this.$modal.msgError(response && response.msg || "未知错误");
-        return;
-      }
-      let resData = response.data;
-      let time = {};
 
-      time.carTime = resData.etd;
-      this.form = {...resData, ...{batchDate:resData.createTime}, ...time};
-
-      this.emisCoPackDetail=[];
-      let resList = await listEmisTmsSiteBatchDtl({batchNo: resData.batchNo});
-      if(!resList || resList.code != 200){
-        this.$modal.msgError(resList && resList.msg || "未知错误");
-        return;
-      }
-      this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
-      this.tempCoPackInfo = resData;
-      for(let p = 0; p < resList.rows.length;p++){
-        this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
-      }
-      this.form.packStatus = this.tempCoPackInfo.packStatus;
-      this.form.scanDate = this.tempCoPackInfo.scanDate;
-
-      let resLoadingList = await listEmisTmsSiteBatchLoading({batchNo: resData.batchNo});
-      if(!resLoadingList || resLoadingList.code != 200){
-        this.$modal.msgError(resLoadingList && resLoadingList.msg || "未知错误");
-        return;
-      }
-
-      this.tempCoPackInfo.tableData = [
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      this.tempCoPackInfo.tableDataId=[
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      for(let p = 0; p < resLoadingList.rows.length;p++){
-        this.tempCoPackInfo.tableDataId[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].id;
-        this.tempCoPackInfo.tableData[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].posDesc;
-        this.tableData[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].posDesc;
-        // this.emisCoPackDetail.push(resLoadingList.rows[p].waybillDetail);
-      }
-
-      this.computeTotal();
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "修改组批次";
-    },
     handleView(row) {
        this.id=row.id;
        this.titleView="查看";
@@ -1532,34 +985,25 @@ export default {
     cancelForm(){
       this.openForm = false;
     },
-    /** 删除按钮操作 */
-    CoPack(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisTmsSiteBatch(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-
     /** 导出按钮操作 */
     handleDownBatchDtl() {
       const loadingInstance = this.$loading({
             text: '正在导出...'
       })
 
-          let qExportParam={
-            pageNum:1,
-            pageSize:20000,
-            batchNo: this.form.batchNo
-          };
+      this.exportData(this.waitBatchDtlList,loadingInstance);
 
-          listEmisTmsSiteBatchDtl(qExportParam).then(response => {
-            if (response.code === 200) {
-              this.exportData(response.rows,loadingInstance);
-            }
-          });
+      // let qExportParam={
+      //   pageNum:1,
+      //   pageSize:20000,
+      //   batchNo: this.form.batchNo
+      // };
+
+      // listEmisTmsSiteBatchDtl(qExportParam).then(response => {
+      //   if (response.code === 200) {
+      //     this.exportData(response.rows,loadingInstance);
+      //   }
+      // });
     },
     exportData(selData,loadingInstance){
       const curList =selData