diff --git a/src/api/emis/emisCommissionProfit.js b/src/api/emis/emisCommissionProfit.js
index 7df12d05..4b1e55ce 100644
--- a/src/api/emis/emisCommissionProfit.js
+++ b/src/api/emis/emisCommissionProfit.js
@@ -42,3 +42,13 @@ export function delEmisCommissionProfit(id) {
     method: 'delete'
   })
 }
+
+
+// 批量计算员工提成
+export function batchReCalcProfitByBillCode(billCode) {
+  return request({
+    url: '/emis/emisCommissionProfit/batchReCalcProfitByBillCode',
+    method: 'get',
+    params: {billCode: billCode},
+  })
+}
diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
index 99b35ae9..ab0e1374 100644
--- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
@@ -7,6 +7,7 @@
           ref="popoverRef"
           :popper-options="{ boundariesElement: '.el-form', removeOnDestroy: true }"
           @show="queryData"
+          :disabled="disabled"
         >
         <div >
             <el-table
@@ -38,10 +39,13 @@
        ref="inputValue"
        :value="slable"
        :placeholder="placeholder"
+       :disabled="disabled"
+
        @input="onInput"
        @click.native="onClick"
        @blur="onBlur"
        @clear="onClear"
+
        clearable
         >
             <template slot="suffix">
diff --git a/src/views/emis/emisCommissionDtl/emisCommissionDtlForm.vue b/src/views/emis/emisCommissionDtl/emisCommissionDtlForm.vue
index 727ba57b..f8dabb90 100644
--- a/src/views/emis/emisCommissionDtl/emisCommissionDtlForm.vue
+++ b/src/views/emis/emisCommissionDtl/emisCommissionDtlForm.vue
@@ -3,8 +3,8 @@
        <el-form ref="form" :model="form" :rules="rules" label-width="80px">
          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
           <el-col :span="24">
-            <el-form-item label="提成费用类型" prop="feeType">
-              <el-select v-model="form.feeType" placeholder="提成费用类型" style="width:100%">
+            <el-form-item label="提成类型" prop="feeType">
+              <el-select v-model="form.feeType" placeholder="提成费用类型" style="width:100%"  :disabled="form.id!=null">
                   <el-option
                     v-for="dict in dict.type.emis_commission_fee_type"
                     :key="dict.value"
@@ -14,101 +14,41 @@
               </el-select>
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="提成员工" prop="empCode" >
+              <EmisUserSimplePicker0  :placeholder="$t('提成员工')"  v-model="form.empCode" @onChange="onSelectUser"  :disabled="form.id!=null"></EmisUserSimplePicker0>
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :span="12">
+            <el-form-item label="员工名称" prop="empName">
+              <el-input v-model="form.empName" placeholder="" />
+            </el-form-item>
+          </el-col> -->
+
           <el-col :span="6">
             <el-form-item label="提成金额" prop="money">
-              <el-input v-model="form.money" placeholder="请输入提成金额" />
+              <el-input v-model="form.money" placeholder="" />
             </el-form-item>
           </el-col>
-          <el-col :span="6">
-            <el-form-item label="月份" prop="billMonth">
-              <el-input v-model="form.billMonth" placeholder="请输入月份" />
-            </el-form-item>
+          <el-col :span="18">
+
           </el-col>
-          <el-col :span="6">
+          <el-col :span="12">
             <el-form-item label="运单号" prop="billCode">
-              <el-input v-model="form.billCode" placeholder="请输入运单号" />
+              <el-input v-model="form.billCode" placeholder="" />
             </el-form-item>
           </el-col>
+          <el-col :span="12">
+            <el-form-item label="月份" prop="billMonth">
+              <el-date-picker  size="mini" style="width:100%" v-model="form.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="24">
-            <el-form-item label="提成备注" prop="feeRemark">
-              <el-input v-model="form.feeRemark" placeholder="请输入费用备注" />
+            <el-form-item label="备注" prop="feeRemark">
+              <el-input v-model="form.feeRemark" type="textarea" placeholder="" />
             </el-form-item>
           </el-col>
-          <el-col :span="24">
-            <el-form-item label="员工编号" prop="empCode">
-              <el-input v-model="form.empCode" placeholder="请输入员工编号" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="员工名称" prop="empName">
-              <el-input v-model="form.empName" placeholder="请输入员工名称" />
-            </el-form-item>
-          </el-col>
-          <!-- <el-col :span="24">
-            <el-form-item label="财务确认状态" prop="blConfirmCenter">
-              <el-input v-model="form.blConfirmCenter" placeholder="请输入财务确认状态" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="财务确认日期" prop="confirmCenterDate">
-              <el-date-picker clearable
-                v-model="form.confirmCenterDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择财务确认日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="财务确认备注" prop="confirmCenterNote">
-              <el-input v-model="form.confirmCenterNote" placeholder="请输入财务确认备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="财务确认人" prop="confirmCenterManCode">
-              <el-input v-model="form.confirmCenterManCode" placeholder="请输入财务确认人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="财务确认站点" prop="confirmCenterCode">
-              <el-input v-model="form.confirmCenterCode" placeholder="请输入财务确认站点" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="站点确认状态" prop="blConfirmSite">
-              <el-input v-model="form.blConfirmSite" placeholder="请输入站点确认状态" />
-            </el-form-item>
-          </el-col>
-        <el-col :span="24">
-            <el-form-item label="站点确认日期" prop="confirmSiteDate">
-              <el-date-picker clearable
-                v-model="form.confirmSiteDate"
-                type="date"
-                value-format="yyyy-MM-dd"
-                placeholder="请选择站点确认日期">
-              </el-date-picker>
-            </el-form-item>
-        </el-col>
-          <el-col :span="24">
-            <el-form-item label="站点确认人" prop="confirmSiteManCode">
-              <el-input v-model="form.confirmSiteManCode" placeholder="请输入站点确认人" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="网点确认备注" prop="confirmSiteNote">
-              <el-input v-model="form.confirmSiteNote" placeholder="请输入网点确认备注" />
-            </el-form-item>
-          </el-col>
-          <el-col :span="24">
-            <el-form-item label="确认网点代码" prop="confirmSiteCode">
-              <el-input v-model="form.confirmSiteCode" placeholder="请输入确认网点代码" />
-            </el-form-item>
-          </el-col> -->
-          <!-- <el-col :span="24">
-            <el-form-item label="备注" prop="remark">
-              <el-input v-model="form.remark" placeholder="请输入备注" />
-            </el-form-item>
-          </el-col> -->
         </el-row>
       </el-form>
       <div style="text-align: center;margin-bottom: 10px;">
@@ -121,6 +61,7 @@
 
 <script>
 import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 export default {
   name: "emisCommissionDtlForm",
@@ -129,7 +70,7 @@ export default {
         type:Number
     }
   },
-  components: {  },
+  components: { EmisUserSimplePicker0  },
   dicts: ['emis_commission_fee_type'],
   data() {
     return {
@@ -140,12 +81,13 @@ export default {
       form: {},
       // 表单校验
       rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
+        feeType: [
+          { required: true, message: "提成类型不能为空", trigger: ["blur",'change'] }
         ],
-        delFlag: [
-          { required: true, message: "删除标志（0代表存在不能为空", trigger: "blur" }
+        feeType: [
+          { required: true, message: "提成类型不能为空", trigger: ["blur",'change'] }
         ],
+
       }
     };
   },
@@ -174,13 +116,16 @@ export default {
         }else{
             this.reset();
         }
-        // this.getTreeselect();
     },
     // 取消按钮
     cancel() {
       this.reset();
       this.$emit("on-cancel");
     },
+    onSelectUser(item){
+        this.form.empCode=item.empCode;
+        this.form.empName=item.empName;
+    },
     // 表单重置
     reset() {
       this.form = {
diff --git a/src/views/emis/emisCommissionDtl/index.vue b/src/views/emis/emisCommissionDtl/index.vue
index 15c3a6bb..39b6c956 100644
--- a/src/views/emis/emisCommissionDtl/index.vue
+++ b/src/views/emis/emisCommissionDtl/index.vue
@@ -1,8 +1,16 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-      <el-form-item label="提成费用类型" prop="feeType" label-width="120px">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <el-form-item label="运单号" prop="billCode">
+        <el-input
+          type="textarea"
+          rows="2"
+          v-model="queryParams.billCode"
+          :placeholder="$t('运单号')"
+          clearable
+        />
+      </el-form-item>
+      <el-form-item label="提成类型" prop="feeType">
         <el-select v-model="queryParams.feeType" placeholder="提成费用类型" clearable filterable >
                   <el-option
                     v-for="item in dict.type.emis_commission_fee_type"
@@ -16,27 +24,17 @@
       <el-form-item label="账单月份" prop="billMonth">
               <el-date-picker  size="mini" style="width:100%" v-model="queryParams.billMonth" type="month" placeholder="账单月份" value-format="yyyy-MM"></el-date-picker>
       </el-form-item>
-      <el-form-item label="" prop="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-        />
-      </el-form-item>
 
-      <el-form-item label="" prop="empCode">
+
+      <!-- <el-form-item label="" prop="empCode">
         <el-input
           v-model="queryParams.empCode"
           :placeholder="$t('员工编号')"
           clearable
         />
-      </el-form-item>
-      <el-form-item label="" prop="empName">
-        <el-input
-          v-model="queryParams.empName"
-          :placeholder="$t('员工名称')"
-          clearable
-        />
+      </el-form-item> -->
+      <el-form-item label="员工名称" prop="empName">
+        <EmisUserSimplePicker0  :placeholder="$t('提成员工')"  v-model="queryParams.empCodeTmp" @onChange="onSelectUser" ></EmisUserSimplePicker0>
       </el-form-item>
 
     </SearchForm>
@@ -44,9 +42,12 @@
 
     <XdTable v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisCommissionDtlList"
            :showSearch.sync="showSearch"
+
+            storageName="emisCommissionDtl_main_240702"
+
            :queryParams="queryParams"
            :total="total"
            @queryTable="getList"
@@ -64,8 +65,9 @@
                   size="mini"
                   @click="handleAdd"
                   v-hasPermi="['emis:emisCommissionDtl:add']"
-                >新增特殊提成</el-button>
+                >新增提成</el-button>
               </el-col>
+
               <el-col :span="1.5">
                 <el-button
                   type="success"
@@ -75,9 +77,10 @@
                   :disabled="single"
                   @click="handleUpdate"
                   v-hasPermi="['emis:emisCommissionDtl:edit']"
-                >修改</el-button>
+                >修改提成</el-button>
               </el-col>
-              <!-- <el-col :span="1.5">
+
+              <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -87,7 +90,18 @@
                   @click="handleDelete"
                   v-hasPermi="['emis:emisCommissionDtl:remove']"
                 >删除</el-button>
-              </el-col> -->
+              </el-col>
+
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleBatchReCalc"
+                  v-hasPermi="['emis:emisCommissionDtl:add']"
+                >批量重算</el-button>
+              </el-col>
+
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
@@ -102,46 +116,16 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
+      <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="120" >
         <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
+          <span>{{ scope.row.empName }}</span>
+        </template>
       </el-table-column>
+      <!-- <span>{{ scope.row.empName }}</span><span v-if="scope.row.empCode!=-1">({{ scope.row.empCode  }})</span> -->
+      <!-- <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" /> -->
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-      <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" />
-      <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
       <el-table-column :label="$t('月份')" align="center" prop="billMonth" min-width="100" />
-      <el-table-column :label="$t('提成费用类型')" align="center" prop="feeType" min-width="150" >
+      <el-table-column :label="$t('提成类型')" align="center" prop="feeType" min-width="120" >
         <template slot-scope="scope">
           <dict-tag :options="dict.type.emis_commission_fee_type" :value="scope.row.feeType"/>
         </template>
@@ -169,25 +153,36 @@
       <emisCommissionDtlForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisCommissionDtlForm>
     </el-dialog>
 
-
-    <!--
-    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false" v-dialogDrag append-to-body>
-        <emisCommissionDtlView :id="id" ></EmisCommissionDtlView>
+    <el-dialog :title="titleBatch" :visible.sync="openBatch" width="50%" v-dialogDrag :close-on-click-modal="false" append-to-body>
+        <el-form ref="formBatch" :model="formBatch" size="mini" label-width="60px">
+         <el-row>
+          <el-col :span="24">
+            <el-form-item :label="$t('运单号')" prop="billCode">
+              <el-input v-model="formBatch.billCode" 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>
-    -->
 
   </div>
 </template>
 
 <script>
+import { batchReCalcProfitByBillCode  } from "@/api/emis/emisCommissionProfit";
+
 import { listEmisCommissionDtl, getEmisCommissionDtl, delEmisCommissionDtl, addEmisCommissionDtl, updateEmisCommissionDtl } from "@/api/emis/emisCommissionDtl";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-// import emisCommissionDtlView from '@/views/emis/emisCommissionDtl/emisCommissionDtlView';
 import emisCommissionDtlForm from '@/views/emis/emisCommissionDtl/emisCommissionDtlForm';
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 export default {
   name: "emisCommissionDtl",
-  components: { elDateSimplePicker,emisCommissionDtlForm },
+  components: { elDateSimplePicker,emisCommissionDtlForm,EmisUserSimplePicker0 },
   dicts: ['emis_commission_fee_type'],
   data() {
     return {
@@ -212,6 +207,10 @@ export default {
       openForm: false,
       titleForm: "",
 
+      titleBatch:"",
+      openBatch: false,
+
+
       // 弹出展示层
       id:null,
       titleView:"",
@@ -234,6 +233,7 @@ export default {
         billCode: null,
         feeRemark: null,
         empCode: null,
+        empCodeTmp: null,
         empName: null,
         blConfirmCenter: null,
         confirmCenterDate: null,
@@ -248,6 +248,9 @@ export default {
         remark: null,
         delFlag: null,
       },
+      formBatch:{
+        billCode:null,
+      }
     };
   },
   created() {
@@ -257,30 +260,16 @@ export default {
     /** 查询员工提成明细表列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeConfirmCenterDate && '' != this.daterangeConfirmCenterDate) {
-        this.queryParams.params["beginConfirmCenterDate"] = this.daterangeConfirmCenterDate[0];
-        this.queryParams.params["endConfirmCenterDate"] = this.daterangeConfirmCenterDate[1];
-      }
-      if (null != this.daterangeConfirmSiteDate && '' != this.daterangeConfirmSiteDate) {
-        this.queryParams.params["beginConfirmSiteDate"] = this.daterangeConfirmSiteDate[0];
-        this.queryParams.params["endConfirmSiteDate"] = this.daterangeConfirmSiteDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
       listEmisCommissionDtl(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisCommissionDtlList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-
+    onSelectUser(item){
+        this.queryParams.empCode=null;
+        this.queryParams.empName=item.empName;
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -312,9 +301,30 @@ export default {
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
+    handleBatchReCalc(){
+      this.formBatch.billCode=null;
+      this.titleBatch="批量重算";
+      this.openBatch=true;
+    },
+    cancelBatch(){
+      this.openBatch=false;
+    },
+    async submitFormBatch(){
+      if(this.formBatch.billCode==null || this.formBatch.billCode==''){
+        this.$modal.msgError("输入单号后回车");
+        return;
+      }
+
+      this.loading = true;
+      let res=await batchReCalcProfitByBillCode(this.formBatch.billCode);
+      this.loading = false;
+      this.openBatch=false;
+      this.getList();
+
+    },
     /** 修改按钮操作 */
     handleUpdate(row) {
-       this.currentId= row.id;
+       this.currentId= row.id||this.ids;
        this.openForm = true;
        this.titleForm = "修改";
     },
diff --git a/src/views/emis/emisCommissionProfit/index.vue b/src/views/emis/emisCommissionProfit/index.vue
index de37291c..86818f53 100644
--- a/src/views/emis/emisCommissionProfit/index.vue
+++ b/src/views/emis/emisCommissionProfit/index.vue
@@ -1,16 +1,6 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-
-
-      <!-- <el-form-item label="" prop="settleType">
-        <el-input
-          v-model="queryParams.settleType"
-          :placeholder="$t('提成类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item> -->
+    <SearchForm  :model="queryParams" ref="queryForm"  size="mini" :maxShow="30"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="" prop="billMonth">
         <el-input
           v-model="queryParams.billMonth"
@@ -19,15 +9,6 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-      <el-form-item label="" prop="empCode">
-        <el-input
-          v-model="queryParams.empCode"
-          :placeholder="$t('员工编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
       <el-form-item label="" prop="empName">
         <el-input
           v-model="queryParams.empName"
@@ -36,14 +17,12 @@
           @keyup.enter.native="handleQuery"
         />
       </el-form-item>
-
-
     </SearchForm>
 
 
     <XdTable v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisCommissionProfitList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -102,52 +81,15 @@
       </div>
 
       <el-table-column type="selection" width="55" align="center" />
-      <!--
-      <el-table-column label="序号" align="center" min-width="60">
-             <template slot-scope="scope">
-                <span v-text="getIndex(scope.$index)"> </span>
-             </template>
-      </el-table-column>
-
-       <el-table-column label="xxx" align="left" prop="xxx" min-width="180">
-        <template slot-scope="scope">
-            <div  class="link-type" @click="handleView(scope.row)">{{scope.row.orderSn}}</div>
-         </template>
-      </el-table-column>
-
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
-      -->
-
       <!-- <el-table-column :label="$t('提成编号')" align="center" prop="profitNo" min-width="100" /> -->
       <!-- <el-table-column :label="$t('提成名称')" align="center" prop="profitName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('提成类型')" align="center" prop="settleType" min-width="100" /> -->
       <el-table-column :label="$t('月份')" align="center" prop="billMonth" min-width="100" />
+      <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
       <!-- <el-table-column :label="$t('结算开始时间')" align="center" prop="startDate" min-width="100" /> -->
       <!-- <el-table-column :label="$t('结算结束时间')" align="center" prop="endDate" min-width="100" /> -->
       <el-table-column :label="$t('提成金额')" align="center" prop="money" min-width="100" />
       <el-table-column :label="$t('员工编号')" align="center" prop="empCode" min-width="100" />
-      <el-table-column :label="$t('员工名称')" align="center" prop="empName" min-width="100" />
       <!-- <el-table-column :label="$t('是否已提')" align="center" prop="blHasProfit" min-width="100" /> -->
       <!-- <el-table-column :label="$t('审核状态')" align="center" prop="blAudit" min-width="100" />
       <el-table-column :label="$t('财务确认日期')" align="center" prop="auditDate" min-width="100" />
@@ -283,35 +225,6 @@ export default {
     /** 查询员工提成表列表 */
     getList() {
       this.loading = true;
-      this.queryParams.params = {};
-      if (null != this.daterangeStartDate && '' != this.daterangeStartDate) {
-        this.queryParams.params["beginStartDate"] = this.daterangeStartDate[0];
-        this.queryParams.params["endStartDate"] = this.daterangeStartDate[1];
-      }
-      if (null != this.daterangeEndDate && '' != this.daterangeEndDate) {
-        this.queryParams.params["beginEndDate"] = this.daterangeEndDate[0];
-        this.queryParams.params["endEndDate"] = this.daterangeEndDate[1];
-      }
-      if (null != this.daterangeAuditDate && '' != this.daterangeAuditDate) {
-        this.queryParams.params["beginAuditDate"] = this.daterangeAuditDate[0];
-        this.queryParams.params["endAuditDate"] = this.daterangeAuditDate[1];
-      }
-      if (null != this.daterangeConfirmCenterDate && '' != this.daterangeConfirmCenterDate) {
-        this.queryParams.params["beginConfirmCenterDate"] = this.daterangeConfirmCenterDate[0];
-        this.queryParams.params["endConfirmCenterDate"] = this.daterangeConfirmCenterDate[1];
-      }
-      if (null != this.daterangeConfirmSiteDate && '' != this.daterangeConfirmSiteDate) {
-        this.queryParams.params["beginConfirmSiteDate"] = this.daterangeConfirmSiteDate[0];
-        this.queryParams.params["endConfirmSiteDate"] = this.daterangeConfirmSiteDate[1];
-      }
-      if (null != this.daterangeCreateTime && '' != this.daterangeCreateTime) {
-        this.queryParams.params["beginCreateTime"] = this.daterangeCreateTime[0];
-        this.queryParams.params["endCreateTime"] = this.daterangeCreateTime[1];
-      }
-      if (null != this.daterangeUpdateTime && '' != this.daterangeUpdateTime) {
-        this.queryParams.params["beginUpdateTime"] = this.daterangeUpdateTime[0];
-        this.queryParams.params["endUpdateTime"] = this.daterangeUpdateTime[1];
-      }
       listEmisCommissionProfit(this.addDateRange(this.queryParams, this.dateTimeRange)).then(response => {
         this.emisCommissionProfitList = response.rows;
         this.total = response.total;
diff --git a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
index d05c6c41..8ff53608 100644
--- a/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
+++ b/src/views/emis/emisTmsSiteBatch/BigBatchGroupMgnt.vue
@@ -4,11 +4,15 @@
     <div class="tab-container">
         <el-tabs v-model="activeTab" class="center-tabs" @tab-click="handleTabsClick"  @tab-remove="removeTab">
           <el-tab-pane label="海陆空批次列表" name="billList" >
-            <BigBatchPanel @onSelect="onSelectBill"> </BigBatchPanel>
+            <BigBatchPanel @onCreate="onCreateBatch"> </BigBatchPanel>
+          </el-tab-pane>
+          <el-tab-pane label="批次编辑"  name="batchEdit" v-if="openCreateNew"  >
+            <BigBatchEditForm   @on-changed="handleFormChanged" @on-cancel="cancelForm"></BigBatchEditForm>
           </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>
   </div>
@@ -31,6 +35,7 @@ export default {
     return {
       activeTab:'billList',
       billTabs:[],
+      openCreateNew:false,
     };
   },
   created() {
@@ -38,6 +43,11 @@ export default {
   methods: {
     handleTabsClick(){
 
+    },
+    onCreateBatch(){
+      this.openCreateNew=true;
+      this.activeTab='batchEdit';
+
     },
     onSelectBill(item) {
       let old=this.billTabs.find(mItem=>mItem.settleBillNo==item.settleBillNo);
@@ -48,16 +58,25 @@ export default {
         this.activeTab=item.settleBillNo;
       }
    },
+   handleFormChanged(){
+    this.openCreateNew=false;
+    this.activeTab="billList";
+   },
+   cancelForm(){
+    this.openCreateNew=false;
+    this.activeTab="billList";
+   },
    removeTab(targetName) {
 
-        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.activeTab="billList";
-        }
+
+        // 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.activeTab="billList";
+        // }
 
     },
 
diff --git a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
index cd364f2c..183ddd06 100644
--- a/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
+++ b/src/views/emis/emisTmsSiteBatch/panel/BigBatchPanel.vue
@@ -1,5 +1,5 @@
 <template>
-  <XdPageContainer class="app-container">
+  <XdPageContainer>
     <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">
@@ -52,31 +52,36 @@
                 <!-- <el-radio label="0">录单时间</el-radio> -->
               </el-radio-group>
             </div>
-            <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" style="width:260px" ></elDateAdvPicker>
+            <elDateAdvPicker clearable v-model="dateTimeRange" style="width:260px" ></elDateAdvPicker>
           </el-form-item>
         </el-col>
       </el-row>
-    <!-- </SearchForm> -->
     </el-form>
 
+
       <XdTable
-            v-loading="loading"
-          slot="pageContent"
-          slot-scope="slotProps"
-          :style="'height:'+(slotProps.contentHeight)+'px'"
 
+        v-loading="loading"
 
-            border
-            size="small"
-            :data="emisTmsPackList"
-            :showSearch.sync="showSearch"
-            :queryParams="queryParams"
-            :total="total"
-            :showRightButton="false"
-            @queryTable="handleQuery"
-            @selection-change="handleSelectionChange"
-            @sort-change="handleSortChange"
-          >
+        slot="pageContent"
+        slot-scope="slotProps"
+        :height="(slotProps.contentHeight)+'px'"
+
+        ref="refTable"
+
+        storageName="BigBatchPanel_main_240702"
+
+        border
+        size="mini"
+        :data="emisTmsBatchList"
+        :showSearch.sync="showSearch"
+        :queryParams="queryParams"
+        :total="total"
+        @queryTable="getList"
+        @selection-change="handleSelectionChange"
+        @sort-change="handleSortChange"
+
+        >
 
           <div slot="toolbar">
               <el-button style="margin-right: 5px;"
@@ -84,7 +89,7 @@
                 plain
                 size="mini"
                 v-hasPermi="['emis:emisTmsSiteBatch:query']"
-                @click="getQuery"
+                @click="getList"
               >查询</el-button>
               <el-button style="margin-right: 5px;"
                 type="primary"
@@ -93,15 +98,7 @@
                 size="mini"
                 @click="handleAdd"
                 v-hasPermi="['emis:emisTmsSiteBatch:add']"
-              >去组批次</el-button>
-              <!-- <el-button style="margin-right: 5px;"
-                type="primary"
-                plain
-                icon="el-icon-plus"
-                size="mini"
-                @click="handleAdd"
-                v-hasPermi="['emis:emisTmsSiteBatch:add']"
-              >新增组批次</el-button> -->
+              >新组批次</el-button>
               <el-button style="margin-right: 5px;"
                 type="danger"
                 plain
@@ -116,7 +113,7 @@
                 icon="el-icon-delete"
                 size="mini"
                 :disabled="multiple"
-                @click="handleDeleteCoPack"
+                @click="handleDelete"
                 v-hasPermi="['emis:emisTmsSiteBatch:remove']"
               >删除</el-button>
               <el-button style="margin-right: 5px;"
@@ -124,7 +121,7 @@
                 plain
                 icon="el-icon-download"
                 size="mini"
-                @click="handleAdd"
+                @click="handleDown"
                 v-hasPermi="['emis:emisTmsSiteBatch:export']"
               >下载批次文件</el-button>
             </div>
@@ -133,7 +130,7 @@
 
             <el-table-column :label="$t('批次号')" align="center" prop="batchNo" min-width="170" />
             <el-table-column :label="$t('批次名称')" align="center" prop="batchName" min-width="170" />
-            <el-table-column :label="$t('报关资料状态')" align="center" prop="declareResStatus" min-width="170">
+            <!-- <el-table-column :label="$t('报关资料状态')" align="center" prop="declareResStatus" min-width="170">
               <template slot-scope="scope">
                 <el-tag v-if="scope.row.declareResStatus==1" type="success">{{ $t('已上传') }}</el-tag>
                 <el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag>
@@ -144,7 +141,7 @@
                 <el-tag v-if="scope.row.declareResStatus==1" type="success">{{ $t('已上传') }}</el-tag>
                 <el-tag v-else-if="scope.row.declareResStatus==0" type="warning">{{ $t('未上传') }}</el-tag>
               </template>
-            </el-table-column>
+            </el-table-column> -->
             <!-- <el-table-column :label="$t('运输方式')" align="center" prop="airBilllNo" min-width="170" /> -->
             <el-table-column :label="$t('运输方式')" align="center" prop="transType" min-width="150">
               <template slot-scope="scope">
@@ -197,493 +194,9 @@
                 >查看</el-button>
               </template>
             </el-table-column> -->
-          </XdTable>
-
-    <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" >
-        <el-row :gutter="20">
-          <el-col :span="16">
-            <el-col :span="12">
-              <el-form-item :label="$t('批次号')" prop="batchNo">
-                <el-input v-model="coData.batchNo" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-              <el-form-item :label="$t('批次名称')" prop="batchName">
-                <span slot="label">
-                  <span style="color: red">{{ $t('批次名称') }}</span>
-                </span>
-                <el-input v-model="coData.batchName" clearable="" placeholder="" key="test"></el-input>
-                <!-- <el-input v-model="coData.batchName" placeholder=""></el-input> -->
-              </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="startSiteCode">
-                <span slot="label">
-                  <span style="color: red">{{ $t('起始网点') }}</span>
-                </span>
-                <EmisSiteSimplePicker :placeholder="$t('请选择')" @change="onSiteSelect"  v-model="coData.startSiteCode" :disabled="$store.getters.ownerSiteCode != '88888'" ></EmisSiteSimplePicker>
-              </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('请选择')"  @change="onNextSiteSelect"  v-model="coData.nextSiteCode"  ></EmisSiteSimplePicker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8">
-              <el-form-item label="运输方式" prop="transType">
-                <span slot="label">
-                  <span style="color: red">{{ $t('运输方式') }}</span>
-                </span>
-                <el-select v-model="coData.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" v-if="coData.transType == 2">
-              <el-form-item :label="$t('航空单号')" prop="airBilllNo">
-                <span slot="label">
-                  <span style="color: red">{{ $t('航空单号') }}</span>
-                </span>
-                <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">
-                <span slot="label">
-                  <span style="color: red">{{ $t('起飞时间') }}</span>
-                </span>
-                <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">
-                <span slot="label">
-                  <span style="color: red">{{ $t('船次号') }}</span>
-                </span>
-                <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">
-                <span slot="label">
-                  <span style="color: red">{{ $t('开船时间') }}</span>
-                </span>
-                <el-date-picker clearable
-                  v-model="coData.shipTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="请选择开船时间">
-                </el-date-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8" v-if="['1','3','5'].indexOf(coData.transType) > -1">
-              <el-form-item :label="$t('车牌号')" prop="carNo">
-                <span slot="label">
-                  <span style="color: red">{{ $t('车牌号') }}</span>
-                </span>
-                <el-input v-model="coData.carNo" clearable="" placeholder=""></el-input>
-              </el-form-item>
-            </el-col>
-            <el-col :span="8"  v-if="['1','3','5'].indexOf(coData.transType) > -1">
-              <el-form-item label="发车时间" prop="carTime">
-                <span slot="label">
-                  <span style="color: red">{{ $t('发车时间') }}</span>
-                </span>
-                <el-date-picker clearable
-                  v-model="coData.carTime"
-                  type="date"
-                  value-format="yyyy-MM-dd"
-                  placeholder="请选择发车时间">
-                </el-date-picker>
-              </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-col>
-            <el-col :span="24">
-              <el-form-item style="font-weight:600;">
-                <span>{{$t('总件数') + ': ' + (coData.totalParcelQty || 0)}}</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-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-col :span="24">
-            <el-table :data="tableData" border style="width: 100%">
-              <!-- 表头1 -->
-              <el-table-column label="柜头" colspan="2">
-                <template slot-scope="scope">
-                  <el-row>
-                    <el-col :span="12">
-                      <el-input v-model="scope.row[1]"></el-input>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-input v-model="scope.row[2]"></el-input>
-                    </el-col>
-                  </el-row>
-                </template>
-              </el-table-column>
-              <!-- 表头2 -->
-              <el-table-column label="中间" colspan="2">
-                <template slot-scope="scope">
-                  <el-row>
-                    <el-col :span="12">
-                      <el-input v-model="scope.row[3]"></el-input>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-input v-model="scope.row[4]"></el-input>
-                    </el-col>
-                  </el-row>
-                </template>
-              </el-table-column>
-              <!-- 表头3 -->
-              <el-table-column label="柜尾" colspan="2">
-                <template slot-scope="scope">
-                  <el-row>
-                    <el-col :span="12">
-                      <el-input v-model="scope.row[5]"></el-input>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-input v-model="scope.row[6]"></el-input>
-                    </el-col>
-                  </el-row>
-                </template>
-              </el-table-column>
-            </el-table>
-          </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">
-            <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(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>
 
-    <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(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>
   </XdPageContainer>
 </template>
 
@@ -737,7 +250,7 @@ export default {
       // 总条数
       total: 0,
       // TMS组批次表格数据
-      emisTmsPackList: [],
+      emisTmsBatchList: [],
 
       // 待组批次列表
       emisTmsWaitPackList:[],
@@ -796,16 +309,7 @@ export default {
       daterangeCreateTime: [],
       // 更新网点时间范围
       daterangeUpdateTime: [],
-      tableData:[
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ],
-      tableDataId:[
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ],
+
       // 查询参数
       queryParams: {
         pageNum: 1,
@@ -864,788 +368,23 @@ export default {
     end.setHours(23,59,59,0)
     this.dateTimeRange=[start,end];
     this.activeName="third";
-    this.getQuery();
+    this.getList();
   },
   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();
-          break;
-        case 'fourth':
-          this.waitPackList=[];
-          this.$refs.packListView.getList();
-        default:
-          break;
-      }
-    },
-    donothing(){
 
-    },
-    test(ctx){
-    },
     /** 查询TMS组批次列表 */
     getList() {
       this.loading = true;
-      this.single = true;
-      this.multiple = true;
-      // this.queryParams.params = {};
-      if(this.queryParams.billCode){
-        let qBillCode=formatSearchStr(this.queryParams.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.queryParams.params.queryOrderType == "0"){
-          this.queryParams.batchNo=newBillCodeStr;
-          this.queryParams.billCode=null;
-        }else{
-          // 处理子单号
-          this.queryParams.billCode=newBillCodeStr;
-          this.queryParams.batchNo=null;
-        }
-      }
-      this.emisTmsPackList = [];
-      if (null != this.dateTimeRange && '' != this.dateTimeRange) {
-        this.queryParams.params["beginCreateTime"] = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryParams.params["endCreateTime"] = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      this.queryParams.destCountry = this.queryParams.receiveCountry;
+      this.queryParams=this.addDateRange(this.queryParams, this.dateRange,"createDate");
       listEmisTmsSiteBatch(this.queryParams).then(response => {
-        this.emisTmsPackList = response.rows;
+        this.emisTmsBatchList = response.rows;
         this.total = response.total;
         this.loading = false;
       });
     },
-    handleQueryWait(){
-      this.single = true;
-      this.multiple = true;
-      if(null != this.dateTimeRange && '' != this.dateTimeRange){
-        this.queryWaitParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryWaitParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      // this.queryWaitParams.packNo = this.queryParams.packNo;
-      this.queryWaitParams.receiveCountry = this.queryParams.receiveCountry;
-      this.queryWaitParams.sendCountry = this.queryParams.sendCountry;
-
-      if(this.queryParams.billCode){
-        let qBillCode=formatSearchStr(this.queryParams.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.queryParams.params.queryOrderType == "0"){
-          this.queryWaitParams.batchNo=newBillCodeStr;
-          this.queryWaitParams.billCode=null;
-        }else{
-          // 处理子单号
-          this.queryWaitParams.billCode=newBillCodeStr;
-          this.queryWaitParams.batchNo=null;
-        }
-      }
-
-      this.loadingWait = true;
-      this.queryWaitParams.params.isNeedBatch = 1;
-      listEmisWaybill(this.queryWaitParams).then(response => {
-        this.loadingWait = false;
-        if(response.code != 200){
-          this.$modal.msgError(response.msg);
-          return;
-        }
-        this.emisTmsWaitPackList = response.rows;
-        // this.emisCoPackDetail = response.rows;
-        console.log(this)
-        this.waitTotal = response.total;
-      })
-    },
-    handleWaitSelectionChange(selection){
-      // selection.length > 0 ? this.packDisabled = false : this.packDisabled=true;
-      this.waitPackList = selection;
-    },
-    async handleQueryDone(){
-      this.single = true;
-      this.multiple = true;
-      this.loadingDone = true;
-      if(null != this.dateTimeRange && '' != this.dateTimeRange){
-        this.queryDoneParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryDoneParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-      // this.queryDoneParams.packNo = this.queryParams.packNo;
-      if(this.queryParams.billCode){
-        let qBillCode=formatSearchStr(this.queryParams.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.queryParams.params.queryOrderType == "0"){
-          this.queryDoneParams.batchNo=newBillCodeStr;
-          this.queryDoneParams.billCode=null;
-        }else{
-          // 处理子单号
-          this.queryDoneParams.billCode=newBillCodeStr;
-          this.queryDoneParams.batchNo=null;
-        }
-      }
-
-      this.queryDoneParams.receiveCountry = this.queryParams.receiveCountry;
-      this.queryDoneParams.sendCountry = this.queryParams.sendCountry;
-      let resList = await listEmisTmsSiteBatchDtl(this.queryDoneParams);
-      this.loadingDone = false;
-      if(!resList || resList.code != 200){
-        this.$modal.msgError(resList && resList.msg || "未知错误");
-        return;
-      }
-      //this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
-      this.doneTotal = resList.total;
-      this.emisTmsDonePackList = [];
-      for(let p = 0; p < resList.rows.length;p++){
-        let obj = {...resList.rows[p].waybillDetail};
-        obj.packNo = resList.rows[p].packNo;
-        this.emisTmsDonePackList.push(obj);
-      }
-    },
-    handleDoneSelectionChange(){
-
-    },
-    handleQueryWayBill(){
-      this.loading2 = true;
-      if (null != this.wayBillData.dateTimeRange && '' != this.wayBillData.dateTimeRange) {
-        if(this.wayBillData.dataTimeType == '1'){
-          // 下单时间
-          this.wayBillData.params.beginOrderDate = dateToStr(new Date(this.wayBillData.dateTimeRange[0]));
-          this.wayBillData.params.endOrderDate = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
-        }else if(this.wayBillData.dataTimeType == '0'){
-          // 录单时间
-          this.wayBillData.params.beginCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[0]));
-          this.wayBillData.params.endCreateTime = dateToStr(new Date(this.wayBillData.dateTimeRange[1]));
-        }
-      }
-      if(this.wayBillData.billCode){
-        let qBillCode=formatSearchStr(this.wayBillData.billCode);
-        let billArr = qBillCode.split(",");
-        let newBillCodeStr="";
-        billArr.forEach(item=>{
-            if(item.startsWith("T")){
-              let mainBillCode=item.substr(0,14);
-              newBillCodeStr=newBillCodeStr+mainBillCode+",";
-            }else if(item == ""){
-
-            }else{
-              newBillCodeStr=newBillCodeStr+item+",";
-            }
-        });
-        if(this.wayBillData.params.queryOrderType == "0"){
-          this.wayBillData.orderSN=newBillCodeStr;
-          this.wayBillData.billCode=null;
-        }else{
-          // 处理子单号
-          this.wayBillData.billCode=newBillCodeStr;
-          this.wayBillData.orderSN=null;
-        }
-      }
-      this.wayBillData.params.isNeedBatch = 1;
-      listEmisWaybill(this.wayBillData).then(response => {
-        this.loading2 = false;
-        if(response.code != 200){
-          this.$modal.msgError(response.msg);
-          return;
-        }
-        this.emisWayBillList = response.rows;
-        // this.emisCoPackDetail = response.rows;
-        console.log(this)
-        this.wayBillotal = response.total;
-      })
-    },
-    onSiteSelect(item){
-      if(!item){
-        this.coData.startSiteCode = null;
-        this.coData.startSiteName = null;
-        return;
-      }
-      this.coData.startSiteCode=item && item.siteCode;
-      this.coData.startSiteName=item && item.siteName;
-    },
-    onNextSiteSelect(item){
-      if(!item){
-        this.coData.nextSiteCode = null;
-        this.coData.nextSiteName = null;
-        return;
-      }
-      this.coData.nextSiteCode=item && item.siteCode;
-      this.coData.nextSiteName=item && item.siteName;
-    },
-    onDateSelect(value){
-      console.log("date picker---->", value)
-      this.dateTimeRange=value;
-      if(this.queryParams.params.queryOrderDateType == '1'){
-        // 下单时间
-        this.queryParams.params.beginCreateTime = dateToStr(new Date(this.dateTimeRange[0]));
-        this.queryParams.params.endCreateTime = dateToStr(new Date(this.dateTimeRange[1]));
-      }
-    },
-    onWayBillDateSelect(value){
-      console.log("date picker---->", value)
-      this.wayBillData.dateTimeRange=value;
-    },
-    async handleAddCoPack(){
-      if(!this.coData.batchName || !this.coData.destCountry || !this.coData.nextSiteCode || !this.coData.startSiteCode || !this.coData.transType
-        || (this.coData.transType == "2" && (!this.coData.airBilllNo || !this.coData.airTime))
-        || (this.coData.transType == "4" && (!this.coData.shipNo || !this.coData.shipTime))
-        || ((this.coData.transType == "1" || this.coData.transType == "3" || this.coData.transType == "5") && (!this.coData.carNo || !this.coData.carTime))
-      ){
-        this.$modal.msgError("请先选择必填项")
-        return;
-      }
-      if(this.emisCoPackDetail.length == 0){
-        this.$modal.msgError("请先选择至少一条运单信息")
-        return;
-      }
-
-      let firstItemCountry = this.emisCoPackDetail.length > 0 ? this.emisCoPackDetail[0].receiveCountry : '';
-      // 将选中的“待组批次”的运单 置为 追加的运单号
-      for(let p = 0; p < this.emisCoPackDetail.length;p++){
-        if(this.emisCoPackDetail[p].receiveCountry != firstItemCountry){
-          this.$modal.msgError("存在了不同的目的国家！");
-          return ;
-        }
-      }
-
-      let coPackItem={
-        batchNo: this.coData.batchNo,
-        batchName: this.coData.batchName || '',
-        batchDate: this.coData.createTime,
-        batchType: this.coData.batchType || null,
-        transType: this.coData.transType || null,
-        destCountry: this.coData.destCountry || null,
-        startSiteCode: this.coData.startSiteCode || null,
-        startSiteName: this.coData.startSiteName || null,
-        nextSiteCode: this.coData.nextSiteCode || null,
-        nextSiteName: this.coData.nextSiteName || null,
-        airBilllNo: this.coData.airBilllNo || null,
-        carNo: this.coData.carNo || null,
-        shipNo: this.coData.shipNo || null,
-        clearanceResStatus: this.coData.clearanceResStatus || null,
-        declareResStatus: this.coData.declareResStatus || null,
-        destCountry: this.coData.destCountry || null,
-        destCountryName: this.coData.destCountryName || null,
-        totalParcelQty: this.coData.totalParcelQty || null,
-        totalWaybillQty: this.coData.totalWaybillQty || null,
-        totalVolume: this.coData.totalVolume || null,
-        totalWeight: this.coData.totalWeight || null,
-      }
-      if(this.coData.transType == 2){
-        coPackItem.etd = parseTime(this.coData.airTime, '{y}-{m}-{d} {h}:{i}:{s}');
-        this.coData.etd = parseTime(this.coData.airTime, '{y}-{m}-{d} {h}:{i}:{s}');
-      }else if(this.coData.transType == 4){
-        coPackItem.etd = parseTime(this.coData.shipTime, '{y}-{m}-{d} {h}:{i}:{s}');
-        this.coData.etd = parseTime(this.coData.shipTime, '{y}-{m}-{d} {h}:{i}:{s}');
-      }else{
-        coPackItem.etd = parseTime(this.coData.carTime, '{y}-{m}-{d} {h}:{i}:{s}');
-        this.coData.etd = parseTime(this.coData.carTime, '{y}-{m}-{d} {h}:{i}:{s}');
-      }
-      if(this.coPackType == "add"){// 新增
-        let resPack = await getTmsGroupBatchNo();
-        if(!resPack || resPack.code != 200){
-          this.$modal.msgError(resPack && resPack.msg || "未知错误");
-          return;
-        }
-        coPackItem.batchNo = resPack.data;
-        let response = await addEmisTmsSiteBatch(coPackItem);
-        if(!response || response.code != 200){
-          this.$modal.msgError(response && response.msg || '新增组批次失败')
-          return;
-        }
-        // })
-        for(let i = 0; i< this.emisCoPackDetail.length;i++){
-          let packDetail = {
-            batchNo:resPack.data,
-            billCode: this.emisCoPackDetail[i].billCode,
-            scanDate: this.emisCoPackDetail[i].scanDate,
-            scanStatus: this.emisCoPackDetail[i].scanStatus,
-            groupStatus: "1",//已组批次
-            scanMan: this.emisCoPackDetail[i].scanMan,
-            scanSite: this.emisCoPackDetail[i].scanSite,
-            createBy: this.$store.getters.empCode,
-            createTime: parseTime(new Date())
-          };
-          let response = await addEmisTmsSiteBatchDtl(packDetail);
-          if(!response || response.code != 200){
-            this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-            return;
-          }
-          this.waitPackList=[];
-        }
-
-        // 新增配载数据 tableData
-        for(let lr = 0; lr < 3; lr++){
-          for(let ll = 0; ll < 6; ll++){
-            let batchLoadingData = {
-              batchNo: resPack.data,
-              posNo:lr+":"+ll+":1",
-              row: lr,
-              col: ll,
-              layer: 1,
-              posDesc:this.tableData[lr][ll],
-              remark:"",
-              tenantId:"",
-            }
-            let resLD = await addEmisTmsSiteBatchLoading(batchLoadingData);
-            if(!resLD || resLD.code != 200){
-              this.$modal.msgError(resLD && resLD.msg || '组批次配载明细新增失败')
-              return;
-            }
-          }
-        }
-      }else if(this.coPackType == "edit"){// 修改
-        //第一步：处理组批次信息的更新；
-        if(this.tempCoPackInfo.batchName != this.coData.batchName
-          || this.tempCoPackInfo.transType != this.coData.transType
-          || this.tempCoPackInfo.startSiteCode != this.coData.startSiteCode
-          || this.tempCoPackInfo.nextSiteCode != this.coData.nextSiteCode
-          || this.tempCoPackInfo.airBilllNo != this.coData.airBilllNo
-          || this.tempCoPackInfo.etd != this.coData.etd
-          || this.tempCoPackInfo.carNo != this.coData.carNo
-          || this.tempCoPackInfo.destCountry != this.coData.destCountry
-          || this.tempCoPackInfo.shipNo != this.coData.shipNo
-          // || this.tempCoPackInfo.shipTime != this.coData.shipTime
-          || 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.loadingFile != this.coData.loadingFile
-        ){
-          this.tempCoPackInfo.batchName = this.coData.batchName;
-          this.tempCoPackInfo.transType = this.coData.transType;
-          this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
-          this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
-          this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-          this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
-          this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
-          this.tempCoPackInfo.etd = this.coData.etd;
-          this.tempCoPackInfo.carNo = this.coData.carNo;
-          this.tempCoPackInfo.destCountry = this.coData.destCountry;
-          this.tempCoPackInfo.shipNo = this.coData.shipNo;
-          // this.tempCoPackInfo.shipTime = this.coData.shipTime;
-          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.loadingFile = this.coData.loadingFile;
-          let res = await updateEmisTmsSiteBatch(this.tempCoPackInfo);
-          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 delEmisTmsSiteBatchDtl(item.id);
-        //   // delEmisTmsSiteBatchDtl(item.id).then(res => {
-        //     if(!res || res.code != 200){
-        //       this.$modal.msgError(res && res.msg || '未知错误')
-        //       return;
-        //     }
-        //   // })
-        // }
-        // })
-        //2.2：计算要新增的运单
-        // let tempAddList=[];
-        // tempAddList = this.emisCoPackDetail.filter(item => {
-        //   let ls = this.tempExistCoPackWayBillList.filter(cd => {
-        //     return cd.billCode == item.billCode
-        //   })
-        //   if(ls.length > 0){
-        //     return false;
-        //   }else{
-        //     return true;
-        //   }
-        // })
-        // for(let tal = 0; tal < tempAddList.length; tal++){
-        //   let item = tempAddList[tal];
-        //   let packDetail = {
-        //     batchNo:this.coData.batchNo,
-        //     billCode: item.billCode,
-        //     scanDate: item.scanDate,
-        //     scanStatus: item.scanStatus,
-        //     groupStatus: "1",//已组批次
-        //     scanMan: item.scanMan,
-        //     scanSite: item.scanSite,
-        //     createBy: this.$store.getters.empCode,
-        //     createTime: parseTime(new Date())
-        //   };
-        //   let response = await addEmisTmsSiteBatchDtl(packDetail);
-        //   if(!response || response.code != 200){
-        //     this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-        //     return;
-        //   }
-        // }
-        // })
-        // 修改配载数据
-        for(let lr = 0; lr < 3; lr++){
-          for(let ll = 0; ll < 6; ll++){
-            if(this.tempCoPackInfo.tableData[lr][ll] != this.tableData[lr][ll]){
-              let batchLoadingData = {
-                id: this.tempCoPackInfo.tableDataId[lr][ll],
-                posDesc:this.tableData[lr][ll],
-              }
-              let resLD = await updateEmisTmsSiteBatchLoading(batchLoadingData);
-              if(!resLD || resLD.code != 200){
-                this.$modal.msgError(resLD && resLD.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 delEmisTmsSiteBatch(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 submitFormBatch(){
-      if(this.formBatchBillList==null || this.formBatchBillList==''){
-        this.$modal.msgError("请输入单号");
-        return;
-      }
-      let bcList=this.formBatchBillList.trim().split(/[；\;\,\，\n]/)||[];
-
-      // bcList.forEach(async (billcode) => {
-      //   billcode = billcode.trim();
-      //   if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
-      //     let billRes = await listEmisWaybill({billCode:billcode});
-      //     if(!billRes || billRes.code != 200){
-      //       this.$modal.msgError(billRes && billRes.msg)
-      //       return;
-      //     }else if(!billRes.rows || billRes.rows.length < 1){
-      //       this.$modal.msgError(('无此运单数据') + ": " + billcode)
-      //       return;
-      //     }
-      //     let item = billRes.rows[0];
-      //     this.emisCoPackDetail.push(item);
-      //     if(this.coPackType=="edit"){
-      //       let packDetail = {
-      //         batchNo: this.coData.batchNo,
-      //         billCode: item.billCode,
-      //         scanDate: item.scanDate,
-      //         scanStatus: item.scanStatus,
-      //         groupStatus: "1",//已组批次
-      //         scanMan: item.scanMan,
-      //         scanSite: item.scanSite,
-      //         createBy: this.$store.getters.empCode,
-      //         createTime: parseTime(new Date())
-      //       };
-      //       let response = await addEmisTmsSiteBatchDtl(packDetail);
-      //       if(!response || response.code != 200){
-      //         this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-      //         return;
-      //       }
-      //     }
-      //   }
-      // })
-      for(let i = 0; i < bcList.length; i++){
-        let billcode = bcList[i].trim();
-        if(this.emisCoPackDetail.filter(wb => wb.billCode == billcode).length == 0){
-          let billRes = await listEmisWaybill({billCode:billcode});
-          if(!billRes || billRes.code != 200){
-            this.$modal.msgError(billRes && billRes.msg)
-            return;
-          }else if(!billRes.rows || billRes.rows.length < 1){
-            this.$modal.msgError(('无此运单数据') + ": " + billcode)
-            return;
-          }
-          let item = billRes.rows[0];
-          this.emisCoPackDetail.push(item);
-          if(this.coPackType=="edit"){
-            let packDetail = {
-              batchNo: this.coData.batchNo,
-              billCode: item.billCode,
-              scanDate: item.scanDate,
-              scanStatus: item.scanStatus,
-              groupStatus: "1",//已组批次
-              scanMan: item.scanMan,
-              scanSite: item.scanSite,
-              createBy: this.$store.getters.empCode,
-              createTime: parseTime(new Date())
-            };
-            let response = await addEmisTmsSiteBatchDtl(packDetail);
-            if(!response || response.code != 200){
-              this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-              return;
-            }
-          }
-        }
-      }
-      this.titleBatch="";
-      this.openBatch=false;
-      this.formBatchBillList = "";
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
-      this.computeTotal();
-      // 更新主表
-      if(this.coPackType=="edit"){
-        this.tempCoPackInfo.batchName = this.coData.batchName;
-        this.tempCoPackInfo.transType = this.coData.transType;
-        this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
-        this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
-        this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-        this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
-        this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
-        this.tempCoPackInfo.etd = this.coData.etd;
-        this.tempCoPackInfo.carNo = this.coData.carNo;
-        this.tempCoPackInfo.destCountry = this.coData.destCountry;
-        this.tempCoPackInfo.shipNo = this.coData.shipNo;
-        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.loadingFile = this.coData.loadingFile;
-        let res = await updateEmisTmsSiteBatch(this.tempCoPackInfo);
-        if(!res || res.code != 200){
-          this.$modal.msgError(res && res.msg || '未知错误')
-          return;
-        }
-      }
-    },
-    async handleCoAdd(){
-      this.tempCoPackList.forEach(async (item) => {
-        if(this.emisCoPackDetail.filter(wb => wb.billCode == item.billCode).length == 0){
-          this.emisCoPackDetail.push(item);
-          if(this.coPackType=="edit"){
-            let packDetail = {
-              batchNo: this.coData.batchNo,
-              billCode: item.billCode,
-              scanDate: item.scanDate,
-              scanStatus: item.scanStatus,
-              groupStatus: "1",//已组批次
-              scanMan: item.scanMan,
-              scanSite: item.scanSite,
-              createBy: this.$store.getters.empCode,
-              createTime: parseTime(new Date())
-            };
-            let response = await addEmisTmsSiteBatchDtl(packDetail);
-            if(!response || response.code != 200){
-              this.$modal.msgError(response && response.msg || '组批次明细新增失败')
-              return;
-            }
-          }
-        }
-      })
-      this.titleWayBill="";
-      this.openWayBillForm=false;
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
-      this.computeTotal();
-      // 更新主表
-      if(this.coPackType=="edit"){
-        this.tempCoPackInfo.batchName = this.coData.batchName;
-        this.tempCoPackInfo.transType = this.coData.transType;
-        this.tempCoPackInfo.startSiteCode = this.coData.startSiteCode;
-        this.tempCoPackInfo.startSiteName = this.coData.startSiteName || null;
-        this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-        this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
-        this.tempCoPackInfo.airBilllNo = this.coData.airBilllNo;
-        this.tempCoPackInfo.etd = this.coData.etd;
-        this.tempCoPackInfo.carNo = this.coData.carNo;
-        this.tempCoPackInfo.destCountry = this.coData.destCountry;
-        this.tempCoPackInfo.shipNo = this.coData.shipNo;
-        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.loadingFile = this.coData.loadingFile;
-        let res = await updateEmisTmsSiteBatch(this.tempCoPackInfo);
-        if(!res || res.code != 200){
-          this.$modal.msgError(res && res.msg || '未知错误')
-          return;
-        }
-      }
-    },
-    handleCloseWayBill(){
-      this.titleWayBill="";
-      this.openWayBillForm=false;
-      this.wayBillData = {
-        pageNum: 1,
-        pageSize: 20,
-        params:{}
-      };
-      this.emisWayBillList=[];
-      this.tempCoPackList=[];
-      this.addWayBillDisabled = true;
-      this.wayBillotal=0;
-    },
-    handleCoPackListDelete(){
-      if(!this.coData.batchName || !this.coData.destCountry || !this.coData.nextSiteCode || !this.coData.startSiteCode || !this.coData.transType
-        || (this.coData.transType == "2" && (!this.coData.airBilllNo || !this.coData.airTime))
-        || (this.coData.transType == "4" && (!this.coData.shipNo || !this.coData.shipTime))
-        || ((this.coData.transType == "1" || this.coData.transType == "3" || this.coData.transType == "5") && (!this.coData.carNo || !this.coData.carTime))
-      ){
-        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 delEmisTmsSiteBatchDtl(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++){
-                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.sendStiteName = this.coData.sendStiteName || null;
-              this.tempCoPackInfo.nextSiteCode = this.coData.nextSiteCode;
-              this.tempCoPackInfo.nextSiteName = this.coData.nextSiteName;
-              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 updateEmisTmsSiteBatch(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();
     },
     /** 重置按钮操作 */
@@ -1660,34 +399,6 @@ export default {
       this.single = selection.length!==1
       this.multiple = !selection.length
     },
-    handleCoPackSelectionChange(selection){
-      // this.coSelection = selection.map(item => item.id)
-      this.coSelection = selection;
-      this.coSingle = selection.length!==1
-      this.coMultiple = !selection.length
-    },
-    computeTotal(){
-      let totalParcelQty=0;
-      let totalWeight=0;
-      let totalVolume=0;
-      this.emisCoPackDetail.forEach(item =>{
-        totalParcelQty +=item.parcelQty;
-        totalWeight +=item.billWeight;
-        totalVolume +=item.totalVolume;
-        item.destCountry = this.coData.destCountry;
-        // item.sendSiteCode = this.coData.sendSiteCode;
-        item.startSiteCode = this.coData.startSiteCode;
-        item.startSiteName = this.coData.startSiteName;
-        // item.nextSiteCode = this.coData.nextSiteCode;
-        item.nextSiteCode = this.coData.nextSiteCode;
-        item.nextSiteName = this.coData.nextSiteName;
-        item.blUnpack = this.blUnpack;
-      })
-      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;
@@ -1695,180 +406,26 @@ export default {
       this.getList();
     },
     /** 新增按钮操作 */
-    async handleAdd() {
-      this.coPackType="add";
-      this.coData = {};
-      if(this.activeName=="first"){
-        let firstItemCountry = this.waitPackList.length > 0 ? this.waitPackList[0].receiveCountry : '';
-        // 将选中的“待组批次”的运单 置为 追加的运单号
-        for(let p = 0; p < this.waitPackList.length;p++){
-          if(this.waitPackList[p].receiveCountry != firstItemCountry){
-            this.$modal.msgError("存在了不同的目的国家！");
-            this.emisCoPackDetail=[];
-            return ;
-          }
-          this.emisCoPackDetail.push(this.waitPackList[p]);
-        }
-      }else if(this.activeName=="fourth"){
-        // let firstItemCountry = this.waitPackList.length > 0 ? this.waitPackList[0].receiveCountry : '';
-        // // 将选中的“待组批次”的运单 置为 追加的运单号
-        // for(let p = 0; p < this.waitPackList.length;p++){
-        //   if(this.waitPackList[p].receiveCountry != firstItemCountry){
-        //     this.$modal.msgError("存在了不同的目的国家！");
-        //     this.emisCoPackDetail=[];
-        //     return ;
-        //   }
-        //   this.emisCoPackDetail.push(this.waitPackList[p]);
-        // }
-        let res = await this.$refs.packListView.getPackBillList();
-        if(res.code == -1){
-          this.$modal.msgError(res.message);
-          return;
-        }
-        this.emisCoPackDetail = [...res.list];
+    handleAdd() {
+      this.$emit("onCreate");
+    },
+    async handleDelete(){
+      for(let i = 0; i< this.ids.length;i++){
+        await delEmisTmsSiteBatch(this.ids[i]);
       }
-      this.tempExistCoPackWayBillList = [];// 清空临时保存的已有运单号
-      this.tempCoPackInfo={};
-      this.coData.createTime = parseTime(new Date());
-      this.coData.destCountry = null;
-      this.coData.destCountryName = null;
-      // this.coData.sendSiteCode = null;
-      this.coData.nextSiteCode = null;
-      this.coData.nextSiteName = null;
-      this.coData.nextStation = null;
-      // this.blUnpack = "1";
-
-      this.tableData = [
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      this.tableDataId=[
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-
-      this.coData.startSiteCode = this.$store.getters.ownerSiteCode;
-      this.coData.startSiteName=this.$store.getters.ownerSiteName;
-
-      this.computeTotal();
-
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "新增组批次";
+      this.$modal.msgSuccess('操作成功');
+      this.getList();
     },
-    handleAddWayBill(){
-      if(!this.coData.batchName || !this.coData.destCountry || !this.coData.nextSiteCode || !this.coData.startSiteCode || !this.coData.transType
-        || (this.coData.transType == "2" && (!this.coData.airBilllNo || !this.coData.airTime))
-        || (this.coData.transType == "4" && (!this.coData.shipNo || !this.coData.shipTime))
-        || ((this.coData.transType == "1" || this.coData.transType == "3" || this.coData.transType == "5") && (!this.coData.carNo || !this.coData.carTime))
-      ){
-        this.$modal.msgError("请先选择必填项")
-        return;
-      }
-      // this.openWayBillForm= true;
-      // this.titleWayBill = "运单列表";
-      this.openBatch = true;
-      this.titleBatch = "批量输入运单号";
-    },
-    cancelBatch(){
-      this.openBatch=false;
-      this.titleBatch = "";
-      this.formBatchBillList = "";
-    },
-    handleShowMoreInput(){
-      this.moreInputVisible = !this.moreInputVisible;
+
+    handleDown(){
+
     },
     /** 修改按钮操作 */
-    async handleUpdate() {
-      // this.coData={};
+    handleUpdate() {
       let id = this.ids[0]
-      this.coPackType="edit";
-      let response = await getEmisTmsSiteBatch(id);
-      if(!response || response.code != 200){
-        this.$modal.msgError(response && response.msg || "未知错误");
-        return;
-      }
-      let resData = response.data;
-      let time = {};
-      if(resData.transType == 2){
-        time.airTime = resData.etd;
-      }else if(resData.transType == 4){
-        time.shipTime = resData.etd;
-      }else{
-        time.carTime = resData.etd;
-      }
-      this.coData = {...resData, ...{batchDate:resData.createTime}, ...time};
-      // this.coData.batchNo = resData.batchNo;
-      // this.coData.destCountry = resData.destCountry;
-      // this.coData.batchDate = resData.createTime;
-      // this.coData.batchType = resData.batchType || null;
-      // this.coData.transType = resData.transType;
-      // this.coData.startSiteCode = resData.startSiteCode || null;
-      // this.coData.startSiteName = resData.startSiteName || null;
-      // this.coData.nextSiteCode = resData.nextSiteCode || null;
-      // this.coData.airBilllNo = resData.airBilllNo || null;
-      // this.coData.carNo = resData.carNo || "";
-      // this.coData.shipNo = resData.shipNo || null;
-      // this.coData.clearanceResStatus = resData.clearanceResStatus || null;
-      // this.coData.declareResStatus = resData.declareResStatus || null;
-      // this.coData.destCountry = resData.destCountry || null;
-      // this.coData.destCountryName = resData.destCountryName || null;
-      // this.coData.totalParcelQty = resData.totalParcelQty || null;
-      // this.coData.totalWaybillQty = resData.totalWaybillQty || null;
-      // this.coData.totalVolume = resData.totalVolume || null;
-      // this.coData.totalWeight = resData.totalWeight || null;
-
-
-      this.emisCoPackDetail=[];
-      let resList = await listEmisTmsSiteBatchDtl({batchNo: resData.batchNo});
-      if(!resList || resList.code != 200){
-        this.$modal.msgError(resList && resList.msg || "未知错误");
-        return;
-      }
-      this.tempExistCoPackWayBillList = resList.rows;//临时存储，用于运单号校验
-      this.tempCoPackInfo = resData;
-      for(let p = 0; p < resList.rows.length;p++){
-        this.emisCoPackDetail.push(resList.rows[p].waybillDetail);
-      }
-      this.coData.packStatus = this.tempCoPackInfo.packStatus;
-      this.coData.scanDate = this.tempCoPackInfo.scanDate;
-
-      let resLoadingList = await listEmisTmsSiteBatchLoading({batchNo: resData.batchNo});
-      if(!resLoadingList || resLoadingList.code != 200){
-        this.$modal.msgError(resLoadingList && resLoadingList.msg || "未知错误");
-        return;
-      }
-
-      this.tempCoPackInfo.tableData = [
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      this.tempCoPackInfo.tableDataId=[
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' },
-        { 1: '', 2: '', 3: '', 4: '', 5: '', 6: '' }
-      ];
-      for(let p = 0; p < resLoadingList.rows.length;p++){
-        this.tempCoPackInfo.tableDataId[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].id;
-        this.tempCoPackInfo.tableData[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].posDesc;
-        this.tableData[resLoadingList.rows[p].row][resLoadingList.rows[p].col] = resLoadingList.rows[p].posDesc;
-        // this.emisCoPackDetail.push(resLoadingList.rows[p].waybillDetail);
-      }
-
-      this.computeTotal();
-      this.currentId=null;
-      this.openForm= true;
-      this.titleForm = "修改组批次";
-    },
-    handleView(row) {
-       this.id=row.id;
-       this.titleView="查看";
-       this.openView=true;
-    //   this.router.push({ path: '/emis/emisTmsPack/viewDetail', query: { id: row.id }})
+      this.$emit("onUpdate",id);
     },
+
     handleFormChanged(){
         this.openForm = false;
         this.getList();
@@ -1876,63 +433,7 @@ export default {
     cancelForm(){
       this.openForm = false;
     },
-    /** 删除按钮操作 */
-    CoPack(row) {
-      const ids = row.id || this.ids;
-      this.$modal.confirm('是否确认删除').then(function() {
-        return delEmisTmsSiteBatch(ids);
-      }).then(() => {
-        this.getList();
-        this.$modal.msgSuccess("删除成功");
-      }).catch(() => {});
-    },
-    /** 导出按钮操作 */
-    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;
 
-       listEmisTmsSiteBatch(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','sendSiteCode','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