diff --git a/src/components/DatePickerAdv/elDateSimplePicker.vue b/src/components/DatePickerAdv/elDateSimplePicker.vue
index 2e82c532..3e66bd16 100644
--- a/src/components/DatePickerAdv/elDateSimplePicker.vue
+++ b/src/components/DatePickerAdv/elDateSimplePicker.vue
@@ -42,7 +42,11 @@
 <script>
   export default {
      props: {
-        placeholder: "",
+      value: {
+        type: [Array],
+        required: false
+      },
+      placeholder: "",
     },
     data() {
       return {
@@ -51,14 +55,16 @@
         dateTimeRange: [],
         optionsFilter: [],
         valueStr: undefined,
-        value: [],
       }
     },
     watch: {
-      // dateTimeRange(newVal){
-      //   this.$emit('input',this.dateTimeRange)
-      //   this.$emit('change',this.dateTimeRange)
-      // }
+      value(newVal){
+        if(!this.value||this.value==''){
+            this.valueStr=null;
+            this.daySelectValue=null;
+            this.dateTimeRange=[] ;
+        }
+      }
   },
     created() {
       this.initDateSelector();
diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue
index a4eab8d1..2078fb8e 100644
--- a/src/views/emis/EmisBaseTools/CountryPicker.vue
+++ b/src/views/emis/EmisBaseTools/CountryPicker.vue
@@ -9,8 +9,6 @@
       v-model="svalue"
       :placeholder="placeholder"
 
-      no-data-text=""
-
       @blur="onBlur"
       @change="onChange"
       @click.native="onClick"
@@ -51,6 +49,7 @@
       value(newVal,oldVal) {
         // 逻辑 有初始值先查询初值
         // if(this.value!=null){
+       
           this.svalue=this.value;
           this.queryData(null,this.svalue);
         // }
diff --git a/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue b/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue
new file mode 100644
index 00000000..69b52423
--- /dev/null
+++ b/src/views/emis/EmisBaseTools/EmisPackNoPicker.vue
@@ -0,0 +1,142 @@
+<template>
+   <!-- :loading="loading" -->
+   <!-- v-el-select-loadmore="loadmore" -->
+        <!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
+
+   <el-select
+      filterable
+      clearable
+      autocomplete="false"
+      ref="selectDom"
+      v-model="svalue"
+      remote
+      :remote-method="queryData"
+      :placeholder="placeholder"
+      style="width: 100%;"
+      :disabled="disabled"
+      @focus="onFocus"
+      class="remote-select"
+      @change="onChange"
+      @clear="onClear"
+      @visible-change="reverseArrow"
+      >
+        <el-option v-for="item in dataList" :key="item.packNo" :label="item.packNo" :value="item.packNo" ></el-option>
+    </el-select>
+
+
+</template>
+<script>
+  import { listEmisTmsPack } from "@/api/emis/emisTmsPack";
+
+  export default {
+    name: "EmisPackNoPicker",
+    components: {
+
+    },
+    dicts: [],
+    props: {
+      value: {
+        type: String,
+        required: false
+      },
+      placeholder: {
+        type: String,
+        required: false
+      },
+      countryCode: {
+        type: String,
+        required: false
+      },
+      // siteType:{
+      //   type: [String,Number],
+      //   required: false
+      // },
+      isInitiated:{
+        type: [Boolean,String],
+        required: false,
+        default:false
+      },
+      disabled:{
+        type: [Boolean,String],
+        required: false
+      },
+    },
+    data() {
+      return {
+        loading:false,
+        visible:false,
+        dataList: [],
+        svalue: this.value,
+        firstFlag:true,
+        queryParams:{
+          pageNum:1,
+          pageSize:20,
+          packNo:this.value,
+        }
+      };
+    },
+    watch: {
+      value(newVal) {
+        this.svalue = newVal;
+        this.queryData(this.svalue);
+      },
+    },
+    created() {
+      this.queryData();
+    },
+    beforeDestroy(){
+      this.firstFlag = true;
+    },
+    methods: {
+      onChange() {
+        this.$emit("input", this.svalue);
+        this.$emit("onChange",this.svalue);
+      },
+      onClear(){
+        this.queryParams.packNo=null;
+        this.queryData();
+      },
+      onFocus(){
+        this.queryData();
+      },
+      queryData(val) {
+        if(val && this.queryParams.pageNum == 1){
+          this.dataList=[];
+        }
+        this.queryParams.packNo=val;
+        listEmisTmsPack(this.queryParams).then(response => {
+          this.dataList=response.rows;
+        });
+      },
+
+      reverseArrow(flag) {
+        let rulesDom = this.$refs["selectDom"].$el.querySelector(
+          ".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
+        ); // 找到dom
+        if (flag) {
+          rulesDom.classList.add("is-reverse"); // 对dom新增class
+        } else {
+          rulesDom.classList.remove("is-reverse"); // 对dom新增class
+        }
+      },
+    }
+  };
+</script>
+
+<style lang="scss" scoped>
+  // right: 30px;
+  // cursor: pointer;
+ :deep .el-select.remote-select{
+  .el-select__caret::before{
+      content: '\e6e1';
+    }
+  .is-focus{
+    .el-select__caret{
+      transform: rotateZ(0deg);
+    }
+  }
+}
+
+
+
+</style>
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
index a6f009a5..c90fbddd 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
@@ -64,6 +64,16 @@
         type: [String,Number],
         required: false
       },
+      parentSiteCode:{
+        type: [String],
+        required: false,
+        defaultValue:null
+      },
+      blIncludeChildSite:{
+        type: [String],
+        required: false,
+        defaultValue:null
+      },
       disabled:{
         type: [Boolean,String],
         required: false
@@ -85,7 +95,11 @@
           siteType:this.siteType,
           countryCode:this.countryCode,
           siteCode:null,
-          siteName:null
+          siteName:null,
+          parentSiteCode:this.parentSiteCode,
+          params:{
+            blIncludeChildSite:this.blIncludeChildSite
+          }
         }
       };
     },
diff --git a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
index 34d001ab..1bfda330 100644
--- a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
@@ -1,5 +1,6 @@
 <template>
     <el-cascader
+      ref="selectRef"
       :size="size"
       :props="props"
       :key="resetCascader"
@@ -95,6 +96,11 @@ export default {
           this.lineCode=this.svalue[0];
           this.prodCode=this.svalue[1];
           this.resetCascader++
+        }else{
+          this.$refs.selectRef.handleClear()
+          this.lineCode=null;
+          this.prodCode=null;
+          this.resetCascader++
         }
       },
       countryCode(newVal) {
@@ -113,6 +119,7 @@ export default {
       this.searchVal = val;
     },
     onClear(){
+      console.log("=======333=>"+this.svalue)
       this.svalue = null;
       this.$emit("input", this.svalue);
       this.$emit("onChange", this.svalue);
diff --git a/src/views/emis/emisCustomerUser/moneyUserForm.vue b/src/views/emis/emisCustomerUser/moneyUserForm.vue
index 7c9d3fc2..c3a83546 100644
--- a/src/views/emis/emisCustomerUser/moneyUserForm.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserForm.vue
@@ -1,6 +1,6 @@
 <template>
   <div >
-        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px">
+        <el-form ref="form" size="mini" :model="form" :rules="rules" label-width="100px" disabled>
           <el-row :gutter="0"  style="display: flex;flex-wrap: wrap;">
 
           <el-col :span="8">
diff --git a/src/views/emis/emisCustomerUser/moneyUserList.vue b/src/views/emis/emisCustomerUser/moneyUserList.vue
index ec2c393e..8c6f8537 100644
--- a/src/views/emis/emisCustomerUser/moneyUserList.vue
+++ b/src/views/emis/emisCustomerUser/moneyUserList.vue
@@ -71,7 +71,7 @@
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -80,7 +80,7 @@
                   @click="handleAdd"
                   v-hasPermi="['emis:emisCustomerUser:add']"
                 >新增客户</el-button>
-              </el-col>
+              </el-col> -->
               <!--
               <el-col :span="1.5">
                 <el-button
@@ -145,7 +145,7 @@
       <!-- <el-table-column :label="$t('月结卡号')" align="center"  prop="monthlyPayCode" min-width="100" /> -->
       <!-- <el-table-column :label="$t('登录账号')" align="center" prop="userName" min-width="100" /> -->
       <!-- <el-table-column :label="$t('登录密码')" align="center" prop="password" min-width="100" /> -->
-      <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" />
+      <!-- <el-table-column :label="$t('所属站点')" align="center" prop="ownerSiteName" min-width="100" /> -->
       <el-table-column :label="$t('国家')" align="left" prop="countryName" min-width="100" />
       <el-table-column :label="$t('省份')" align="left" prop="provinceName" min-width="100" :show-overflow-tooltip="true"/>
       <el-table-column :label="$t('城市')" align="left" prop="citeName" min-width="130" :show-overflow-tooltip="true" >
@@ -156,7 +156,7 @@
          </template>
       </el-table-column>
 
-      <el-table-column :label="$t('主归属网点')" align="center" prop="ownerSiteName" min-width="100" />
+      <el-table-column :label="$t('初次登记网点')" align="center" prop="ownerSiteName" min-width="150" />
       <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
       <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
       <el-table-column label="启用状态" align="center" prop="status" min-width="100" >
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index 5054c36f..12a0a4a8 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -19,6 +19,9 @@
           @input="handleQuery"
         />
       </el-form-item>
+      <el-form-item label="所属网点" prop="parentSiteCode">
+          <EmisSiteSimplePicker :placeholder="$t('所属网点')"  v-model="queryParams.ownerSite" @onChange="handleQuery"></EmisSiteSimplePicker>
+      </el-form-item>
 
       <el-form-item label="联系人" prop="contact">
         <el-input
diff --git a/src/views/emis/emisNotCalcAging/index.vue b/src/views/emis/emisNotCalcAging/index.vue
index 1e6f0390..41cfcf1d 100644
--- a/src/views/emis/emisNotCalcAging/index.vue
+++ b/src/views/emis/emisNotCalcAging/index.vue
@@ -1,12 +1,16 @@
 <template>
-  <XdPageContainer class="app-container">
-
-        <SearchForm slot="pageHeader" :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+  <div class="app-container">
+    <el-row :gutter="20" type='flex'>
+      <!-- <el-col :span="4" :xs="4" style="border-right:1px solid rgb(248 249 251);">
+        <CountryTreePicker placeholder="所属国家" v-model="queryParams.country"></CountryTreePicker>
+      </el-col> -->
+      <el-col :span="24" :xs="24">
+        <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
           <el-form-item label="国家" prop="country" label-width="40px">
             <CountryPicker :placeholder="$t('国家')" v-model="queryParams.country" @onChange="handleQuery"></CountryPicker>
           </el-form-item>
-          <el-form-item label="时效不计算日期" label-width="150px" prop="noCalcDay">
-            <elDateSimplePicker placeholder="日期范围" v-model="daterangeNoCalcDay"></elDateSimplePicker>
+          <el-form-item label="时效不计算日期" label-width="150px" prop="daterangeNoCalcDay">
+            <elDateSimplePicker placeholder="日期范围" v-model="queryParams.daterangeNoCalcDay"></elDateSimplePicker>
           </el-form-item>
 
         </SearchForm>
@@ -14,10 +18,6 @@
 
 
       <XdTable
-      slot="pageContent"
-          slot-scope="slotProps"
-          :height="(slotProps.contentHeight)+'px'"
-          
           v-loading="loading"
           border
           stripe
@@ -110,11 +110,11 @@
         </el-table-column>
       <el-table-column label="创建时间" align="center" prop="createTime" min-width="100" />
 
-      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建人" align="center" prop="createBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSite"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
-      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
-      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改人" align="center" prop="updateBy"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSite"  width="80" :show-overflow-tooltip="true"/>
       <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
 
       <el-table-column label="操作" align="center" class-name="small-padding fixed-width">
@@ -134,7 +134,11 @@
     <el-dialog :title="titleForm" :visible.sync="openForm" width="50%" :destroy-on-close="true" append-to-body>
       <emisNotCalcAgingForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisNotCalcAgingForm>
     </el-dialog>
-  </XdPageContainer>
+
+
+  </el-col>
+  </el-row>
+  </div>
 </template>
 
 <script>
@@ -207,6 +211,7 @@ export default {
         noCalcDay: null,
         status: null,
         remark: null,
+        daterangeNoCalcDay:null,
       },
       countryName:null,
       // 表单参数
@@ -252,9 +257,9 @@ export default {
       this.queryParams.params = {};
       console.log(this.daterangeNoCalcDay);
 
-      if (null != this.daterangeNoCalcDay && '' != this.daterangeNoCalcDay) {
-        this.queryParams.params["beginNoCalcDay"] = this.daterangeNoCalcDay[0];
-        this.queryParams.params["endNoCalcDay"] = this.daterangeNoCalcDay[1];
+      if (null != this.queryParams.daterangeNoCalcDay && '' != this.queryParams.daterangeNoCalcDay) {
+        this.queryParams.params["beginNoCalcDay"] = this.queryParams.daterangeNoCalcDay[0];
+        this.queryParams.params["endNoCalcDay"] = this.queryParams.daterangeNoCalcDay[1];
       }
 
       listEmisNotCalcAging(this.queryParams).then(response => {
diff --git a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
index 3f5996b8..3222c68c 100644
--- a/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/specialQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -72,6 +72,10 @@
 
 
     <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -234,7 +238,7 @@
       <specialQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></specialQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisQuotePrice/transQuotePriceList.vue b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
index bbe918a8..d331ec9a 100644
--- a/src/views/emis/emisQuotePrice/transQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/transQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -72,6 +72,10 @@
 
 
     <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -235,7 +239,7 @@
       <emisQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue b/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
index a6dc1f20..c61a6877 100644
--- a/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/vipSpecialQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -75,6 +75,10 @@
 
 
     <XdTable
+        slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -238,7 +242,7 @@
       <vipSpecialQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></vipSpecialQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue b/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
index 75e97c6b..dce40073 100644
--- a/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
+++ b/src/views/emis/emisQuotePrice/vipTransQuotePriceList.vue
@@ -1,7 +1,7 @@
 <template>
-  <div class="app-container">
+  <XdPageContainer class="app-container">
     <!-- <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px"> -->
-    <SearchForm  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm slot="pageHeader"  :model="queryParams" ref="queryForm"   size="small" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
 
       <el-form-item label="报价名称" prop="quoteName" span="8">
         <el-input
@@ -75,6 +75,11 @@
 
 
     <XdTable
+
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
           v-loading="loading"
           border
           stripe
@@ -240,7 +245,7 @@
       <vipTransQuotePriceForm :quoteId="currentId" :isCopy="isCopy" :chargeType="chargeType"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></vipTransQuotePriceForm>
     </el-dialog>
 
-  </div>
+  </XdPageContainer>
 </template>
 
 <script>
diff --git a/src/views/emis/emisSpecialCalcWeight/index.vue b/src/views/emis/emisSpecialCalcWeight/index.vue
index fc7227f6..3b591ce6 100644
--- a/src/views/emis/emisSpecialCalcWeight/index.vue
+++ b/src/views/emis/emisSpecialCalcWeight/index.vue
@@ -11,7 +11,7 @@
       <!-- @onChange="handleQuery" -->
       <!-- @change="handleQuery" -->
 
-      <el-form-item label="产品类型" prop="prodCode">
+      <el-form-item label="产品类型" prop="prodCodeSelArr">
         <TransProductCasPicker placeholder="产品类型" v-model="queryParams.prodCodeSelArr" :countryCode="queryParams.country" ></TransProductCasPicker>
       </el-form-item>
       <el-form-item label="取重方式" prop="carryType">
diff --git a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
index e379967e..c7ee0ff8 100644
--- a/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/coPackageScanning.vue
@@ -15,8 +15,10 @@
               <span slot="label">
                 <span style="color: red">{{$t('合包号')}}</span>
               </span>
-              <el-input v-model="form.bagNo" placeholder="请输入" >
-              </el-input>
+              <!-- <el-input v-model="form.bagNo" placeholder="请输入" >
+              </el-input> -->
+              <EmisPackNoPicker v-model="form.bagNo"   ></EmisPackNoPicker>
+
             </el-form-item>
           </el-col>
       </el-row>
@@ -128,13 +130,15 @@
 <script>
 import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
+import EmisPackNoPicker from '@/views/emis/EmisBaseTools/EmisPackNoPicker.vue';
+
 
 export default {
   name: "CoPackageScanning",
   props:{
     id:undefined
   },
-  components: { EmisGetNextSitePicker },
+  components: { EmisGetNextSitePicker,EmisPackNoPicker },
   dicts: ['emis_scan_type'],
   data() {
     return {
diff --git a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
similarity index 99%
rename from src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
rename to src/views/emis/emisTmsScanRecord/customsClearScan.vue
index a80fd755..ff89a452 100644
--- a/src/views/emis/emisTmsScanRecord/customsClearanceScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/customsClearScan.vue
@@ -12,6 +12,13 @@
               </el-input>
             </el-form-item>
           </el-col>
+        
+          <el-col :span="8">
+            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
+            </el-form-item>
+          </el-col>
+
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@@ -19,11 +26,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
-              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
-            </el-form-item>
-          </el-col>
 
         </el-form>
       </el-row>
@@ -125,7 +127,7 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 
 export default {
-  name: "CustomsClearanceScanning",
+  name: "CustomsClearScan",
   props:{
     id:undefined
   },
diff --git a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
similarity index 99%
rename from src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
rename to src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
index 2dc94183..db81d79b 100644
--- a/src/views/emis/emisTmsScanRecord/clearanceScanUnderDevelopment.vue
+++ b/src/views/emis/emisTmsScanRecord/customsDeclearScan.vue
@@ -12,6 +12,12 @@
               </el-input>
             </el-form-item>
           </el-col>
+          
+          <el-col :span="8">
+            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
+              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@@ -19,11 +25,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('下一站')" prop="preOrNextStation">
-              <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
-            </el-form-item>
-          </el-col>
 
         </el-form>
       </el-row>
@@ -125,7 +126,7 @@ import { doScan } from "@/api/emis/emisTmsScanRecord";
 import EmisGetNextSitePicker from '@/views/emis/EmisBaseTools/EmisGetNextSitePicker.vue';
 
 export default {
-  name: "ClearanceScanUnderDevelopment",
+  name: "CustomsDeclearScan",
   props:{
     id:undefined
   },
diff --git a/src/views/emis/emisTmsScanRecord/deliveryScan.vue b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
index c65671fc..d2bf2f90 100644
--- a/src/views/emis/emisTmsScanRecord/deliveryScan.vue
+++ b/src/views/emis/emisTmsScanRecord/deliveryScan.vue
@@ -12,6 +12,11 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
+              <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@@ -19,11 +24,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('派件员')" prop="dispatchOrSendManCode">
-              <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
-            </el-form-item>
-          </el-col>
+      
 
         </el-form>
       </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/outgoingScan.vue b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
index c11e81bd..cf05b206 100644
--- a/src/views/emis/emisTmsScanRecord/outgoingScan.vue
+++ b/src/views/emis/emisTmsScanRecord/outgoingScan.vue
@@ -12,13 +12,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="7">
-            <el-form-item label="重量" prop="scanWeight" label-width="60px">
-              <el-input v-model="form.scanWeight" placeholder="扫描重量" >
-                  <span slot="suffix">KG</span>
-              </el-input>
-            </el-form-item>
-          </el-col>
+       
           <el-col :span="8">
             <el-form-item :label="$t('下一站')" prop="preOrNextStation">
               <span slot="label">
@@ -27,6 +21,13 @@
               <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
             </el-form-item>
           </el-col>
+          <el-col :span="7">
+            <el-form-item label="重量" prop="scanWeight" label-width="60px">
+              <el-input v-model="form.scanWeight" placeholder="扫描重量" >
+                  <span slot="suffix">KG</span>
+              </el-input>
+            </el-form-item>
+          </el-col>
 
         </el-form>
       </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/scanRecord.vue b/src/views/emis/emisTmsScanRecord/scanRecord.vue
index dd89d452..55898190 100644
--- a/src/views/emis/emisTmsScanRecord/scanRecord.vue
+++ b/src/views/emis/emisTmsScanRecord/scanRecord.vue
@@ -12,6 +12,11 @@
               </el-input>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
+              <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
+            </el-form-item>
+          </el-col>
           <el-col :span="7">
             <el-form-item label="重量" prop="scanWeight" label-width="60px">
               <el-input v-model="form.scanWeight" placeholder="扫描重量" >
@@ -19,11 +24,6 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
-              <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
-            </el-form-item>
-          </el-col>
 
         </el-form>
       </el-row>
diff --git a/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue b/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
index 04086a07..02e7d20f 100644
--- a/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
+++ b/src/views/emis/emisTmsScanRecord/signatureAbnormalComparison.vue
@@ -11,7 +11,7 @@
           </el-col>
           <el-col :span="8">
             <el-form-item :label="$t('扫描站点')" prop="scanSiteCode" label-width="70px">
-              <EmisSiteSimplePicker v-model="queryParams.scanSiteCode"  @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
+              <EmisSiteSimplePicker v-model="queryParams.scanSiteCode" :parentSiteCode="$store.getters.ownerSiteCode" :blIncludeChildSite="1" @onChange="onScanSiteSelect"  ></EmisSiteSimplePicker>
             </el-form-item>
           </el-col>
           <el-col :span="8">
@@ -145,17 +145,17 @@
           </el-table-column>
           <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="100">
             <template slot-scope="scope">
-              <span>{{ (scope.row.destinationName) }}</span>
+              <span>{{ (scope.row.waybillDetail.destinationName) }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('寄件网点')" align="center" prop="registerSiteName" min-width="100">
             <template slot-scope="scope">
-              <span>{{ (scope.row.registerSiteName) }}</span>
+              <span>{{ (scope.row.waybillDetail.sendSiteName) }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="100">
             <template slot-scope="scope">
-              <span>{{ (scope.row.dispatchUnderlingSiteName) }}</span>
+              <span>{{ (scope.row.waybillDetail.dispatchUnderlingSiteName) }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100">
diff --git a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
index 2aa4f5c7..86bb7030 100644
--- a/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
+++ b/src/views/emis/emisTmsScanRecord/transmitReceiveScanning.vue
@@ -12,13 +12,7 @@
               </el-input>
             </el-form-item>
           </el-col>
-          <el-col :span="8">
-            <el-form-item label="重量" prop="scanWeight" label-width="100px">
-              <el-input v-model="form.scanWeight" placeholder="扫描重量" >
-                  <span slot="suffix">KG</span>
-              </el-input>
-            </el-form-item>
-          </el-col>
+         
           <el-col :span="8">
             <el-form-item :label="$t('取件员')" prop="dispatchOrSendManCode">
               <EmisUserSimplePicker v-model="form.dispatchOrSendManCode" postCode="RSD" @onChange="onStaffSelect"  ></EmisUserSimplePicker>
@@ -29,6 +23,13 @@
               <EmisGetNextSitePicker v-model="form.preOrNextStation"  @onChange="onSiteSelect"  ></EmisGetNextSitePicker>
             </el-form-item>
           </el-col>
+          <el-col :span="8">
+            <el-form-item label="重量" prop="scanWeight" label-width="100px">
+              <el-input v-model="form.scanWeight" placeholder="扫描重量" >
+                  <span slot="suffix">KG</span>
+              </el-input>
+            </el-form-item>
+          </el-col>
           <!-- <el-col :span="8">
             <el-form-item label="清单编号" prop="listNo" label-width="100px">
               <el-input v-model="form.listNo" placeholder="请输入" >
diff --git a/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue b/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
new file mode 100644
index 00000000..874c692c
--- /dev/null
+++ b/src/views/emis/emisTmsSiteBatch/waitGenBatchWaybillList.vue
@@ -0,0 +1,1087 @@
+<template>
+  <XdPageContainer class="app-container">
+
+    <SearchForm  slot="pageHeader" class="queryForm" :model="queryParams" ref="queryForm"   size="mini" :maxShow="9" label-width="100px"   v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+      <!-- <el-row :gutter="10">
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple">123</div></el-col>
+        <el-col :xs="8" :sm="6" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple-light">123</div></el-col>
+        <el-col :xs="8" :sm="6" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple">123</div></el-col>
+        <el-col :xs="8" :sm="6" :md="8" :lg="8" :xl="6"><div class="grid-content bg-purple-light">123</div></el-col>
+      </el-row> -->
+
+
+      <!-- label-width="100px" -->
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <!-- :span="6" -->
+        <el-col  :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+          <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+            <el-col :span="24">
+                <el-form-item label="" prop="billCode">
+                  <div slot="label">
+                      <el-radio-group class="query-label" v-model="queryOrderType">
+                        <el-radio :key="1" label="1">运单号</el-radio>
+                        <!-- <el-radio :key="0" label="0">订单号</el-radio> -->
+                      </el-radio-group>
+                  </div>
+                  <XdTextareaInput
+                    v-model="queryParams.billCode"
+                    :placeholder="$t('多个流水号逗号或换行隔开')"
+                    clearable
+                    :rows="4"
+                  />
+                        <!-- @keyup.enter.native="handleQuery" -->
+                </el-form-item>
+            </el-col>
+          </el-row>
+        </el-col>
+
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+          <el-form-item label="寄件网点" prop="productType">
+            <EmisSiteSimplePicker1  v-model="queryParams.sendSiteCode"  ></EmisSiteSimplePicker1>
+          </el-form-item>
+          <el-form-item label="目的网点" prop="dispatchUnderlingSiteCode">
+            <EmisSiteSimplePicker2  v-model="queryParams.dispatchUnderlingSiteCode"  ></EmisSiteSimplePicker2>
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+            <el-form-item label="月结客户" prop="custNo">
+              <EmisMonthpayAccountPicker v-model="queryParams.custNo" @onChange="handleQuery"></EmisMonthpayAccountPicker>
+            </el-form-item>
+            <el-form-item label="付款方式" prop="paymentType" >
+            <el-select clearable v-model="queryParams.paymentType" placeholder="请选择">
+                <el-option
+                  v-for="dict in dict.type.emis_payment_type"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+        </el-col>
+
+            <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+                  <el-form-item label="线路" prop="transLineType">
+                    <TransLinePicker v-model="queryParams.transLineType"  isInitiated="true"  @onChange="handleQuery"></TransLinePicker>
+                  </el-form-item>
+                  <el-form-item label="产品类型" prop="productType">
+                    <TransProductPicker placeholder="产品类型" v-model="queryParams.productType" :transLineCode="queryParams.transLineType" @onChange="handleQuery"></TransProductPicker>
+                  </el-form-item>
+
+
+            </el-col>
+      </el-row>
+
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :span="10">
+              <el-form-item label="查询时间范围" prop="dateTimeRange">
+                  <div slot="label">
+
+                          <el-radio-group  class="query-label" v-model="queryOrderDateType">
+                              <el-radio :key="1" label="1">发货时间</el-radio>
+                        </el-radio-group>
+
+                  </div>
+                  <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+              </el-form-item>
+              <el-form-item label="" prop="queryExpireNotSign">
+                <el-checkbox style="font-size:400;margin-right:10px;" v-model="queryParams.params.expireNotSign" :true-label="'1'" :false-label="'0'">超时未签收</el-checkbox>
+              </el-form-item>
+        </el-col>
+
+      </el-row>
+
+      <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+              <el-form-item label="寄件人" prop="sendName">
+                    <el-input
+                      v-model="queryParams.sendName"
+                      :placeholder="$t('寄件人')"
+                      clearable
+                      @keyup.enter.native="handleQuery"
+                    />
+                  </el-form-item>
+                  <el-form-item label="寄件电话" prop="sendMobile">
+              <el-input
+                v-model="queryParams.sendMobile"
+                :placeholder="$t('寄件人电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+              <el-form-item label="寄件公司" prop="sendCompany">
+                <el-input
+                  v-model="queryParams.sendCompany"
+                  :placeholder="$t('寄件公司')"
+                  clearable
+                  @keyup.enter.native="handleQuery"
+                />
+              </el-form-item>
+              <el-form-item label="寄件国家" prop="sendCountry">
+              <CountryPicker1 v-model="queryParams.sendCountry" :placeholder="$t('寄件国家')" @onChange="handleQuery"></CountryPicker1>
+            </el-form-item>
+            <el-form-item label="录单备注" prop="remark">
+              <el-input
+                v-model="queryParams.remark"
+                :placeholder="$t('录单备注')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+            <el-form-item label="费用备注" prop="feeRemark">
+              <el-input
+                v-model="queryParams.feeRemark"
+                :placeholder="$t('费用备注')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+
+
+        </el-col>
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+
+                  <el-form-item label="收件人" prop="receiveName">
+                  <el-input
+                    v-model="queryParams.receiveName"
+                    :placeholder="$t('收件人')"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+                <el-form-item label="收件电话" prop="receiveMobile">
+              <el-input
+                v-model="queryParams.receiveMobile"
+                :placeholder="$t('收件电话')"
+                clearable
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+
+            <el-form-item label="收件公司" prop="receiveCompany">
+                  <el-input
+                    v-model="queryParams.receiveCompany"
+                    :placeholder="$t('收件公司')"
+                    clearable
+                    @keyup.enter.native="handleQuery"
+                  />
+                </el-form-item>
+
+            <el-form-item label="目的国家" prop="sendCountry">
+              <CountryPicker2 v-model="queryParams.receiveCountry" :placeholder="$t('目的国家')" @onChange="handleQuery"></CountryPicker2>
+            </el-form-item>
+
+            <el-form-item label="目的省份" prop="receiveProvince">
+              <ProvincePicker2  v-model="queryParams.receiveProvince" :countryCode="queryParams.receiveCountry"  style="margin-left:5px"  ></ProvincePicker2>
+            </el-form-item>
+
+            <el-form-item label="签收状态" prop="signStatus">
+              <el-select clearable="" v-model="queryParams.params.signStatus" placeholder="请选择">
+                <el-option label="已签收" :value="1"></el-option>
+                <el-option label="未签收" :value="2"></el-option>
+              </el-select>
+            </el-form-item>
+
+        </el-col>
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+
+          <!-- <el-form-item label="运单状态" prop="siteType">
+              <el-select v-model="queryParams.waybillStatus" placeholder="运单状态" clearable filterable>
+                    <el-option
+                      v-for="dict in dict.type.emis_waybill_status"
+                      :key="dict.value"
+                      :label="dict.label"
+                      :value="dict.value"
+                    />
+              </el-select>
+            </el-form-item> -->
+
+            <el-form-item label="报关方式" prop="customsEclaration">
+                <el-select clearable v-model="queryParams.customsEclaration" placeholder="请选择">
+                  <el-option
+                    v-for="dict in dict.type.emis_declare_mode"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
+
+            <el-form-item  label="清关方式" prop="customsClear">
+              <el-select clearable v-model="queryParams.customsClear" placeholder="请选择">
+                <el-option
+                  v-for="dict in dict.type.emis_customs_clear"
+                  :key="dict.value"
+                  :label="dict.label"
+                  :value="dict.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+            <el-form-item label="派送方式" prop="dispatchMethod" >
+                    <el-select clearable v-model="queryParams.dispatchMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_tab_dispatch_mode"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                  </el-form-item>
+
+                  <el-form-item label="取件方式" prop="pickupMethod">
+                      <el-select v-model="queryParams.pickupMethod" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_qujian_fangshi"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+
+              <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
+                <EmisUserSimplePicker1  :placeholder="$t('取件员')" v-model="queryParams.takePieceEmployeeCode"></EmisUserSimplePicker1>
+              </el-form-item>
+
+              <el-form-item label="收款状态" prop="pickupMethod">
+                      <el-select v-model="queryParams.paymentStatus" placeholder="请选择">
+                        <el-option
+                          v-for="dict in dict.type.emis_payment_status"
+                          :key="dict.value"
+                          :label="dict.label"
+                          :value="dict.value"
+                        ></el-option>
+                      </el-select>
+                    </el-form-item>
+
+
+        </el-col>
+        <el-col :xs="8" :sm="8" :md="8" :lg="8" :xl="6">
+
+          <el-form-item label="问题件方式" prop="pickupMethod">
+            <el-select clearable="" v-model="queryParams.params.problemQueryType" placeholder="请选择">
+              <el-option label="只查问题件类型" :value="1"></el-option>
+              <el-option label="剔除问题件类型" :value="2"></el-option>
+            </el-select>
+          </el-form-item>
+
+          <el-form-item label="问题件类型" prop="problemType">
+            <ProblemTypePicker v-model="queryParams.problemType"  ></ProblemTypePicker>
+          </el-form-item>
+
+
+          <el-form-item :label="$t('回款联系人')" prop="payee">
+              <PayeePicker :placeholder="$t('回款联系人')" v-model="queryParams.payee"  ></PayeePicker>
+            </el-form-item>
+          <el-form-item :label="$t('销售联系人')" prop="salesmen">
+            <SalemanPicker :placeholder="$t('销售联系人')" v-model="queryParams.salesmen"  ></SalemanPicker>
+          </el-form-item>
+
+          <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
+              <EmisUserSimplePicker0  :placeholder="$t('操作员')" v-model="queryParams.operateEmployeeCode"></EmisUserSimplePicker0>
+              </el-form-item>
+          <el-form-item :label="$t('录单员')" prop="registerManCode">
+                <EmisUserSimplePicker1  :placeholder="$t('录单员')" v-model="queryParams.registerManCode"></EmisUserSimplePicker1>
+          </el-form-item>
+          <!-- <el-form-item label="是否问题件" prop="blIsQuestion" >
+              <el-select clearable v-model="queryParams.blIsQuestion" placeholder="请选择">
+                  <el-option :key="1" label="'1'" value="'1'">是</el-option>
+                  <el-option :key="0" label="'0'" value="'0'">否</el-option>
+                </el-select>
+            </el-form-item> -->
+
+          <!-- <el-form-item label="问题件原因" prop="problemCause">
+            <el-input
+              v-model="queryParams.problemCause"
+              :placeholder="$t('问题件原因')"
+              clearable
+              @keyup.enter.native="handleQuery"
+            />
+          </el-form-item> -->
+
+              <!-- <el-form-item :label="$t('派件员')" prop="dispatchManCode">
+                <EmisUserSimplePicker2  :placeholder="$t('派件员')" v-model="queryParams.dispatchManCode"></EmisUserSimplePicker2>
+              </el-form-item> -->
+
+        </el-col>
+      </el-row>
+
+    </SearchForm>
+
+
+    <XdTable
+          slot="pageContent"
+          slot-scope="slotProps"
+          :height="(slotProps.contentHeight)+'px'"
+
+          :row-class-name="tableRowClassName"
+           v-loading="loading"
+           border stripe
+           size="mini"
+           :data="emisWaybillList"
+           :showSearch.sync="showSearch"
+           :queryParams="queryParams"
+           :total="total"
+           @queryTable="getList"
+           @selection-change="handleSelectionChange"
+           @sort-change="handleSortChange"
+       
+           >
+
+      <div slot="toolbar">
+        <el-row :gutter="10" class="mb8">
+
+              <el-col :span="1.5">
+                <el-button
+                  type="warning"
+                  plain
+                  icon="el-icon-download"
+                  size="mini"
+                  @click="handleExport"
+                  v-hasPermi="['emis:emisWaybill:export']"
+                >导出</el-button>
+              </el-col>
+          </el-row>
+      </div>
+
+      <el-table-column type="selection" width="55" align="center" />
+
+      <el-table-column :label="$t('快件当前最新状态')" align="center" prop="lastTraceInfo" min-width="350" :show-overflow-tooltip="true" />
+
+      <el-table-column :label="$t('收款状态')" align="center" prop="paymentStatus" width="100" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_payment_status" :value="scope.row.paymentStatus"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" 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="pickupMethod" width="180" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+            <span>{{ scope.row.sendName }}--{{ scope.row.receiveName }}</span>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('快件类型')" align="center" prop="pickupMethod" width="180" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+            <span>{{ scope.row.sendSiteName }}--{{ scope.row.dispatchUnderlingSiteName }}</span>
+          </template>
+       </el-table-column>
+       <el-table-column :label="$t('预计送达时间')" align="center" prop="estimateDate" min-width="100" >
+          <template slot-scope="scope">
+            <span>{{ parseTime(scope.row.estimateDate, '{y}-{m}-{d}') }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('发货日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收件员')"  align="center" prop="takePieceEmployeeName" min-width="100" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==2">{{scope.row.takePieceEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+            <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" width="100" :show-overflow-tooltip="true"/> -->
+
+      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="120" :show-overflow-tooltip="true" />
+      <el-table-column :label="$t('合同号')" align="center" prop="custOrderId" width="100" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('线路')" align="center" prop="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('操作员')"   align="center" prop="operateEmployeeName" min-width="100" >
+        <template slot-scope="scope">
+             <span v-if="scope.row.pickupMethod==1">{{scope.row.operateEmployeeName}}</span>
+             <span v-else></span>
+          </template>
+      </el-table-column>
+      <el-table-column :label="$t('产品类型')" align="center" prop="productTypeName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="80" :show-overflow-tooltip="true"/>
+
+      <el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_declare_mode" :value="scope.row.customsEclaration"/>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_customs_clear" :value="scope.row.customsClear"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('录入人')" align="center" prop="registerManName" min-width="80" :show-overflow-tooltip="true" />
+
+      <!-- <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="80" :show-overflow-tooltip="true"/> -->
+
+      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="80" :show-overflow-tooltip="true">
+        <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==2 || scope.row.paymentType==4 || scope.row.paymentType==5">{{scope.row.customerName}}</span>
+             <span v-else></span>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('回款联系人')" align="center" prop="payee" min-width="100" />
+      <el-table-column :label="$t('销售联系人')" align="center" prop="salesmen" min-width="100" />
+
+      <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blIsQuestion==1" type="danger">是</el-tag>
+              <el-tag v-else type="info">否</el-tag>
+          </template>
+        </el-table-column>
+      <el-table-column :label="$t('问题件类型')" align="center" prop="problemTypeName" width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" width="80" :show-overflow-tooltip="true"/>
+      <!-- <el-table-column :label="$t('延期天数')" align="center" prop="problemDelayDays" width="80" :show-overflow-tooltip="true"/> -->
+      <el-table-column :label="$t('寄件网点')" align="center" prop="sendSiteName" min-width="80" :show-overflow-tooltip="true"/>
+      <el-table-column :label="$t('寄件财务中心')" align="center" prop="sendSiteFincailName" min-width="80" :show-overflow-tooltip="true"/>
+
+
+      <!-- <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+        <template slot-scope="scope">
+          <dict-tag :options="dict.type.emis_waybill_status" :value="scope.row.waybillStatus"/>
+        </template>
+      </el-table-column> -->
+
+
+        <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件手机')" align="center" prop="sendMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件国家')" align="center" prop="sendCountryName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('寄件省')" align="center" prop="sendProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件市')" align="center" prop="sendCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件区')" align="center" prop="sendCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('寄件/签收短信')" align="center" prop="blMessage" min-width="150" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <div v-if="scope.row.blMessage==1" >发送</div>
+              <div v-else>不发送</div>
+          </template>
+        </el-table-column>
+      <!-- <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/> -->
+<!--
+        <el-table-column :label="$t('起始国')" align="center" prop="sendCountryName" width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('目的国')" align="center" prop="receiveCountryName" width="80" :show-overflow-tooltip="true"/> -->
+
+
+        <el-table-column :label="$t('收货人')" align="center" prop="receiveName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货电话')" align="center" prop="receiveMobile" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货国家')" align="center" prop="receiveCountryName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货省')" align="center" prop="receiveProvinceName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货市')" align="center" prop="receiveCityName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货区')" align="center" prop="receiveCountyName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('收货地址')" align="center" prop="receiveAddress" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派货短信')" align="center" prop="blAcceptMessage" min-width="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+                <div v-if="scope.row.blAcceptMessage==1" >发送</div>
+                <div v-else>不发送</div>
+            </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('目的地')" align="center" prop="destinationName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('目的网点')" align="center" prop="dispatchUnderlingSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
+
+        <el-table-column :label="$t('货物名称')" align="center" prop="goodsInfo" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="80" >
+          <template slot-scope="scope">
+            <dict-tag :options="dict.type.emis_tab_packing_type" :value="scope.row.packType"/>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="80" />
+        <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="80" />
+        <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="80" />
+        <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="80" />
+        <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="80" />
+
+        <el-table-column :label="$t('派件方式')" align="center" prop="dispatchMethod" min-width="80" >
+          <template slot-scope="scope">
+              <div v-if="scope.row.dispatchMethod==1" >派送</div>
+              <div v-else>自提</div>
+          </template>
+        </el-table-column>
+
+        <el-table-column :label="$t('支付类型')" align="center" prop="paymentType" min-width="80" :show-overflow-tooltip="true" >
+          <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="80" >
+          <template slot-scope="scope">
+             <span v-if="scope.row.paymentType==3">{{scope.row.freight}}</span>
+             <span v-else>0</span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="80" />
+        <el-table-column :label="$t('保价金额')" align="center" prop="insureValue" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="80" :show-overflow-tooltip="true"/>
+
+
+        <el-table-column :label="$t('签收状态')" align="center" prop="waybillStatus" width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.waybillStatus=='50'" type="success">已签收</el-tag>
+              <el-tag v-else type="danger">未签收</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="80" :show-overflow-tooltip="true"/>
+
+        <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件人')" align="center" prop="dispatchManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSiteName" min-width="80" :show-overflow-tooltip="true"/>
+
+<!--
+        <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="80" >
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blPrint==1" type="success">已打印</el-tag>
+              <el-tag v-else type="danger">未打印</el-tag>
+          </template>
+        </el-table-column>
+        <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="80" />
+
+        <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('打印人')" align="center" prop="printManName" min-width="80" :show-overflow-tooltip="true"/>
+        <el-table-column :label="$t('打印站点')" align="center" prop="printSiteName" min-width="80" :show-overflow-tooltip="true"/> -->
+
+        <el-table-column :label="$t('录单网点')" align="center" prop="registerSiteName" min-width="80" :show-overflow-tooltip="true" />
+        <el-table-column :label="$t('录单备注')" align="center" prop="remark" min-width="80" :show-overflow-tooltip="true" />
+
+      <el-table-column :label="$t('数据来源')" align="center" prop="dataFrom" min-width="80" />
+
+      <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
+      <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/>
+      <el-table-column label="修改时间" align="center" prop="updateTime"  width="170"/>
+
+
+    </XdTable>
+
+    <!--
+    <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
+        <emisWaybillView :id="id" ></EmisWaybillView>
+    </el-dialog>
+    -->
+
+  </XdPageContainer>
+</template>
+
+<script>
+import 'element-ui/lib/theme-chalk/display.css';
+import { listEmisWaybill, getEmisWaybill, delEmisWaybill, addEmisWaybill, updateEmisWaybill } from "@/api/emis/emisWaybill";
+import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
+// import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
+import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm';
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+
+import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
+import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
+
+
+import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
+
+
+import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
+import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
+
+import EmisUserSimplePicker0 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker1 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+import EmisUserSimplePicker2 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
+
+import EmisSiteSimplePicker1 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+import EmisSiteSimplePicker2 from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue';
+
+import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue';
+
+import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
+
+
+import {dateToStr} from '@/utils/custom'
+import { formatSearchStr,deepClone } from '@/utils/index'
+
+export default {
+  name: "SendWaybillList",
+  // name: "DispatchWaybillList",
+
+  components: {
+    EmisMonthpayAccountPicker,
+    elDateAdvPicker,emisWaybillForm,
+    CountryPicker1,
+    CountryPicker2,ProvincePicker2,
+    TransLinePicker,TransProductPicker,
+    PayeePicker,
+    SalemanPicker,
+    EmisUserSimplePicker0,
+    EmisUserSimplePicker1,
+    EmisUserSimplePicker2,
+
+    EmisSiteSimplePicker1,
+    EmisSiteSimplePicker2,
+    ProblemTypePicker
+
+  },
+  dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
+        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
+        'emis_calc_fee_type','emis_print_type','emis_payment_status','emis_waybill_status','emis_tab_dispatch_mode'
+  ],
+  data() {
+    return {
+      tableHeight: 200,
+
+      // 遮罩层
+      loading: true,
+      // 选中数组
+      ids: [],
+      // 非单个禁用
+      single: true,
+      // 非多个禁用
+      multiple: true,
+      // 显示搜索条件
+      showSearch: true,
+      // 创建时间搜索
+      dateTimeRange:[],
+      // 总条数
+      total: 0,
+      // 运单列表表格数据
+      emisWaybillList: [],
+
+      currentId:null,
+      openForm: false,
+      titleForm: "",
+      billCode:null,
+
+      queryOrderType:null,
+      queryOrderDateType:null,
+      queryExpireNotSign:null,
+
+      // 弹出展示层
+      id:null,
+      titleView:"",
+      openView: false,
+      // 更新网点时间范围
+      daterangeOrderDate: [],
+      // 更新网点时间范围
+      daterangeEstimateDate: [],
+      // 更新网点时间范围
+      daterangePickStartDate: [],
+      // 更新网点时间范围
+      daterangePickFinishDate: [],
+      // 更新网点时间范围
+      daterangeDispFdDate: [],
+      // 更新网点时间范围
+      daterangeRegisterDate: [],
+      // 更新网点时间范围
+      daterangeSendDate: [],
+      // 更新网点时间范围
+      daterangeProduceBillDate: [],
+      // 更新网点时间范围
+      daterangeCreateTime: [],
+      // 更新网点时间范围
+      daterangeUpdateTime: [],
+      // 查询参数
+      queryParams: {
+        pageNum: 1,
+        pageSize: 20,
+        orderSn: null,
+        billCode: null,
+        billCodeSub: null,
+        orderStatus: null,
+        waybillStatus: null,
+        orderType: null,
+        orderDate: null,
+        customerCode: null,
+        customerName: null,
+        receiveCustomerCode: null,
+        receiveCustomerName: null,
+        thirdCustomerCode: null,
+        thirdCustomerName: null,
+        receiveName: null,
+        receiveCompany: null,
+        receiveMobile: null,
+        receiveTel: null,
+        receiveCountry: null,
+        receiveProvince: null,
+        receiveCity: null,
+        receiveCounty: null,
+        receiveTown: null,
+        receiveAddress: null,
+        receivePostcode: null,
+        receivePcd: null,
+        sendName: null,
+        sendCompany: null,
+        sendMobile: null,
+        sendTel: null,
+        sendCountry: null,
+        sendProvince: null,
+        sendCity: null,
+        sendCounty: null,
+        sendTown: null,
+        sendAddress: null,
+        sendPostcode: null,
+        sendPcd: null,
+        paymentType: null,
+        calcFeeType: null,
+        custNo: null,
+        transLineType: null,
+        productType: null,
+        timeType: null,
+        meterType: null,
+        customsClear: null,
+        customsEclaration: null,
+        estimateDate: null,
+        packType: null,
+        dispatchMethod: null,
+        pickupMethod: null,
+        pickStartDate: null,
+        pickFinishDate: null,
+        pickFailReason: null,
+        intoWarehouseCode: null,
+        intoWarehouseName: null,
+        intoWarehouseAddress: null,
+        intoWarehouseContact: null,
+        intoWarehousePhone: null,
+        intoWarehouseBillCode: null,
+        warehouseInNo: null,
+        customerDeliveryBeginTime: null,
+        customerDeliveryEndTime: null,
+        goodsType: null,
+        goodsInfo: null,
+        goodsPics: null,
+        blPrepareInFreight: null,
+        prepareInEstFee: null,
+        prepareInRealFee: null,
+        prepareInExpress: null,
+        prepareInBillCode: null,
+        prepareInRemark: null,
+        prepareInSupplier: null,
+        totalWeight: null,
+        totalVolume: null,
+        parcelQty: null,
+        billWeight: null,
+        volumeWeight: null,
+        currency: null,
+        settlementWeight: null,
+        feeWeight: null,
+        freight: null,
+        blOverLong: null,
+        blBill: null,
+        blOverWeight: null,
+        overWeightNumber: null,
+        feeRemaker: null,
+        thirdCode: null,
+        realValue: null,
+        blInsure: null,
+        insureValue: null,
+        insureValueCurrency: null,
+        insureFeeCurrency: null,
+        insureFee: null,
+        insureRemark: null,
+        insureSiteCode: null,
+        insureDate: null,
+        blPrint: null,
+        printManCode: null,
+        printSite: null,
+        printDate: null,
+        printCount: null,
+        blDispFd: null,
+        transferCode: null,
+        transferBillcode: null,
+        dispFdDate: null,
+        dispFdReason: null,
+        currentSiteCode: null,
+        lastSiteCode: null,
+        registerSiteCode: null,
+        registerDate: null,
+        registerManCode: null,
+        takePieceEmployeeCode: null,
+        sendSiteCode: null,
+        sendDate: null,
+        dispatchManCode: null,
+        dispatchDate: null,
+        dispatchSiteCode: null,
+        produceBillDate: null,
+        produceBillSiteCode: null,
+        produceBillManCode: null,
+        destinationCode: null,
+        destinationProvince: null,
+        destinationCity: null,
+        destinationCounty: null,
+        dispatchUnderlingSiteCode: null,
+        destinationCenterCode: null,
+        marketManCode: null,
+        payee: null,
+        salesmen: null,
+        operateEmployeeCode: null,
+        blIsQuestion: null,
+        problemType: null,
+        problemCause: null,
+        problemDelayDays: null,
+        blMessage: null,
+        blAcceptMessage: null,
+        blGenSubbill: null,
+        signMan: null,
+        signManCode: null,
+        signSiteCode: null,
+        signDate: null,
+        billPicSendRmk: null,
+        billPicDispatchRmk: null,
+        timezoneOffset: null,
+        delFlag: null,
+        remark: null,
+        params:{
+          signStatus:null,
+          expireNotSign:null,
+          problemQueryType:null,
+        }
+      },
+    };
+  },
+  created() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+
+    this.getList();
+    this.queryOrderType="1";
+    this.queryOrderDateType="1";
+    // this.queryExpireNotSign="1"
+
+    // 调整表格的高度，不允许滚动
+    this.$nextTick(function() {
+      let queryFormEl = this.$refs.queryForm.$el;
+      let tableH = queryFormEl.offsetHeight+190;
+      this.tableHeight = window.innerHeight - tableH;
+    });
+  },
+  mounted() {
+    const end = new Date()
+    const start = new Date()
+    start.setHours(0,0,0,0)
+    end.setHours(23,59,59,0)
+    this.dateTimeRange=[start,end];
+  },
+  methods: {
+      //标红table指定行
+    tableRowClassName({row, rowIndex}) {
+      if (row.blIsQuestion=='1') {
+        return 'warning-row';
+      } 
+      else if (row.waybillStatus=='50') {
+        return 'success-row';
+      } 
+
+      return '';
+    },
+    /** 查询运单列表列表 */
+    getList() {
+      this.loading = true;
+
+      let queryParams=deepClone(this.queryParams);
+
+    //   this.queryOrderType="1";
+    // this.queryOrderDateType="1";
+      if(queryParams.billCode){
+        if(this.queryOrderType != "1"){
+            queryParams.orderSn=formatSearchStr(queryParams.billCode);
+            queryParams.billCode=null;
+        }else{
+          // 处理子单号
+          let qBillCode=formatSearchStr(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{
+                newBillCodeStr=newBillCodeStr+item+",";
+              }
+          });
+          queryParams.billCode=newBillCodeStr;
+
+        }
+      }
+      if(this.dateTimeRange&&this.dateTimeRange.length==2){
+
+        let startDate = new Date(this.dateTimeRange[0]);
+        let endDate= new Date(this.dateTimeRange[1]);
+        startDate=dateToStr(startDate);
+        endDate=dateToStr(endDate)
+
+        if(this.queryOrderDateType != "1"){
+          queryParams.params["beginCreateTime"] = startDate;
+          queryParams.params["endCreateTime"] =  endDate;
+        }else{
+          queryParams.params["beginSendDate"] = startDate;
+          queryParams.params["endSendDate"] = endDate;
+        }
+      }
+
+      console.log(queryParams);
+
+      listEmisWaybill(queryParams).then(response => {
+        this.emisWaybillList = response.rows;
+        this.total = response.total;
+        this.loading = false;
+      });
+    },
+
+    onDateSelect(value){
+      this.dateTimeRange=value;
+      // scanDate
+    },
+    /** 搜索按钮操作 */
+    handleQuery() {
+      this.queryParams.pageNum = 1;
+      this.getList();
+    },
+    /** 重置按钮操作 */
+    resetQuery() {
+      this.resetForm("queryForm");
+      this.handleQuery();
+    },
+    // 多选框选中数据
+    handleSelectionChange(selection) {
+      if(selection!=null){
+        this.billCode=selection[0].billCode;
+      }
+      this.ids = selection.map(item => item.id)
+      this.single = selection.length!==1
+      this.multiple = !selection.length
+    },
+    // 排序 查询字段是表格中字段名字 动态取值排序顺序
+    handleSortChange(column) {
+      this.queryParams.orderByColumn = column.prop;
+      this.queryParams.isAsc = column.order;
+      this.getList();
+    },
+    /** 新增按钮操作 */
+    handleAdd(row) {
+      // <router-link :to="'/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+      this.$router.push({ path: '/d24/waybillManagement/WaybillEntry', query: { action:"add"} });
+    },
+
+    /** 修改按钮操作 */
+    handleUpdate(row) {
+      // const waybill = this.emisWaybillList.find(item => item.id === id)
+       this.$router.push({ path: '/d24/waybillManagement/WaybillModify', query: { action:"modify",billCode: this.billCode }})
+    },
+    handleView(row) {
+       this.$router.push({ path: '/d24/waybillManagement/WaybillDetail', query: { billCode: this.billCode }})
+    },
+    handleFormChanged(){
+        this.openForm = false;
+        this.getList();
+    },
+    cancelForm(){
+      this.openForm = false;
+    },
+    /** 删除按钮操作 */
+    handleDelete(row) {
+      const ids = row.id || this.ids;
+      this.$modal.confirm('是否确认删除').then(function() {
+        return delEmisWaybill(ids);
+      }).then(() => {
+        this.getList();
+        this.$modal.msgSuccess("删除成功");
+      }).catch(() => {});
+    },
+    /** 导出按钮操作 */
+    handleExport() {
+    //   this.download('emis/emisWaybill/export', {
+    //     ...this.queryParams
+    //   }, `emisWaybill_${new Date().getTime()}.xlsx`)
+     const loadingInstance = this.$loading({
+            text: '正在导出...'
+        })
+       var qParam = {...this.queryParams};
+       qParam.pageNum=1;
+       qParam.pageSize=5000;
+
+       listEmisWaybill(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','订单号','客户单号，合同号','运单号','子单号,逗号隔开','订单状态','运单状态','订单类型','下单时间','客户ID','客户编号2502021','客户名称','收件客户编号2502021','收件客户客户名称','第三方客户客户编号','第三方客户客户名称','wx','收货人名','收货公司','收货人手机号','收货人电话','收货人国家','省','市','区','县','收货地址','邮编','寄件人省市区名称，逗号分隔','寄件人名','寄件公司','寄件人手机号','寄件人电话','寄件人国家','寄件省','寄件市','寄件区','寄件县','寄件地址','寄件邮编','发件人省市区名称，逗号分隔','支付方式','计费方式','支付月结编号','快递线路','快递产品类型','时效','计泡比例','清关方式','报关方式','预计到达时间','包装类型','派件方式:1-送货上门','取件方式:1-上门取件','预计上门取件开始时间','预计上门取件结束时间','取货失败原因','入仓代码','入仓名称','入仓地址','入仓联系人','入仓联系人电话','入仓单号','实际进仓单关联','客户发货开始时间','客户发货截止时间','货物大类','货物描述','货物图片，逗号隔开','预入仓代垫运费','预入仓代垫运费','预入仓实际运费','预入仓快递公司','预入仓快递单号','预入仓自定义标识','预入仓供应商','总重量','总体积','件数','实际重量','体积重量','费用币种','结算重量','计费重量','运费','是否超长','是否出账','账单备注','是否超重','超重重量','费用备注','三段码','实际货值','是否投保','投保货值','投保货值币种','保费币种','保费','保险备注','保险站点代码','投保日期','是否打印','打印人编号','打印站点','打印时间','打印次数','是否同行转单','转单代码','转单单号','转单时间','转单原因','当前网点编号','下一网点编号','上一网点点号','寄件站点代码','寄件日期','寄件人编号','取件员代码','发件网点代码','发货时间','派件人代码','派件时间','派件网点代码','生成账单时间','生成账单站点代码','生成账单人代码','目的地编号','目的省','目的城市','目的国家','目的地网点代码','目的地财务中心代码','业务人代码','销售回款人','销售联系人','操作员代码','是否问题件','问题件类型','问题件原因','问题件延期天数','是否备注消息','是否发送收件人短信','是否生成子单','签收人','签收人代码','签收站点代码','签收时间','揽收图片备注','签收底单图片','时区偏差','删除标志（0代表存在','创建者','创建时间','更新者','更新时间','备注','创建网点','更新网点',];
+                  const filterVal = ['id','orderSn','custOrderId','billCode','billCodeSub','orderStatus','waybillStatus','orderType','orderDate','userId','customerCode','customerName','receiveCustomerCode','receiveCustomerName','thirdCustomerCode','thirdCustomerName','openId','receiveName','receiveCompany','receiveMobile','receiveTel','receiveCountry','receiveProvince','receiveCity','receiveCounty','receiveTown','receiveAddress','receivePostcode','receivePcd','sendName','sendCompany','sendMobile','sendTel','sendCountry','sendProvince','sendCity','sendCounty','sendTown','sendAddress','sendPostcode','sendPcd','paymentType','calcFeeType','custNo','transLineType','productType','timeType','meterType','customsClear','customsEclaration','estimateDate','packType','dispatchMethod','pickupMethod','pickStartDate','pickFinishDate','pickFailReason','intoWarehouseCode','intoWarehouseName','intoWarehouseAddress','intoWarehouseContact','intoWarehousePhone','intoWarehouseBillCode','warehouseInNo','customerDeliveryBeginTime','customerDeliveryEndTime','goodsType','goodsInfo','goodsPics','blPrepareInFreight','prepareInEstFee','prepareInRealFee','prepareInExpress','prepareInBillCode','prepareInRemark','prepareInSupplier','totalWeight','totalVolume','parcelQty','billWeight','volumeWeight','currency','settlementWeight','feeWeight','freight','blOverLong','blBill','blBillText','blOverWeight','overWeightNumber','feeRemaker','thirdCode','realValue','blInsure','insureValue','insureValueCurrency','insureFeeCurrency','insureFee','insureRemark','insureSiteCode','insureDate','blPrint','printManCode','printSite','printDate','printCount','blDispFd','transferCode','transferBillcode','dispFdDate','dispFdReason','currentSiteCode','nextSiteCode','lastSiteCode','registerSiteCode','registerDate','registerManCode','takePieceEmployeeCode','sendSiteCode','sendDate','dispatchManCode','dispatchDate','dispatchSiteCode','produceBillDate','produceBillSiteCode','produceBillManCode','destinationCode','destinationProvince','destinationCity','destinationCounty','dispatchUnderlingSiteCode','destinationCenterCode','marketManCode','payee','salesmen','operateEmployeeCode','blIsQuestion','problemType','problemCause','problemDelayDays','blMessage','blAcceptMessage','blGenSubbill','signMan','signManCode','signSiteCode','signDate','billPicSendRmk','billPicDispatchRmk','timezoneOffset','delFlag','createBy','createTime','updateBy','updateTime','remark','createSite','updateSite',];
+                  const data = this.formatJson(filterVal, curList, response.rows)
+                  excel.export_json_to_excel({
+                    header: tHeader,
+                    data,
+                    filename: '运单列表',
+                    autoWidth: true
+                  })
+                  loadingInstance.close()
+                })
+        }
+      });
+    },
+    formatJson(filterVal, jsonData, resData) {
+      let index = 0
+      return jsonData.map(v => filterVal.map(j => {
+        if (j === 'index') {
+          return ++index
+        }
+        if (j === 'status') {
+          var statusStr='xxx'
+          if(v[j] == 10){
+              statusStr='xxx'
+          }
+          return statusStr;
+        }
+        return v[j]
+      }))
+    },
+    /** 列索引函数  */
+    getIndex($index) {
+          return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
+    },
+    /** 时间搜索响应函数 */
+    dateTimeChange(value){
+        this.dateTimeRange=value;
+    },
+  }
+};
+</script>
+
+<style lang="scss" scoped>
+:deep .el-form-item__label-wrap {
+  margin-left: 0 !important;
+  }
+  .el-divider{
+    margin-top: 0px;
+    background: 0 0;
+    border-top: 1px solid #E6EBF5;
+  }
+  .el-divider__text {
+    color: #0955ee;
+    cursor: pointer;
+  }
+
+
+   .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+
+  .queryForm .el-form-item {
+    margin-bottom: 0px !important;
+  }
+
+  :deep .el-table .success-row {
+    color: rgb(21, 174, 31) !important;
+  }
+
+  :deep .el-table .warning-row {
+    color: #f51f1f !important;
+  }
+
+</style>
diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue
index bc3bae12..9f7b54d0 100644
--- a/src/views/emis/emisUser/index.vue
+++ b/src/views/emis/emisUser/index.vue
@@ -8,7 +8,7 @@
       <!--用户数据-->
       <el-col :span="24" :xs="24" >
         <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="20"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
-          <el-form-item label="所属国家" prop="countryCode">
+          <el-form-item label="所属国家" prop="params.countryCode">
               <CountryPicker :placeholder="$t('所属国家')" v-model="queryParams.params.countryCode" @onChange="handleQuery"></CountryPicker>
           </el-form-item>
           <el-form-item label="员工名称" prop="empName">
@@ -17,7 +17,7 @@
           <el-form-item label="员工编号" prop="empCode">
             <el-input v-model="queryParams.empCode" placeholder="员工编号" clearable @keyup.enter.native="handleQuery" @input="handleQuery"/>
           </el-form-item>
-          <el-form-item label="网点类型" prop="siteType">
+          <el-form-item label="网点类型" prop="params.siteType">
             <el-select v-model="queryParams.params.siteType" placeholder="网点类型" clearable filterable>
                   <el-option
                     v-for="dict in dict.type.emis_site_type"
@@ -385,7 +385,8 @@ export default {
         deptId: undefined,
         postIds: undefined,
         params:{
-          siteType:'4',
+          countryCode:null,
+          siteType:null,
           parentSiteCode:null,
           blIncludeChildSite:'1',
         }
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index a4ad320e..fc6a7217 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1233,6 +1233,7 @@ methods: {
   },
   initData() {
       this.reset();
+      this.form.productTypeSelArr=null;
 
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;