diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
index 9a672c1b..e5c8f728 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchEditForm.vue
@@ -57,44 +57,9 @@
                   </el-select>
                 </el-form-item>
               </el-col>
-
-              <!-- <el-col :span="8" v-if="coData.transType == 2">
-                <el-form-item :label="$t('航空单号')" prop="airBilllNo">
-                  <el-input v-model="coData.airBilllNo" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" v-if="coData.transType == 2">
-                <el-form-item label="起飞时间" prop="airTime">
-                  <el-date-picker clearable
-                    v-model="coData.airTime"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="请选择起飞时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" v-if="coData.transType == 4">
-                <el-form-item :label="$t('船次号')" prop="shipNo">
-                  <el-input v-model="coData.shipNo" />
-                </el-form-item>
-              </el-col>
-              <el-col :span="8" v-if="coData.transType == 4">
-                <el-form-item label="开船时间" prop="shipTime">
-                  <el-date-picker clearable
-                    v-model="coData.shipTime"
-                    type="date"
-                    value-format="yyyy-MM-dd"
-                    placeholder="请选择开船时间">
-                  </el-date-picker>
-                </el-form-item>
-              </el-col> -->
-
-              <!-- v-if="['1','3','5'].indexOf(coData.transType) > -1" -->
-              <!-- v-if="['1','3','5'].indexOf(coData.transType) > -1" -->
-
               <el-col :span="8" >
                 <el-form-item :label="$t('运输号')" prop="carNo">
-                  <el-input v-model="coData.carNo" clearable="" placeholder="车牌号/航班号/船次号"></el-input>
+                  <el-input v-model="coData.carNo" clearable="" placeholder="车牌号/航班号/船次号/提单号"></el-input>
                 </el-form-item>
               </el-col>
               <el-col :span="8"  >
@@ -302,182 +267,6 @@
         <el-button @click="handleCancelCo">取 消</el-button>
     </div>
 
-    <el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
-        <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>
-          </el-col>
-         </el-row>
-        </el-form>
-        <div slot="footer" class="dialog-footer" style="text-align:center">
-          <el-button type="primary" @click="submitFormBatch">确定</el-button>
-          <el-button @click="cancelBatch">取 消</el-button>
-        </div>
-    </el-dialog>
-
-    <el-dialog :title="titleWayBill" :visible.sync="openWayBillForm" width="90%" @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="warehouseInNo" 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="xxx" min-width="100" /> -->
-        <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 || "") }}</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>
   </div>
 </template>
 
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
index 0c4848af..bacff7aa 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchListPanel.vue
@@ -4,56 +4,58 @@
     <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-row  :gutter="0" style="display: flex;flex-wrap: wrap;">
         <el-col :span="8">
-          <el-form-item label="" prop="billCode">
+          <el-form-item label="" prop="queryOrderType">
             <div slot="label">
-              <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
-                <el-radio label="0">批次号</el-radio>
+              <el-radio-group class="query-label" v-model="queryOrderType">
                 <el-radio label="1">运单号</el-radio>
+                <el-radio label="0">批次号</el-radio>
               </el-radio-group>
             </div>
             <XdTextareaInput
-              v-model="queryParams.billCode"
+              v-model="queryParams.queryKey"
               :placeholder="$t('多个流水号逗号或换行隔开')"
               clearable
               :rows="2"
             />
           </el-form-item>
+          <el-form-item label="创建时间" prop="dateTimeRange">
+            <elDateAdvPicker clearable v-model="dateTimeRange" style="width:260px" ></elDateAdvPicker>
+          </el-form-item>
         </el-col>
 
-        <el-col :span="8">
-          <el-form-item label="目的国" prop="receiveCountry">
-              <CountryPicker :placeholder="$t('目的国')" v-model="queryParams.receiveCountry" ></CountryPicker>
+        <el-col :span="16">
+          <el-form-item label="批次名称" prop="batchName">
+            <el-input
+              v-model="queryParams.batchName"
+              :placeholder="$t('批次名称')"
+              clearable
+            />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="寄件国" prop="sendCountry">
-              <CountryPicker :placeholder="$t('寄件国')" v-model="queryParams.sendCountry" ></CountryPicker>
+          <el-form-item label="运输方式" prop="transType">
+            <el-select v-model="queryParams.transType" placeholder="运输方式" clearable filterable >
+                    <el-option
+                      v-for="dict in dict.type.emis_biz_shipping_method"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+                  </el-select>
           </el-form-item>
-        </el-col>
-        <!-- <el-col :span="8"> 经确认：这张表不用付款方式，列表中去除
-          <el-form-item label="付款方式" prop="paymentType" >
-            <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
-              <el-option
-                v-for="dict in dict.type.emis_payment_type"
-                :key="dict.value"
-                :label="dict.label"
-                :value="dict.value"
-              ></el-option>
-            </el-select>
+          <el-form-item label="起始网点" prop="startSiteCode">
+            <EmisSiteSimplePicker :placeholder="$t('请选择')"  v-model="queryParams.startSiteCode" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker>
           </el-form-item>
-        </el-col> -->
-        <el-col :span="12">
-          <!-- <el-form-item label="签收时间" prop="dateTimeRange">
-            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
-          </el-form-item> -->
-          <el-form-item label="" prop="dateTimeRange">
-            <div slot="label">
-              <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
-                <el-radio label="1">创建时间</el-radio>
-                <!-- <el-radio label="0">录单时间</el-radio> -->
-              </el-radio-group>
-            </div>
-            <elDateAdvPicker clearable v-model="dateTimeRange" style="width:260px" ></elDateAdvPicker>
+          <el-form-item label="下一网点" prop="nextSiteCode">
+            <EmisSiteSimplePicker :placeholder="$t('请选择')"    v-model="queryParams.nextSiteCode"  ></EmisSiteSimplePicker>
+          </el-form-item>
+          <el-form-item label="运输号" prop="carNo">
+            <el-input
+              v-model="queryParams.carNo"
+              :placeholder="$t('运输号')"
+              clearable
+            />
+          </el-form-item>
+          <el-form-item label="目的国" prop="destCountry">
+              <CountryPicker :placeholder="$t('目的国')" v-model="queryParams.destCountry" ></CountryPicker>
           </el-form-item>
         </el-col>
       </el-row>
@@ -282,6 +284,7 @@ export default {
       currentId:null,
       openForm: false,
       titleForm: "",
+      queryOrderType:'1',
 
       titleWayBill:null,
       openWayBillForm:false,
@@ -308,15 +311,19 @@ export default {
       queryParams: {
         pageNum: 1,
         pageSize: 20,
-        billCode:null,
-        orderSN:null,
-        batchNo:null,
+
+        queryKey:null,
+
+        batchNo: null,
+        batchName: null,
+        transType: null,
+        startSiteCode: null,
+        nextSiteCode: null,
+        carNo: null,
         destCountry: null,
-        destCountryName: null,
         params:{
-          queryOrderType: '0',
-          queryOrderDateType: '1',
-          blHLK:'1',
+          queryOrderType: '1',
+          billCode: null
         },
       },
       queryCoParams: {
@@ -356,6 +363,13 @@ export default {
     /** 查询TMS组批次列表 */
     getList() {
       this.loading = true;
+      if(this.queryOrderType=='1'){
+        this.queryParams.params.billCode=this.queryParams.queryKey;
+        this.queryParams.batchNo=null;
+      }else{
+        this.queryParams.batchNo=this.queryParams.queryKey;
+        this.queryParams.params.billCode=null;
+      }
       this.queryParams=this.addDateRange(this.queryParams, this.dateTimeRange,"createTime");
       listEmisTmsSiteBatch(this.queryParams).then(response => {
         this.emisTmsBatchList = response.rows;