diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 6dfee464..b1128260 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -601,7 +601,7 @@ export default {
     this.updateTable()
 
     this.initSort();
-    this.initKeyDown();
+    // this.initKeyDown();
     this.tableDom=this.getTableDom();
   },
   methods: {
@@ -698,15 +698,18 @@ export default {
             if(selTplItem){
               this.form=selTplItem;
               this.curentTbShowTpl=selTplItem.tplCode;
+              this.initStorage();
+              this.updateTable();
             }
-
+            // 检查字段描述
             // console.log("===>initTbShowlList=2222=>",this.storeTplList);
             // console.log("===>this.curentTbShowTpl=2222=>",this.curentTbShowTpl);
 
-
           }
         });
       },
+      // 矫正模版数据
+
       savaTbShowTpl(){
         if(!this.form.tplName){
           this.form.tplName='默认'
@@ -1112,7 +1115,7 @@ export default {
       })
       // 必须在节点数组存在的才有意义
       list = list.filter(item => this.$vnode.componentOptions.children.find(n => {
-        return n.componentOptions && item.label === n.componentOptions.propsData.label
+        return n.componentOptions && item.prop === n.componentOptions.propsData.prop
       }))
       this.storageList = list
     },
diff --git a/src/views/emis/emisTmsPack/packageManagement.vue b/src/views/emis/emisTmsPack/packageManagement.vue
index 0d1ae6cf..bbc0458b 100644
--- a/src/views/emis/emisTmsPack/packageManagement.vue
+++ b/src/views/emis/emisTmsPack/packageManagement.vue
@@ -1,1735 +1,96 @@
+
 <template>
-  <XdPageContainer class="app-container">
-    <!-- <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery"> -->
-    <el-form slot="pageHeader" ref="form" size="mini"  :model="queryParams"  label-width="100px">
-      <el-row  :gutter="0" style="display: flex;flex-wrap: wrap;">
-        <el-col :span="8">
-          <el-form-item label="" prop="queryOrderType">
-            <div slot="label">
-              <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                <el-radio label="1">合包号</el-radio>
-                <el-radio label="2">运单号</el-radio>
-              </el-radio-group>
-            </div>
-            <!-- <el-input
-              v-model="queryParams.packNo"
-              :placeholder="$t('多个合包号逗号可换行隔开')"
-              clearable
-              type="textarea"
-              rows="2"
-            /> -->
-            <XdTextareaInput
-              v-model="queryParams.packNo"
-              :placeholder="$t('多个流水号逗号或换行隔开')"
-              clearable
-              :rows="2"
-            />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="发货时间" prop="dateTimeRange">
-            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item :label="$t('寄件网点')" prop="sendAreaSiteCode">
-            <EmisSiteSimplePicker  v-model="queryParams.sendAreaSiteCode" :placeholder="$t('寄件网点')"  isInitiated="true" ></EmisSiteSimplePicker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="目的国家" prop="sendCountry">
-            <CountryPicker v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" ></CountryPicker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="所属线路" prop="lineCode">
-            <TransLinePicker v-model="queryParams.lineCode" :countryCode="queryParams.receiveCountry"></TransLinePicker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="产品类型" prop="productType">
-            <TransProductPicker placeholder="全部" v-model="queryParams.productType" :transLineCode="queryParams.lineCode" ></TransProductPicker>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="问题件方式" prop="pickupMethod">
-            <el-select clearable="" v-model="queryParams.problemQueryType" placeholder="请选择">
-              <el-option label="只查问题件类型" :value="1"></el-option>
-              <el-option label="剔除问题件类型" :value="2"></el-option>
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="问题件类型" prop="problemType">
-            <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
-          </el-form-item>
-        </el-col>
-      </el-row>
-    <!-- </SearchForm> -->
-    </el-form>
-
-    <div slot="pageContent" slot-scope="slotProps">
-    <!-- slot-scope="slotProps"
-    :style="'height:'+(slotProps.contentHeight)+'px'" -->
-      <div>
-        <el-button style="margin-right: 5px;"
-          type="primary"
-          plain
-          size="mini"
-          v-hasPermi="['emis:emisTmsPack:query']"
-          @click="getQuery"
-        >查询</el-button>
-        <!-- <el-button style="margin-right: 5px;"
-          type="primary"
-          plain
-          icon="el-icon-plus"
-          size="mini"
-          @click="handleAdd"
-          v-hasPermi="['emis:emisTmsPack:add']"
-        >去组包</el-button> -->
-
-        <!-- <el-button style="margin-right: 5px;"
-          type="danger"
-          plain
-          size="mini"
-          :disabled="single"
-          @click="handleUpdate"
-          v-hasPermi="['emis:emisTmsPack:remove']"
-        >查看</el-button> -->
-        <!-- <el-button style="margin-right: 5px;"
-          type="danger"
-          plain
-          icon="el-icon-delete"
-          size="mini"
-          :disabled="multiple"
-          @click="handleDeleteCoPack"
-          v-hasPermi="['emis:emisTmsPack:remove']"
-        >删除</el-button> -->
-      </div>
-
-      <!-- :height="(slotProps.contentHeight-200)+'px'" -->
-      <el-tabs v-model="activeName" style="margin-top: 10px;" @tab-click="getQuery">
-        <el-tab-pane label="待合包" name="first">
-          <XdTable v-loading="loadingWait"
-            border
-            size="mini"
-            :data="emisTmsWaitPackList"
-            :showSearch.sync="showSearch"
-            :queryParams="queryWaitParams"
-            :total="waitTotal"
-
-            :showRightButton="false"
-            :showOperateButton="false"
-
-            @queryTable="handleQueryWait"
-            @selection-change="handleWaitSelectionChange"
-            @sort-change="handleSortChange"
-          >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-            <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" /> -->
-            <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" /> -->
-            <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
-              </template>
-            </el-table-column> -->
-            <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-            <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-            <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-            <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-            <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
-            <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="receiveCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-            <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
-            <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.remark }}</span>
-              </template>
-            </el-table-column>
-          </XdTable>
-        </el-tab-pane>
-        <!-- <el-tab-pane label="已合包" name="second">
-          <XdTable v-loading="loadingDone"
-            :height="(slotProps.contentHeight-200)+'px'"
-            border
-            size="small"
-            :data="emisTmsDonePackList"
-            :showSearch.sync="showSearch"
-            :queryParams="queryDoneParams"
-            :total="doneTotal"
-            :showRightButton="false"
-            @queryTable="handleQueryDone"
-            @selection-change="handleDoneSelectionChange"
-            @sort-change="handleSortChange"
-          >
-            <el-table-column type="selection" width="55" align="center" />
-            <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
-            <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-            <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
-            <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
-            <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" width="100" >
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-            <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-            <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-            <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
-              <template slot-scope="scope">
-                <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-            <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-            <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="receiveCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
-            <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-            <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
-            <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.sendCompany }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
-              <template slot-scope="scope">
-                <span class="ellipsis">{{ scope.row.remark }}</span>
-              </template>
-            </el-table-column>
-          </XdTable>
-        </el-tab-pane> -->
-        <!-- :height="(slotProps.contentHeight-200)+'px'" -->
-        <el-tab-pane label="合包列表" name="third">
-          <packListView ref="packListView" propType="pack" :propParams="queryParams" :slotProps="slotProps"></packListView>
-          <!-- <el-table
-             v-loading="loading"
-            border
-            size="mini"
-            ref="table"
-            :data="emisTmsPackList"
-            :showSearch.sync="showSearch"
-            :queryParams="queryParams"
-            :total="total"
-
-            :showRightButton="false"
-            :showOperateButton="false"
-
-            @queryTable="handleQuery"
-            @selection-change="handleSelectionChange"
-            @sort-change="handleSortChange"
-            @expand-change="expandChange"
-          >
-            <el-table-column type="expand">
-              <template slot-scope="props">
-                <XdTable v-loading="loadingDone"
-                  style="width:100%;"
-                  border
-                  size="mini"
-                  :data="emisTmsDonePackList"
-                  showSearch.sync="false"
-                  :queryParams="queryDoneParams"
-                  :total="doneTotal"
-                  @queryTable="handleQueryDone"
-                  @selection-change="handleDoneSelectionChange"
-                  @sort-change="handleSortChange"
-
-                  :showRightButton="false"
-                  :showOperateButton="false"
-                  :showPagination="false"
-                  :showCustomizeTpl="false"
-                >
-                  <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-                  <el-table-column :label="$t('所属主单号')" align="center" prop="mainBillCode" min-width="170" />
-                  <el-table-column :label="$t('当前网点')" align="center" prop="waybillDetail.currentSiteName" min-width="100" />
-                  <el-table-column :label="$t('下一网点')" align="center" prop="waybillDetail.nextSiteName" min-width="100" />
-                  <el-table-column :label="$t('寄件国家')" align="center" prop="waybillDetail.sendCountryName" min-width="100">
-                    <template slot-scope="scope">
-                      <span class="ellipsis">{{ scope.row.waybillDetail.sendCountryName }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('目的国家')" align="center" prop="waybillDetail.receiveCountryName" min-width="100">
-                    <template slot-scope="scope">
-                      <span class="ellipsis">{{ scope.row.waybillDetail.receiveCountryName }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('线路')" align="center" prop="waybillDetail.transLineTypeName" min-width="100" />
-                  <el-table-column :label="$t('产品类型')" align="center" prop="waybillDetail.productTypeName" min-width="100" />
-                  <el-table-column :label="$t('预计到达时间')" align="center" prop="waybillDetail.estimateDate" min-width="170">
-                    <template slot-scope="scope">
-                      <span>{{ parseTime(scope.row.waybillDetail.estimateDate, '{y}-{m}-{d}') }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('件数')" align="center" prop="waybillDetail.parcelQty" min-width="100" >
-                    <template>
-                      <span>1</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('收件人')" align="center" prop="waybillDetail.receiveName" min-width="150" />
-                  <el-table-column :label="$t('收件公司')" align="center" prop="waybillDetail.receiveCompany" min-width="100">
-                    <template slot-scope="scope">
-                      <span class="ellipsis">{{ scope.row.waybillDetail.receiveCompany }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('取件员')" align="center" prop="waybillDetail.takePieceEmployeeName" min-width="150" />
-                  <el-table-column :label="$t('取件方式')" align="center" prop="waybillDetail.pickupMethod" min-width="100">
-                    <template slot-scope="scope">
-                      <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.waybillDetail.pickupMethod"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-                    <template slot-scope="scope">
-                      <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.waybillDetail.paymentType"/>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('运费')" align="center" prop="waybillDetail.freight" min-width="100" />
-                  <el-table-column :label="$t('寄件人')" align="center" prop="waybillDetail.sendName" min-width="150" />
-                  <el-table-column :label="$t('寄件公司')" align="center" prop="waybillDetail.sendCompany" min-width="100">
-                    <template slot-scope="scope">
-                      <span class="ellipsis">{{ scope.row.waybillDetail.sendCompany }}</span>
-                    </template>
-                  </el-table-column>
-                  <el-table-column :label="$t('备注')" align="center" prop="waybillDetail.remark" min-width="100">
-                    <template slot-scope="scope">
-                      <span class="ellipsis">{{ scope.row.waybillDetail.remark }}</span>
-                    </template>
-                  </el-table-column>
-                </XdTable>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('合包号')" align="center" prop="packNo" min-width="170" />
-            <el-table-column :label="$t('合包状态')" align="center" prop="packStatus" min-width="100">
-              <template slot-scope="scope">
-                <dict-tag :options="dict.type.emis_pack_status" :value="scope.row.packStatus"/>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('创建网点')" align="center" prop="createSiteName" min-width="100" />
-            <el-table-column :label="$t('发出网点')" align="center" prop="sendStiteName" min-width="100" />
-            <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-
-            <el-table-column :label="$t('是否可拆')" align="center" prop="blUnpack" min-width="100">
-              <template slot-scope="scope">
-                <span>{{ scope.row.blUnpack == "1" ? "是" : "否" }}</span>
-              </template>
-            </el-table-column>
-            <el-table-column :label="$t('创建人')" align="center" prop="createByName" min-width="150" />
-            <el-table-column :label="$t('件数')" align="center" prop="totalParcelQty" min-width="100" />
-            <el-table-column :label="$t('合包重量')" align="center" prop="totalWeight" min-width="100" />
-            <el-table-column :label="$t('创建时间')" align="center" prop="packDate" min-width="170" />
-          </el-table> -->
-        </el-tab-pane>
-      </el-tabs>
+  <div class="app-container">
+    <div class="tab-container">
+        <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
+          <el-tab-pane label="待合包" name="billList" >
+            <WaitPackList @onSelect="onSelectBill"> </WaitPackList>
+          </el-tab-pane>
+          <el-tab-pane label="合包列表" name="hasPack" >
+            <PackList ref="packListView" propType="pack"  ></PackList>
+          </el-tab-pane>
+          <!-- <el-tab-pane v-for="(item, index) in billTabs" :key="index"  :name="item.settleBillNo" :label="'账单:'+item.settleBillNo"  closable >
+            <BillDetailPanel :settleBillNo="item.settleBillNo"></BillDetailPanel>
+          </el-tab-pane> -->
+        </el-tabs>
     </div>
-
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="80%" style="height: 80%" :destroy-on-close="true" @close="handleCancelCo" v-dialogDrag append-to-body>
-      <el-form ref="formCo" size="mini"  :model="coData"  label-width="100px" class="overflowhidden" disabled >
-        <el-row :gutter="20">
-          <el-col :span="16">
-            <el-col :span="12">
-              <el-form-item :label="$t('合包号')" prop="packNo">
-                <el-input v-model="coData.packNo" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('组包时间')" prop="createTime">
-                <el-input v-model="coData.createTime" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('目的国家')" prop="destCountry">
-                <!-- <span slot="label">
-                  <span style="color: red">{{ $t('目的国家') }}</span>
-                </span> -->
-                <CountryPicker :placeholder="$t('选择国家')" v-model="coData.destCountry" ></CountryPicker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('生成网点')" prop="sendStiteCode">
-                <span slot="label">
-                  <span style="color: red">{{ $t('生成网点') }}</span>
-                </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.sendStiteCode" :disabled="$store.getters.ownerSiteCode!='88888'" ></EmisSiteSimplePicker>
-                <!-- <el-input v-else  v-model="coData.sendSiteName" placeholder="" disabled /> -->
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('下一网点')" prop="nextSiteCode">
-                <span slot="label">
-                  <span style="color: red">{{ $t('下一网点') }}</span>
-                </span>
-                <!-- <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="coData.nextSiteCode" ></EmisSiteSimplePicker> -->
-                <EmisGetNextSitePicker :placeholder="$t('请选择')" v-model="coData.nextSiteCode" ></EmisGetNextSitePicker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item :label="$t('是否可拆')" prop="blUnpack">
-                <span slot="label">
-                  <span style="color: red">{{ $t('是否可拆') }}</span>
-                </span>
-                <!-- <el-radio-group  v-model="coData.blUnpack" value="1"> -->
-                  <el-radio v-model="blUnpack" label="1" :disabled="packDisabled">是</el-radio>
-                  <el-radio v-model="blUnpack" label="0" :disabled="packDisabled">否</el-radio>
-                <!-- </el-radio-group> -->
-              </el-form-item>
-            </el-col>
-          </el-col>
-          <el-col :span="8">
-            <el-col :span="24">
-              <el-form-item style="font-weight:600;">
-                <span>{{$t('总票数') + ': ' + (coData.totalWaybillQty || 0)}}</span>
-              </el-form-item>
-              <!-- <el-form-item>
-                <span slot="label">
-                  <span style="font-weight:600">{{$t('总票数') + ': '}}</span>
-                  <span style="font-weight:600">{{coData.totalWaybillQty || 0}}</span>
-                </span>
-              </el-form-item> -->
-            </el-col>
-            <el-col :span="24">
-              <el-form-item style="font-weight:600;">
-                <span>{{$t('总件数') + ': ' + (coData.totalParcelQty || 0)}}</span>
-              </el-form-item>
-              <!-- <el-form-item>
-                <span slot="label">
-                  <span style="font-weight:600">{{$t('总件数') + ': '}}</span>
-                  <span style="font-weight:600">{{coData.totalParcelQty || 0}}</span>
-                </span>
-              </el-form-item> -->
-            </el-col>
-            <el-col :span="24">
-              <el-form-item style="font-weight:600;">
-                <span>{{$t('总重量') + ': ' + (coData.totalWeight || 0)}}</span>
-              </el-form-item>
-              <!-- <el-form-item>
-                <span slot="label">
-                  <span style="font-weight:600">{{$t('总重量') + ': '}}</span>
-                  <span style="font-weight:600">{{coData.totalWeight || 0}}</span>
-                </span>
-              </el-form-item> -->
-            </el-col>
-            <el-col :span="24">
-              <el-form-item style="font-weight:600;">
-                <span>{{$t('总体积') + ': ' + (coData.totalVolume || 0)}}</span>
-              </el-form-item>
-            </el-col>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <XdTable v-loading="loading"
-        height="300px"
-        min-height="300px"
-        border
-        size="small"
-        id="emisCoPackDetail"
-        :data="emisCoPackDetail"
-        :showSearch.sync="showSearch"
-        :queryParams="queryParams"
-        :showRightButton="false"
-        @queryTable="donothing"
-        @selection-change="handleCoPackSelectionChange"
-        @sort-change="handleSortChange"
-      >
-
-        <div slot="toolbar">
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                size="mini"
-                @click="handleCoPackListDelete"
-                :disabled="coMultiple"
-              >删除</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAddWayBill"
-              >追加</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                size="mini"
-                @click="handleAddCoPack"
-              >确定</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                size="mini"
-                @click="handleCancelCo"
-              >取消</el-button>
-            </el-col>
-          </el-row>
-        </div>
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-        <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
-        <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" min-width="100" />
-        <el-table-column :label="$t('扫描状态')" align="center" prop="waybillStatus" min-width="100">
-          <template slot-scope="scope">
-            <span>{{ scope.row.waybillStatus == "1" ? "是" : "否" }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('扫描时间')" align="center" prop="xxx" min-width="170">
-          <template slot-scope="scope">
-            <span>{{ parseTime(coData.scanDate) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('状态')" align="center" prop="emis_pack_status" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_pack_status" :value="coData.packStatus"/>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-        <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-        <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-        <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
-          <template slot-scope="scope">
-            <span>{{ parseTime(estimateDate) }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-        <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-        <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
-        <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="receiveCompany" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
-        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-        <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
-        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCompany }}</span>
-          </template>
-        </el-table-column>
-      </XdTable>
-    </el-dialog>
-
-
-    <el-dialog :title="titleWayBill" :visible.sync="openWayBillForm" width="70%" @close="handleCloseWayBill" :destroy-on-close="true" v-dialogDrag append-to-body>
-      <el-form ref="formCo" size="mini"  :model="wayBillData"  label-width="100px" class="overflowhidden" >
-        <el-row :gutter="20">
-          <el-col :span="8">
-            <el-form-item label="" prop="billCode">
-              <div slot="label">
-                <el-radio-group class="query-label" v-model="wayBillData.params.queryOrderType">
-                  <el-radio label="1">运单号</el-radio>
-                  <el-radio label="0">订单号</el-radio>
-                </el-radio-group>
-              </div>
-              <!-- <el-input
-                v-model="wayBillData.billCode"
-                :placeholder="$t('多个流水号逗号或换行隔开')"
-                clearable
-                type="textarea"
-                rows="2"
-              /> -->
-              <XdTextareaInput
-                v-model="wayBillData.billCode"
-                :placeholder="$t('多个流水号逗号或换行隔开')"
-                clearable
-                :rows="2"
-              />
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('目的国家')" prop="receiveCountry">
-              <CountryPicker :placeholder="$t('选择国家')" v-model="wayBillData.receiveCountry" ></CountryPicker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="线路" prop="lineCode">
-              <TransLinePicker v-model="wayBillData.lineCode" :countryCode="wayBillData.destCountry"></TransLinePicker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="产品" prop="productType">
-              <TransProductPicker placeholder="全部" v-model="wayBillData.productType" :transLineCode="wayBillData.lineCode" ></TransProductPicker>
-            </el-form-item>
-          </el-col>
-          <el-col :span="8">
-            <el-form-item label="" prop="billCode">
-              <div slot="label">
-                <el-radio-group class="query-label" v-model="wayBillData.params.dataTimeType">
-                  <el-radio label="1">下单时间</el-radio>
-                  <!-- <el-radio label="0">录单时间</el-radio> -->
-                </el-radio-group>
-              </div>
-              <elDateAdvPicker clearable v-model="wayBillData.dateTimeRange" @dateTimeChange="onWayBillDateSelect" ></elDateAdvPicker>
-            </el-form-item>
-          </el-col>
-        </el-row>
-      </el-form>
-
-      <XdTable v-loading="loading2"
-        height="300px"
-        min-height="300px"
-        border
-        size="small"
-        id="emisWayBillList"
-        :data="emisWayBillList"
-        :showSearch.sync="showSearch"
-        :queryParams="wayBillData"
-        :total="wayBillotal"
-        :showRightButton="false"
-        @queryTable="handleQueryWayBill"
-        @sort-change="handleSortChange"
-        @selection-change="handleWayBillSelectionChange"
-        max-height="300px"
-      >
-
-        <div slot="toolbar">
-          <el-row :gutter="10" class="mb8">
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                size="mini"
-                @click="handleQueryWayBill"
-              >查询</el-button>
-            </el-col>
-            <el-col :span="1.5">
-              <el-button
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleCoAdd"
-                :disabled="addWayBillDisabled"
-              >追加</el-button>
-            </el-col>
-          </el-row>
-        </div>
-        <el-table-column type="selection" width="55" align="center" />
-        <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="170" />
-        <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="170" />
-        <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseCode" min-width="100" />
-        <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('当前网点')" align="center" prop="currentSiteName" min-width="100" />
-        <el-table-column :label="$t('下一网点')" align="center" prop="nextSiteName" min-width="100" />
-        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCountryName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('目的国家')" align="center" prop="receiveCountryName" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.receiveCountryName }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="100" />
-        <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="100" />
-        <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170">
-          <template slot-scope="scope">
-            <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-        <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-        <!-- <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" /> -->
-        <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="receiveCompany" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.receiveCompany }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployeeName" min-width="150" />
-        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100">
-          <template slot-scope="scope">
-            <dict-tag :options="dict.type.emis_payment_type" :value="scope.row.paymentType"/>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-        <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="150" />
-        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.sendCompany }}</span>
-          </template>
-        </el-table-column>
-        <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100">
-          <template slot-scope="scope">
-            <span class="ellipsis">{{ scope.row.remark }}</span>
-          </template>
-        </el-table-column>
-      </XdTable>
-    </el-dialog>
-  </XdPageContainer>
+  </div>
 </template>
 
 <script>
-import { listEmisTmsPack, getPackNo, getEmisTmsPack, delEmisTmsPack, addEmisTmsPack, updateEmisTmsPack } from "@/api/emis/emisTmsPack";
-import { listEmisWaybill } from "@/api/emis/emisWaybill";
-import { listEmisTmsPackDtl, delEmisTmsPackDtl, addEmisTmsPackDtl } from "@/api/emis/emisTmsPackDtl";
-// import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-import emisTmsPackForm from '@/views/emis/emisTmsPack/emisTmsPackForm';
-import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
-import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
-import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
-import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
-import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
-import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
-import PackListView from '@/views/emis/emisTmsSiteBatch/packListView';
+import WaitPackList from '@/views/emis/emisTmsPack/WaitPackList.vue';
+import PackList from '@/views/emis/emisTmsPack/PackList';
+// import BillDetailPanel from '@/views/emis/emisSettleBill/panel/BillDetailPanel.vue';
 
-import { parseTime, dateToStr } from "@/utils/custom";
-import { formatSearchStr } from '@/utils/index'
 
 export default {
   name: "PackageManagement",
-  components: { ProblemTypePicker, EmisGetNextSitePicker, CountryPicker, EmisSiteSimplePicker, elDateAdvPicker, emisTmsPackForm, TransLinePicker, TransProductPicker, PackListView},
-  dicts: ['emis_pack_status', 'emis_qujian_fangshi', 'emis_payment_type', 'emis_waybill_status'],
+  components: {
+    WaitPackList,
+    PackList
+ },
+  dicts: [
+  ],
   data() {
     return {
-      // 遮罩层
-      loading: false,
-      loading2: false,
-      loadingWait: false,
-      loadingDone: false,
-      // 选中数组
-      ids: [],
-      // 非单个禁用
-      single: true,
-      // 非多个禁用
-      multiple: true,
-
-      coSingle: true,
-      coMultiple: true,
-
-      packDisabled:false,//是否禁用可拆分包的按钮
-
-      addWayBillDisabled: true,
-      // packDisabled: true,
-      activeName:'first',
-
-      // 显示搜索条件
-      showSearch: true,
-      // 创建时间搜索
-      dateTimeRange:[],
-      // 总条数
-      total: 0,
-      // TMS合包表格数据
-      emisTmsPackList: [],
-
-      // 待合包列表
-      emisTmsWaitPackList:[],
-      waitTotal:0,
-
-      // 已合包列表
-      emisTmsDonePackList:[],
-      doneTotal:0,
-      waitPackList:[],//选择未组包的运单先保存起来，在后续新增合包的弹框中使用
-      // 新增/修改弹窗数据
-      coData: {
-        blUnpack:"1"
-      },
-      // 新增/修改包详情数据
-      emisCoPackDetail:[],
-      blUnpack:"1",
-      // 追加的运单查询数据
-      wayBillData: {
-        pageNum: 1,
-        pageSize: 20,
-        params:{
-          queryOrderType:'1',
-          dataTimeType:'1'
-        }
-      },
-      // 追加的运单数据
-      emisWayBillList:[],
-      wayBillotal:0,
-
-      currentId:null,
-      openForm: false,
-      titleForm: "",
-
-      titleWayBill:null,
-      openWayBillForm:false,
-
-      tempCoPackList:[],
-      coSelection:[],
-      //区分当前是新增还是修改
-      coPackType:'',
-
-      // 临时存储已有合包的运单号
-      tempExistCoPackWayBillList:[],
-      tempCoPackInfo:{},
-
-      // 弹出展示层
-      id:null,
-      titleView:"",
-      openView: false,
-      // 更新网点时间范围
-      daterangeCreateTime: [],
-      // 更新网点时间范围
-      daterangeUpdateTime: [],
-      // 查询参数
-      queryParams: {
-        pageNum: 1,
-        pageSize: 20,
-        packNo: null,
-        packName: null,
-        packDate: null,
-        destCountry: null,
-        destCountryName: null,
-        blUnpack: null,
-        sendStiteCode: null,
-        totalParcelQty: null,
-        totalWaybillQty: null,
-        totalVolume: null,
-        totalWeight: null,
-        packStatus: null,
-        opMan: null,
-        remark: null,
-        delFlag: null,
-        params:{
-          queryOrderType: '1',
-        },
-        packNo:'',
-        billCode: ''
-      },
-      queryCoParams: {
-        params:{}
-      },
-      // 查询参数
-      queryWaitParams: {
-        pageNum: 1,
-        pageSize: 20,
-        packNo: null,
-        beginCreateTime: null,
-        endCreateTime: null,
-        params:{}
-      },
-      // 查询参数
-      queryDoneParams: {
-        pageNum: 1,
-        pageSize: 20,
-        packNo: null,
-        params:{}
-      },
+      activeTab:'billList',
+      billTabs:[],
     };
   },
   created() {
-
-  },
-
-  mounted() {
-    const end = new Date()
-    const start = new Date()
-    start.setHours(0,0,0,0)
-    end.setHours(23,59,59,0)
-    this.dateTimeRange=[start,end];
-    this.activeName="first";
-    this.getQuery();
   },
   methods: {
-    getQuery(){
-      // this.packDisabled = true;
-      switch(this.activeName){
-        case 'first':
-          this.waitPackList=[];
-          this.handleQueryWait();
-          break;
-        case 'second':
-          this.waitPackList=[];
-          this.handleQueryDone();
-          break;
-        case 'third':
-          this.waitPackList=[];
-          // this.getList();
-          this.queryParams.dateTimeRange = this.dateTimeRange;
-          this.$refs.packListView.getList();
-          break;
-        default:
-          break;
-      }
-    },
-    expandChange(row, expandedRows){
-      if(expandedRows.length==0){// 没有扩展的行
-        this.currentExpandedRow = null;
-        return;
-      }
-      if(this.currentExpandedRow && expandedRows.length == 1 && expandedRows[0].packNo == this.currentExpandedRow.packNo){// 已经查询过了
-        return;
-      }
-      this.loading = true;
-      this.currentExpandedRow = row;
-      this.emisTmsDonePackList=[];
-      listEmisTmsPackDtl({packNo: row.packNo}).then(resList => {
-        // if(!resList || resList.code != 200){
-        //   this.$message.error(resList && resList.msg || "未知错误");
-        //   return;
-        // }
-        // for(let p = 0; p < resList.rows.length;p++){
-        //   this.emisTmsDonePackList.push(resList.rows[p].waybillDetail);
-        // }
-        this.emisTmsDonePackList=resList.rows;
-        this.doneTotal = resList.total;
-        this.loading = false;
-      });
-      if(expandedRows.length > 1){
-        for(let i = 0; i < expandedRows.length; i++){
-          if(row.packNo != expandedRows[i].packNo){
-            this.$refs.table.$refs.table.$refs.elTable.toggleRowExpansion(expandedRows[i], false);
-          }
-        }
-      }
-    },
-    donothing(){
+    handleTabsClick(){
 
     },
-    /** 查询TMS合包列表 */
-    getList() {
-      this.loading = true;
-      this.single = true;
-      this.multiple = true;
-      // this.queryParams.params = {};
-      if(this.queryParams.packNo){
-        let qBillCode=formatSearchStr(this.queryParams.packNo);
-        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 == ""){
+    onSelectBill(item) {
+      let old=this.billTabs.find(mItem=>mItem.settleBillNo==item.settleBillNo);
+      if(old){
+        this.activeTab=item.settleBillNo;
+      }else{
+        this.billTabs.push(item);
+        this.activeTab=item.settleBillNo;
+      }
+   },
+   removeTab(targetName) {
 
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.queryParams.params.queryOrderType == "1"){
-          this.queryParams.packNo=newBillCodeStr;
-          this.queryParams.billCode=null;
+        var self=this;
+        let tabs = self.billTabs;
+        self.billTabs = tabs.filter(tab => tab.settleBillNo !== targetName);
+        if(self.billTabs.length>0){
+          this.activeTab=self.billTabs[self.billTabs.length-1].settleBillNo;
         }else{
-          // 处理子单号
-          this.queryParams.billCode=newBillCodeStr;
-          this.queryParams.packNo=null;
+          this.activeTab="billList";
         }
-      }
-
-      this.emisTmsPackList = [];
-      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        this.queryParams.params["beginSendDate"] = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryParams.params["endSendDate"] = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      this.queryParams.packStatus='1';
-
-      this.queryParams.destCountry = this.queryParams.receiveCountry;
-      listEmisTmsPack(this.queryParams).then(response => {
-        this.emisTmsPackList = response.rows;
-        this.total = response.total;
-        this.loading = false;
-      });
-    },
-    handleQueryWait(){
-      this.single = true;
-      this.multiple = true;
-      this.queryWaitParams = {...this.queryParams};
-      if(null != this.dateTimeRange && '' != this.dateTimeRange){
-        this.queryWaitParams.params.beginSendDate = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryWaitParams.params.endSendDate = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      // this.queryWaitParams.packNo = this.queryParams.packNo;
-      let qBillCode=formatSearchStr(this.queryParams.packNo);
-      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 == "1"){
-        this.queryWaitParams.packNo=newBillCodeStr;
-        this.queryWaitParams.billCode=null;
-      }else{
-        // 处理子单号
-        this.queryWaitParams.billCode=newBillCodeStr;
-        this.queryWaitParams.packNo=null;
-      }
-
-      this.loadingWait = true;
-      this.queryWaitParams.params.isNeedPack = 1;
-      listEmisWaybill(this.queryWaitParams).then(response => {
-        this.loadingWait = false;
-        if(response.code != 200){
-          this.$message.error(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;
-      this.queryDoneParams = {...this.queryParams};
-      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;
-      let qBillCode=formatSearchStr(this.queryParams.packNo);
-      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 == "1"){
-        this.queryDoneParams.packNo=newBillCodeStr;
-        this.queryDoneParams.billCode=null;
-      }else{
-        // 处理子单号
-        this.queryDoneParams.billCode=newBillCodeStr;
-        this.queryDoneParams.packNo=null;
-      }
-      let resList = await listEmisTmsPackDtl(this.queryDoneParams);
-      this.loadingDone = false;
-      if(!resList || resList.code != 200){
-        this.$message.error(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.isNeedPack = 1;
-      listEmisWaybill(this.wayBillData).then(response => {
-        this.loading2 = false;
-        if(response.code != 200){
-          this.$message.error(response.msg);
-          return;
-        }
-        this.emisWayBillList = response.rows;
-        // this.emisCoPackDetail = response.rows;
-        console.log(this)
-        this.wayBillotal = response.total;
-      })
-    },
-    onDateSelect(value){
-      console.log("date picker---->", value)
-      this.dateTimeRange=value;
-    },
-    onWayBillDateSelect(value){
-      console.log("date picker---->", value)
-      this.wayBillData.dateTimeRange=value;
-    },
-    async handleAddCoPack(){
-      // if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
-      if(!this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
-        this.$modal.msgError("请先选择必填项")
-        return;
-      }
-      if(this.emisCoPackDetail.length == 0){
-        this.$modal.msgError("请先选择至少一条运单信息")
-        return;
-      }
-      let coPackItem={
-        packNo: this.coData.packNo,
-        packName: this.coData.packName || '',
-        packDate: this.coData.createTime,
-        destCountry: this.coData.destCountry,
-        nextSiteCode: this.coData.nextSiteCode,
-        // destCountryName: this.coData.,
-        blUnpack: this.coData.blUnpack,
-        sendStiteCode: this.coData.sendStiteCode,
-        sendSiteName: this.coData.sendSiteName,
-        totalParcelQty: this.coData.totalParcelQty,
-        totalWaybillQty: this.coData.totalWaybillQty,
-        totalVolume: this.coData.totalVolume,
-        totalWeight: this.coData.totalWeight,
-        // packStatus: this.coData.,
-        opMan: this.$store.getters.empCode
-      }
-      if(this.coPackType == "add"){// 新增
-        if(this.emisCoPackDetail.length<2){
-          this.$message.error("合包总件数少于2件");
-          return;
-        }
-        let resPack = await getPackNo();
-        if(!resPack || resPack.code != 200){
-          this.$message.error(resPack && resPack.msg || "未知错误");
-          return;
-        }
-        // this.coData.packNo = resPack.data;
-        coPackItem.packNo = resPack.data;
-        let response = await addEmisTmsPack(coPackItem);
-        // addEmisTmsPack(coPackItem).then(response => {
-        if(!response || response.code != 200){
-          this.$modal.msgError(response && response.msg || '新增合包失败')
-          return;
-        }
-        // })
-        for(let i = 0; i< this.emisCoPackDetail.length;i++){
-          let packDetail = {
-            packNo:resPack.data,
-            billCode: this.emisCoPackDetail[i].billCode,
-            scanDate: this.emisCoPackDetail[i].scanDate,
-            scanStatus: this.emisCoPackDetail[i].scanStatus,
-            packStatus: "1",//已合包
-            scanMan: this.emisCoPackDetail[i].scanMan,
-            createBy: this.$store.getters.empCode,
-            createTime: parseTime(new Date())
-          };
-          let response = await addEmisTmsPackDtl(packDetail);
-          // addEmisTmsPackDtl(packDetail).then(response => {
-          if(!response || response.code != 200){
-            this.$modal.msgError(response && response.msg || '合包明细新增失败')
-            return;
-          }
-          this.waitPackList=[];
-          // })
-        }
-      }else if(this.coPackType == "edit"){// 修改
-        //第一步：处理合包信息的更新；
-        if(this.tempCoPackInfo.destCountry != this.coData.destCountry
-          || this.tempCoPackInfo.sendStiteCode != this.coData.sendStiteCode
-          || this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode
-          || this.tempCoPackInfo.blUnpack != this.blUnpack
-          || this.tempCoPackInfo.totalWaybillQty != this.coData.totalWaybillQty
-          || this.tempCoPackInfo.totalParcelQty != this.coData.totalParcelQty
-          || this.tempCoPackInfo.totalWeight != this.coData.totalWeight
-          || this.tempCoPackInfo.totalVolume != this.coData.totalVolume
-        ){
-          this.tempCoPackInfo.destCountry = this.coData.destCountry;
-          this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
-          this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-          this.tempCoPackInfo.blUnpack = this.blUnpack;
-          this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
-          this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
-          this.tempCoPackInfo.totalWeight = this.coData.totalWeight;
-          this.tempCoPackInfo.totalVolume = this.coData.totalVolume;
-          let res = await updateEmisTmsPack(this.tempCoPackInfo);
-          // updateEmisTmsPack(this.tempCoPackInfo).then(res => {
-            if(!res || res.code != 200){
-              this.$modal.msgError(res && res.msg || '未知错误')
-              return;
-            }
-          // });
-        }
-        //第二步：处理运单列表的数据
-        //2.1：计算要删除的运单
-        // let tempDelList = [];
-        // tempDelList = this.tempExistCoPackWayBillList.filter(item => {
-        //   let ls = this.emisCoPackDetail.filter(cd => {
-        //     return cd.billCode == item.billCode
-        //   })
-        //   if(ls.length > 0){
-        //     return false;
-        //   }else{
-        //     return true;
-        //   }
-        // })
-        // // tempDelList.forEach(item =>{
-        // for(let tdl = 0; tdl < tempDelList.length; tdl++){
-        //   let item = tempDelList[tdl];
-        //   let res = await delEmisTmsPackDtl(item.id);
-        //   // delEmisTmsPackDtl(item.id).then(res => {
-        //     if(!res || res.code != 200){
-        //       this.$modal.msgError(res && res.msg || '未知错误')
-        //       return;
-        //     }
-        //   // })
-        // }
-        // })
-
-      }
-      this.openForm= false;
-      this.titleForm = "";
-      this.$modal.msgSuccess('操作成功！');
-      this.getQuery();
-    },
-    async handleDeleteCoPack(){
-      let that =this;
-      for(let i = 0; i< this.ids.length;i++){
-        let res = await delEmisTmsPack(this.ids[i]);
-        if(!res || res.code != 200){
-          that.$modal.msgError(res && res.msg || '合包删除失败')
-          that.getList();
-          return;
-        }
-      }
-      this.$modal.msgSuccess('操作成功');
-      this.getList();
-    },
-    handleCancelCo(){
-      this.titleForm='';
-      this.openForm=false;
-      this.coData={};
-      this.blUnpack="1";
-      this.emisCoPackDetail=[];
-      this.getQuery();
-    },
-    handleWayBillSelectionChange(selection){
-      this.tempCoPackList = selection;
-      this.tempCoPackList.length > 0 ? this.addWayBillDisabled = false : this.addWayBillDisabled = true;
-    },
-    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 = {
-              packNo:this.coData.packNo,
-              billCode: item.billCode,
-              scanDate: item.scanDate,
-              scanStatus: item.scanStatus,
-              packStatus: null,
-              scanMan: item.scanMan,
-              createBy: this.$store.getters.empCode,
-              createTime: parseTime(new Date())
-            };
-            let response = await addEmisTmsPackDtl(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"){
-        // 更新主表
-        this.tempCoPackInfo.destCountry = this.coData.destCountry;
-        this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
-        this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-        this.tempCoPackInfo.blUnpack = this.blUnpack;
-        this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
-        this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
-        this.tempCoPackInfo.totalWeight = this.coData.totalWeight;
-        this.tempCoPackInfo.totalVolume = this.coData.totalVolume;
-        let res = await updateEmisTmsPack(this.tempCoPackInfo);
-        if(!res || res.code != 200){
-          this.$modal.msgError(res && res.msg || '未知错误')
-          return;
-        }
-        this.$modal.msgSuccess('追加成功')
-      }
-    },
-    handleCloseWayBill(){
-      this.titleWayBill="";
-      this.openWayBillForm=false;
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
-    },
-    async handleCoPackListDelete(){
-      // if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
-      if(!this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
-        this.$modal.msgError("请先选择必填项")
-        return;
-      }
-      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 delEmisTmsPackDtl(this.tempExistCoPackWayBillList[gti].id);
-                  if(!res || res.code != 200){
-                    this.$modal.msgError(res && res.msg || '未知错误')
-                    return;
-                  }
-                  idsArrTemp.push(this.tempExistCoPackWayBillList[gti].id)
-                }
-              }
-              let newList =[];
-              this.emisCoPackDetail.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++){
-                debugger
-                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.computeTotal();
-              // 更新主表
-              this.tempCoPackInfo.destCountry = this.coData.destCountry;
-              this.tempCoPackInfo.sendStiteCode = this.coData.sendStiteCode;
-              this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-              this.tempCoPackInfo.blUnpack = this.blUnpack;
-              this.tempCoPackInfo.totalWaybillQty = this.coData.totalWaybillQty;
-              this.tempCoPackInfo.totalParcelQty = this.coData.totalParcelQty;
-              this.tempCoPackInfo.totalWeight = this.coData.totalWeight;
-              this.tempCoPackInfo.totalVolume = this.coData.totalVolume;
-              let res = await updateEmisTmsPack(this.tempCoPackInfo);
-              if(!res || res.code != 200){
-                this.$modal.msgError(res && res.msg || '未知错误')
-                return;
-              }
-              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() {
-      this.queryParams.pageNum = 1;
-      // this.queryParams.pageSize = 20;
-      this.getList();
-    },
-    /** 重置按钮操作 */
-    resetQuery() {
-      this.resetForm("queryForm");
-      this.handleQuery();
-    },
-    // 多选框选中数据
-    handleSelectionChange(selection) {
-      this.ids = selection.map(item => item.id)
-      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;
-      let firstItem = this.emisCoPackDetail.length > 0 ? this.emisCoPackDetail[0] : null;
-      let blUnpack = true;
-      this.emisCoPackDetail.forEach(item =>{
-        totalParcelQty +=item.parcelQty;
-        totalWeight +=item.billWeight;
-        totalVolume +=item.totalVolume;
-        item.destCountry = this.coData.destCountry;
-        item.sendStiteCode = this.coData.sendStiteCode;
-        item.nextSiteCode = this.coData.nextSiteCode;
-        item.blUnpack = this.blUnpack;
-        if(firstItem.receiveCountry != item.receiveCountry){
-          blUnpack = false;
-        }
-      })
-      if(!blUnpack){
-        this.packDisabled = true;
-        this.blUnpack = "1";
-      }else{
-        this.packDisabled = false;
-      }
-      this.coData.totalWaybillQty=this.emisCoPackDetail.length;
-      this.coData.totalParcelQty=totalParcelQty;
-      this.coData.totalWeight=totalWeight;
-      this.coData.totalVolume=parseFloat(totalVolume.toFixed(5));
-    },
-    // 排序 查询字段是表格中字段名字 动态取值排序顺序
-    handleSortChange(column) {
-      this.queryParams.orderByColumn = column.prop;
-      this.queryParams.isAsc = column.order;
-      this.getList();
-    },
-    /** 新增按钮操作 */
-    async handleAdd() {
-      this.coPackType="add";
-      this.coData = {};
-      if(this.activeName=="first"){
-        // 将选中的“待合包”的运单 置为 追加的运单号
-        for(let p = 0; p < this.waitPackList.length;p++){
-          this.emisCoPackDetail.push(this.waitPackList[p]);
-        }
-      }
-      this.tempExistCoPackWayBillList = [];// 清空临时保存的已有运单号
-      this.tempCoPackInfo={};
-      this.coData.createTime = parseTime(new Date());
-      this.coData.destCountry = null;
-      this.coData.destCountryName = null;
-      // this.coData.sendStiteCode = null;
-      this.coData.nextSiteCode = null;
-      this.coData.nextStation = null;
-      this.blUnpack = "1";
-
-      this.coData.sendStiteCode = this.$store.getters.ownerSiteCode;
-      this.coData.sendSiteName=this.$store.getters.ownerSiteName;
-
-      this.computeTotal();
-
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增合包";
-    },
-    handleAddWayBill(){
-      // if(!this.coData.destCountry || !this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
-      if(!this.coData.sendStiteCode || !this.coData.nextSiteCode || !this.blUnpack){
-        this.$modal.msgError("请先选择必填项")
-        return;
-      }
-      this.openWayBillForm= true;
-      this.titleWayBill = "运单列表";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
-    },
-    /** 修改按钮操作 */
-    async handleUpdate() {
-      let id = this.ids[0]
-      this.coPackType="edit";
-      let response = await getEmisTmsPack(id);
-      if(!response || response.code != 200){
-        this.$message.error(response && response.msg || "未知错误");
-        return;
-      }
-      let resData = response.data;
-      this.coData.packNo = resData.packNo;
-      this.coData.createTime = resData.createTime;
-      this.coData.destCountry = resData.destCountry;
-      // this.coData.destCountryName = null;
-      this.coData.sendStiteCode = resData.sendStiteCode;
-      this.coData.sendSiteName = resData.sendSiteName;
-      this.coData.nextSiteCode = resData.nextSiteCode;
-      // this.coData.nextStation = null;
-      this.blUnpack = resData.blUnpack;
-
-      this.emisCoPackDetail=[];
-      let resList = await listEmisTmsPackDtl({packNo: resData.packNo});
-      if(!resList || resList.code != 200){
-        this.$message.error(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.coData.packStatus = this.tempCoPackInfo.packStatus;
-      this.coData.scanDate = this.tempCoPackInfo.scanDate;
-      this.computeTotal();
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "查看";
-    },
-    handleView(row) {
-       this.id=row.id;
-       this.titleView="查看";
-       this.openView=true;
-    //   this.router.push({ path: '/emis/emisTmsPack/viewDetail', query: { id: row.id }})
-    },
-    handleFormChanged(){
-        this.openForm = false;
-        this.getList();
-    },
-    cancelForm(){
-      this.openForm = false;
-    },
-    /** 删除按钮操作 */
-    CoPack(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisTmsPack(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    handleExport() {
-    //   this.download('emis/emisTmsPack/export', {
-    //     ...this.queryParams
-    //   }, `emisTmsPack_${new Date().getTime()}.xlsx`)
-     const loadingInstance = this.$loading({
-            text: '正在导出...'
-        })
-       var qParam = {...this.queryParams};
-       qParam.pageNum=1;
-       qParam.pageSize=5000;
-
-       listEmisTmsPack(this.addDateRange(qParam, this.dateTimeRange)).then(response => {
-        this.downloadLoading = false
-        if (response.code === 200) {
-                const curList = response.rows
-                import('@/vendor/Export2Excel').then(excel => {
-                  const tHeader = ['id','合包号','合包名称','合包时间','目的国家','目的国家名称','是否可拆','发出网点','下一网点','下一站','总件数','总运单数','总体积','总重量','合包状态','扩展数据','操作员','ext1','ext2','ext3','ext4','备注','租户ID','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','创建网点','更新网点',];
-                  const filterVal = ['id','packNo','packName','packDate','destCountry','destCountryName','blUnpack','sendStiteCode','nextSiteCode','nextStation','totalParcelQty','totalWaybillQty','totalVolume','totalWeight','packStatus','extData','opMan','ext1','ext2','ext3','ext4','remark','tenantId','delFlag','createBy','createTime','updateBy','updateTime','createSite','updateSite',];
-                  const data = this.formatJson(filterVal, curList, response.rows)
-                  excel.export_json_to_excel({
-                    header: tHeader,
-                    data,
-                    filename: 'TMS合包',
-                    autoWidth: true
-                  })
-                  loadingInstance.close()
-                })
-        }
-      });
-    },
-    formatJson(filterVal, jsonData, resData) {
-      let index = 0
-      return jsonData.map(v => filterVal.map(j => {
-        if (j === 'index') {
-          return ++index
-        }
-        if (j === 'status') {
-          var statusStr='xxx'
-          if(v[j] == 10){
-              statusStr='xxx'
-          }
-          return statusStr;
-        }
-        return v[j]
-      }))
-    },
-    /** 列索引函数  */
-    getIndex($index) {
-          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
-    },
-    /** 时间搜索响应函数 */
-    dateTimeChange(value){
-        this.dateTimeRange=value;
-    },
   }
 };
 </script>
 
-<style scoped>
-  .el-divider{
-    margin-top: 0px;
-    background: 0 0;
-    border-top: 1px solid #E6EBF5;
-  }
-  .el-divider__text {
-    color: #0955ee;
-    cursor: pointer;
-  }
-  .query-label {
-    .el-radio{
-        display: block;
-        line-height: 23px;
-        white-space: normal;
-        margin-right: 0;
-    }
-  }
-  .overflowhidden{
-    overflow: hidden;
-  }
-  .ellipsis {
-    width: 100px;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    vertical-align: top;
-    white-space: nowrap;
-  }
+<style>
+.el-descriptions-item__label {
+  width: 80px;
+}
+
+.el-descriptions-item__cell {
+    font-weight: 500!important;
+    color: black;
+}
+
+.tab-container {
+  width: 100%;
+}
+
+.el-tabs__nav{
+    display: flex !important;
+    flex-wrap: wrap !important;
+}
+
 </style>
+
+
+
+
+
diff --git a/src/views/emis/emisTmsSiteBatch/packListView.vue b/src/views/emis/emisTmsSiteBatch/packListView.vue
index ae793fce..83df17a6 100644
--- a/src/views/emis/emisTmsSiteBatch/packListView.vue
+++ b/src/views/emis/emisTmsSiteBatch/packListView.vue
@@ -9,7 +9,7 @@
             showSearch.sync="false"
             :queryParams="queryParams"
             :total="total"
-            :showRightButton="false"
+            :showRightButton="true"
             @queryTable="getList"
             @selection-change="handleSelectionChange"
             @expand-change="expandChange"
@@ -160,7 +160,7 @@ export default {
     propType: "",
     slotProps: {}
   },
-  dicts: [],
+  dicts: ['emis_pack_status'],
   data() {
     return {
       loading: false,
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index b2afd862..ba1cf368 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -133,9 +133,9 @@
             <dict-tag :options="dict.type.emis_qujian_fangshi" :value="scope.row.pickupMethod"/>
           </template>
        </el-table-column>
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true">
+      <el-table-column :label="$t('客户名称')" align="center" prop="custName" min-width="80" :show-overflow-tooltip="true">
         <template slot-scope="scope">
-             <span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.customerName}}</span>
+             <span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.custName}}</span>
              <span v-else></span>
           </template>
         </el-table-column>