From 49393daa887f2f2430ea651a84278c4cb7151ec5 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 15 May 2024 07:36:32 +0800
Subject: [PATCH] md

---
 .../DatePickerAdv/elDateAdvPicker.vue         |   31 +-
 src/utils/TnPrinterSdk.js                     |  119 --
 .../EmisBaseTools/EmisSiteSimplePicker.vue    |    2 +-
 .../emisSpecialCalcWeightForm.vue             |   14 +-
 .../emis/emisWaybill/emisWaybillRecord.vue    |    6 +-
 src/views/emis/emisWaybill/waybillList.vue    | 1340 ++---------------
 src/views/system/post/index.vue               |    2 +-
 7 files changed, 195 insertions(+), 1319 deletions(-)
 delete mode 100644 src/utils/TnPrinterSdk.js

diff --git a/src/components/DatePickerAdv/elDateAdvPicker.vue b/src/components/DatePickerAdv/elDateAdvPicker.vue
index 52dede18..481085f9 100644
--- a/src/components/DatePickerAdv/elDateAdvPicker.vue
+++ b/src/components/DatePickerAdv/elDateAdvPicker.vue
@@ -1,21 +1,21 @@
 <template>
-  <div class="datetimepicker">
-      <el-date-picker
-         size="small"
+  <div class="date-box">
+    <!-- range-separator="-" -->
+    <el-date-picker
          v-show="true"
         v-model="datetimeRange"
         type="datetimerange"
-        range-separator="-"
+
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        align="left"
         ref="timeRangePicker"
         :picker-options="pickerOptions"
         @change="dateTimeChange"
+        width="100%"
       >
       </el-date-picker>
-      <i class="el-icon-date data_icon"></i>
   </div>
+
 </template>
 <script>
 export default {
@@ -26,13 +26,12 @@ export default {
   },
   props: {
       value: {
-        type: [String],
+        type: [String,Array],
         required: false
       },
   },
 	data() {
 		return {
-      value : [],
       selectType: '1', // 时间选择器当前选择
       datetimeRange: [],
       pickerOptions: {
@@ -182,13 +181,13 @@ export default {
 
 
 <style lang="scss" scoped>
-.datetimepicker {
-  position: relative;
-
-  .el-date-editor .el-input__inner {
-    border-left: none;
-    border-radius: 0 4px 4px 0;
-  }
- }
+.date-box >>> .el-date-editor.el-input,.el-date-editor.el-input__inner {
+  width: 146px;
+  margin: 0 10px;
+}
+.date-input >>> .el-input__inner {
+  width: 146px;
+  height: 40px;
+}
 
 </style>
diff --git a/src/utils/TnPrinterSdk.js b/src/utils/TnPrinterSdk.js
deleted file mode 100644
index 2915fddf..00000000
--- a/src/utils/TnPrinterSdk.js
+++ /dev/null
@@ -1,119 +0,0 @@
-import { Message } from 'element-ui'
-import { getToken } from '@/utils/auth'
-let websock = null
-let messageCallback = null
-let errorCallback = null
-let wsUrl = ''
-let tryTime = 0
-// 与后端的协商，websocket请求需要带上token参数
-/*
-命令名称：
-command
-getPrinterList: 获取打印机列表
-getPrinterTplList: 获取打印模版列表
-sendToPrint：发送打印
-getPrinterVer：获取打印组件版本信息
-*/
-
-// 接收ws后端返回的数据
-function websocketonmessage (e) {
-  messageCallback(JSON.parse(e.data))
-}
-
-/**
- * 发起websocket连接
- * @param {Object} agentData 需要向后台传递的参数数据
- */
-function websocketSend (agentData) {
-  // 加延迟是为了尽量让ws连接状态变为OPEN
-  setTimeout(() => {
-    // 添加状态判断，当为OPEN时，发送消息
-    if (websock.readyState === websock.OPEN) { // websock.OPEN = 1
-      // 发给后端的数据需要字符串化
-      websock.send(JSON.stringify(agentData))
-    }
-    if (websock.readyState === websock.CLOSED) { // websock.CLOSED = 3
-      console.log('websock.readyState=3')
-      Message.error('ws连接异常，请稍候重试')
-      errorCallback()
-    }
-  }, 500)
-}
-
-// 关闭ws连接
-function websocketclose (e) {
-  // e.code === 1000  表示正常关闭。 无论为何目的而创建, 该链接都已成功完成任务。
-  // e.code !== 1000  表示非正常关闭。
-  if (e && e.code !== 1000) {
-    Message.error('ws连接异常，请稍候重试')
-    errorCallback()
-    // // 如果需要设置异常重连则可替换为下面的代码，自行进行测试
-    // if (tryTime < 10) {
-    //   setTimeout(function() {
-    //    websock = null
-    //    tryTime++
-    //    initWebSocket()
-    //    console.log(`第${tryTime}次重连`)
-    //  }, 3 * 1000)
-    //} else {
-    //  Message.error('重连失败！请稍后重试')
-    //}
-  }
-}
-// 建立ws连接
-function websocketOpen (e) {
-  // console.log('ws连接成功')
-}
-
-// 初始化weosocket
-function initWebSocket () {
-  if (typeof (WebSocket) === 'undefined') {
-    Message.error('您的浏览器不支持WebSocket，无法获取数据')
-    return false
-  }
-
-  const token = 'X-Token=' + getToken()
-  // ws请求完整地址
-  const requstWsUrl = wsUrl + '?' + token
-  websock = new WebSocket(requstWsUrl)
-
-  websock.onmessage = function (e) {
-    websocketonmessage(e)
-  }
-  websock.onopen = function () {
-    websocketOpen()
-  }
-  websock.onerror = function () {
-    Message.error('ws连接异常，请稍候重试')
-    errorCallback()
-  }
-  websock.onclose = function (e) {
-    websocketclose(e)
-  }
-}
-
-/**
- * 发起websocket请求函数
- * @param {string} url ws连接地址
- * @param {Object} agentData 传给后台的参数
- * @param {function} successCallback 接收到ws数据，对数据进行处理的回调函数
- * @param {function} errCallback ws连接错误的回调函数
- */
-export function sendWebsocket (url, agentData, successCallback, errCallback) {
-  wsUrl = url
-  initWebSocket()
-  messageCallback = successCallback
-  errorCallback = errCallback
-  websocketSend(agentData)
-}
-
-/**
- * 关闭websocket函数
- */
-export function closeWebsocket () {
-  if (websock) {
-    websock.close() // 关闭websocket
-    websock.onclose() // 关闭websocket
-  }
-}
-
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
index f5d81980..d014e4f1 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
@@ -20,7 +20,7 @@
       @clear="onClear"
       @visible-change="reverseArrow"
       >
-        <el-option v-for="item in dataList" :key="item.siteCode" :label="item.siteCode+'-'+item.siteName" :value="item.siteCode" ></el-option>
+        <el-option v-for="item in dataList" :key="item.siteCode" :label="item.siteName" :value="item.siteCode" ></el-option>
     </el-select>
 
 
diff --git a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
index a7d89c6d..33336ee0 100644
--- a/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
+++ b/src/views/emis/emisSpecialCalcWeight/emisSpecialCalcWeightForm.vue
@@ -2,7 +2,7 @@
   <div >
     <el-row :gutter="0">
         <el-form ref="form" :model="form" :rules="rules" label-width="80px">
-          <el-col :span="12">
+          <!-- <el-col :span="12">
             <el-form-item label="所属国家" prop="country">
                 <CountryPicker :placeholder="$t('所属国家')" v-model="form.country" ></CountryPicker>
             </el-form-item>
@@ -11,9 +11,11 @@
             <el-form-item label="所属线路" prop="lineCode">
                 <TransLinePicker v-model="form.lineCode" :countryCode="form.country"></TransLinePicker>
             </el-form-item>
-          </el-col>
+          </el-col> -->
           <el-col :span="12">
             <el-form-item label="产品类型" prop="prodCode">
+              <TransProductCasPicker placeholder="产品类型" v-model="form.prodCodeSelArr"  @onChange="onProductChange" ></TransProductCasPicker>
+
               <TransProductPicker placeholder="产品类型" v-model="form.prodCode" :transLineCode="form.lineCode" @onChange="onProdChange"></TransProductPicker>
             </el-form-item>
           </el-col>
@@ -89,6 +91,7 @@ import { listEmisSpecialCalcWeight, getEmisSpecialCalcWeight, delEmisSpecialCalc
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 import CountryPicker from '@/views/emis/EmisBaseTools/CountryPicker.vue';
 import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
+import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
 
 export default {
   name: "emisSpecialCalcWeightForm",
@@ -97,7 +100,7 @@ export default {
       type:Number,
     }
   },
-  components: { CountryPicker,TransLinePicker,TransProductPicker },
+  components: { CountryPicker,TransLinePicker,TransProductCasPicker },
   dicts: [
         'sys_normal_disable',
         'emis_take_weight_method',
@@ -175,6 +178,7 @@ export default {
         id: null,
         country: null,
         lineCode: null,
+        prodCodeSelArr:null,
         prodCode: null,
         prodName: null,
         status: null,
@@ -193,6 +197,10 @@ export default {
       };
       this.resetForm("form");
     },
+    onProductChange(item){
+      this.form.lineCode=item[0];
+      this.form.prodCode=item[1];
+    },
     /** 提交按钮 */
     submitForm() {
       this.$refs["form"].validate(valid => {
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 6b639076..020103c6 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -314,7 +314,7 @@
                             :data="form.cargoList"
                             size="mini"
                             style="width: 100%"
-                            max-height="100px"
+                            max-height="300px"
                             @cell-mouse-enter="handleGoodsCellEnter"
                             @cell-mouse-leave="handleGoodsCellLeave"
                           >
@@ -489,7 +489,7 @@
                             stripe
                             :data="form.feeItems"
                             size="mini"
-                            max-height="100px"
+                            max-height="300px"
                             style="width: 100%"
                           >
                           <!-- @cell-mouse-enter="handleCellEnter"
@@ -644,8 +644,8 @@ import TransLinePicker from '@/views/emis/EmisBaseTools/TransLinePicker.vue';
 import TransProductPicker from '@/views/emis/EmisBaseTools/TransProductPicker.vue';
 
 import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-
 import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
 import ProvincePicker1 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
 import CityPicker1 from '@/views/emis/EmisBaseTools/CityPicker.vue';
 import DistrictPicker1 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 578399bb..781da75f 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -1,1175 +1,139 @@
 <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="orderSn">
-        <el-input
-          v-model="queryParams.orderSn"
-          :placeholder="$t('订单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="50"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
       <el-form-item label="" prop="billCode">
-        <el-input
-          v-model="queryParams.billCode"
-          :placeholder="$t('运单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <!-- <el-form-item label="" prop="billCodeSub">
-        <el-input
-          v-model="queryParams.billCodeSub"
-          :placeholder="$t('子单号,逗号隔开')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderStatus">
-        <el-input
-          v-model="queryParams.orderStatus"
-          :placeholder="$t('订单状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="waybillStatus">
-        <el-input
-          v-model="queryParams.waybillStatus"
-          :placeholder="$t('运单状态')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderType">
-        <el-input
-          v-model="queryParams.orderType"
-          :placeholder="$t('订单类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="orderDate">
-        <el-date-picker clearable
-          v-model="queryParams.orderDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('下单时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="customerCode">
-        <el-input
-          v-model="queryParams.customerCode"
-          :placeholder="$t('客户编号2502021')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerName">
-        <el-input
-          v-model="queryParams.customerName"
-          :placeholder="$t('客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveCustomerCode">
-        <el-input
-          v-model="queryParams.receiveCustomerCode"
-          :placeholder="$t('收件客户编号2502021')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveCustomerName">
-        <el-input
-          v-model="queryParams.receiveCustomerName"
-          :placeholder="$t('收件客户客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="thirdCustomerCode">
-        <el-input
-          v-model="queryParams.thirdCustomerCode"
-          :placeholder="$t('第三方客户客户编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="thirdCustomerName">
-        <el-input
-          v-model="queryParams.thirdCustomerName"
-          :placeholder="$t('第三方客户客户名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <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="receiveCompany">
-        <el-input
-          v-model="queryParams.receiveCompany"
-          :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="receiveTel">
-        <el-input
-          v-model="queryParams.receiveTel"
-          :placeholder="$t('收货人电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveCountry">
-        <el-input
-          v-model="queryParams.receiveCountry"
-          :placeholder="$t('收货人国家')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveProvince">
-        <el-input
-          v-model="queryParams.receiveProvince"
-          :placeholder="$t('省')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveCity">
-        <el-input
-          v-model="queryParams.receiveCity"
-          :placeholder="$t('市')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveCounty">
-        <el-input
-          v-model="queryParams.receiveCounty"
-          :placeholder="$t('区')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveTown">
-        <el-input
-          v-model="queryParams.receiveTown"
-          :placeholder="$t('县')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receiveAddress">
-        <el-input
-          v-model="queryParams.receiveAddress"
-          :placeholder="$t('收货地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receivePostcode">
-        <el-input
-          v-model="queryParams.receivePostcode"
-          :placeholder="$t('邮编')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="receivePcd">
-        <el-input
-          v-model="queryParams.receivePcd"
-          :placeholder="$t('寄件人省市区名称，逗号分隔')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <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="sendCompany">
-        <el-input
-          v-model="queryParams.sendCompany"
-          :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="sendTel">
-        <el-input
-          v-model="queryParams.sendTel"
-          :placeholder="$t('寄件人电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendCountry">
-        <el-input
-          v-model="queryParams.sendCountry"
-          :placeholder="$t('寄件人国家')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendProvince">
-        <el-input
-          v-model="queryParams.sendProvince"
-          :placeholder="$t('寄件省')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendCity">
-        <el-input
-          v-model="queryParams.sendCity"
-          :placeholder="$t('寄件市')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendCounty">
-        <el-input
-          v-model="queryParams.sendCounty"
-          :placeholder="$t('寄件区')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendTown">
-        <el-input
-          v-model="queryParams.sendTown"
-          :placeholder="$t('寄件县')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendAddress">
-        <el-input
-          v-model="queryParams.sendAddress"
-          :placeholder="$t('寄件地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendPostcode">
-        <el-input
-          v-model="queryParams.sendPostcode"
-          :placeholder="$t('寄件邮编')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendPcd">
-        <el-input
-          v-model="queryParams.sendPcd"
-          :placeholder="$t('发件人省市区名称，逗号分隔')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="paymentType">
-        <el-input
-          v-model="queryParams.paymentType"
-          :placeholder="$t('支付方式')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="calcFeeType">
-        <el-input
-          v-model="queryParams.calcFeeType"
-          :placeholder="$t('计费方式')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="custNo">
-        <el-input
-          v-model="queryParams.custNo"
-          :placeholder="$t('支付月结编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="transLineType">
-        <el-input
-          v-model="queryParams.transLineType"
-          :placeholder="$t('快递线路')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="productType">
-        <el-input
-          v-model="queryParams.productType"
-          :placeholder="$t('快递产品类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="timeType">
-        <el-input
-          v-model="queryParams.timeType"
-          :placeholder="$t('时效')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="meterType">
-        <el-input
-          v-model="queryParams.meterType"
-          :placeholder="$t('计泡比例')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customsClear">
-        <el-input
-          v-model="queryParams.customsClear"
-          :placeholder="$t('清关方式')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customsEclaration">
-        <el-input
-          v-model="queryParams.customsEclaration"
-          :placeholder="$t('报关方式')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="estimateDate">
-        <el-date-picker clearable
-          v-model="queryParams.estimateDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('预计到达时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="packType">
-        <el-input
-          v-model="queryParams.packType"
-          :placeholder="$t('包装类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispatchMethod">
-        <el-input
-          v-model="queryParams.dispatchMethod"
-          :placeholder="$t('派件方式:1-送货上门')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pickupMethod">
-        <el-input
-          v-model="queryParams.pickupMethod"
-          :placeholder="$t('取件方式:1-上门取件')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="pickStartDate">
-        <el-date-picker clearable
-          v-model="queryParams.pickStartDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('预计上门取件开始时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="pickFinishDate">
-        <el-date-picker clearable
-          v-model="queryParams.pickFinishDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('预计上门取件结束时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="pickFailReason">
-        <el-input
-          v-model="queryParams.pickFailReason"
-          :placeholder="$t('取货失败原因')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="intoWarehouseCode">
-        <el-input
-          v-model="queryParams.intoWarehouseCode"
-          :placeholder="$t('入仓代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="intoWarehouseName">
-        <el-input
-          v-model="queryParams.intoWarehouseName"
-          :placeholder="$t('入仓名称')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="intoWarehouseAddress">
-        <el-input
-          v-model="queryParams.intoWarehouseAddress"
-          :placeholder="$t('入仓地址')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="intoWarehouseContact">
-        <el-input
-          v-model="queryParams.intoWarehouseContact"
-          :placeholder="$t('入仓联系人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="intoWarehousePhone">
-        <el-input
-          v-model="queryParams.intoWarehousePhone"
-          :placeholder="$t('入仓联系人电话')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="intoWarehouseBillCode">
-        <el-input
-          v-model="queryParams.intoWarehouseBillCode"
-          :placeholder="$t('入仓单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="warehouseInNo">
-        <el-input
-          v-model="queryParams.warehouseInNo"
-          :placeholder="$t('实际进仓单关联')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerDeliveryBeginTime">
-        <el-input
-          v-model="queryParams.customerDeliveryBeginTime"
-          :placeholder="$t('客户发货开始时间')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="customerDeliveryEndTime">
-        <el-input
-          v-model="queryParams.customerDeliveryEndTime"
-          :placeholder="$t('客户发货截止时间')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsType">
-        <el-input
-          v-model="queryParams.goodsType"
-          :placeholder="$t('货物大类')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsInfo">
-        <el-input
-          v-model="queryParams.goodsInfo"
-          :placeholder="$t('货物描述')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="goodsPics">
-        <el-input
-          v-model="queryParams.goodsPics"
-          :placeholder="$t('货物图片，逗号隔开')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blPrepareInFreight">
-        <el-input
-          v-model="queryParams.blPrepareInFreight"
-          :placeholder="$t('预入仓代垫运费')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prepareInEstFee">
-        <el-input
-          v-model="queryParams.prepareInEstFee"
-          :placeholder="$t('预入仓代垫运费')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prepareInRealFee">
-        <el-input
-          v-model="queryParams.prepareInRealFee"
-          :placeholder="$t('预入仓实际运费')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prepareInExpress">
-        <el-input
-          v-model="queryParams.prepareInExpress"
-          :placeholder="$t('预入仓快递公司')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prepareInBillCode">
-        <el-input
-          v-model="queryParams.prepareInBillCode"
-          :placeholder="$t('预入仓快递单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prepareInRemark">
-        <el-input
-          v-model="queryParams.prepareInRemark"
-          :placeholder="$t('预入仓自定义标识')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="prepareInSupplier">
-        <el-input
-          v-model="queryParams.prepareInSupplier"
-          :placeholder="$t('预入仓供应商')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="totalWeight">
-        <el-input
-          v-model="queryParams.totalWeight"
-          :placeholder="$t('总重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="totalVolume">
-        <el-input
-          v-model="queryParams.totalVolume"
-          :placeholder="$t('总体积')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="parcelQty">
-        <el-input
-          v-model="queryParams.parcelQty"
-          :placeholder="$t('件数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billWeight">
-        <el-input
-          v-model="queryParams.billWeight"
-          :placeholder="$t('实际重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="volumeWeight">
-        <el-input
-          v-model="queryParams.volumeWeight"
-          :placeholder="$t('体积重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="currency">
-        <el-input
-          v-model="queryParams.currency"
-          :placeholder="$t('费用币种')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="settlementWeight">
-        <el-input
-          v-model="queryParams.settlementWeight"
-          :placeholder="$t('结算重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="feeWeight">
-        <el-input
-          v-model="queryParams.feeWeight"
-          :placeholder="$t('计费重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="freight">
-        <el-input
-          v-model="queryParams.freight"
-          :placeholder="$t('运费')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blOverLong">
-        <el-input
-          v-model="queryParams.blOverLong"
-          :placeholder="$t('是否超长')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blBill">
-        <el-input
-          v-model="queryParams.blBill"
-          :placeholder="$t('是否出账')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blOverWeight">
-        <el-input
-          v-model="queryParams.blOverWeight"
-          :placeholder="$t('是否超重')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="overWeightNumber">
-        <el-input
-          v-model="queryParams.overWeightNumber"
-          :placeholder="$t('超重重量')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="feeRemaker">
-        <el-input
-          v-model="queryParams.feeRemaker"
-          :placeholder="$t('费用备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="thirdCode">
-        <el-input
-          v-model="queryParams.thirdCode"
-          :placeholder="$t('三段码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="realValue">
-        <el-input
-          v-model="queryParams.realValue"
-          :placeholder="$t('实际货值')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blInsure">
-        <el-input
-          v-model="queryParams.blInsure"
-          :placeholder="$t('是否投保')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureValue">
-        <el-input
-          v-model="queryParams.insureValue"
-          :placeholder="$t('投保货值')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureValueCurrency">
-        <el-input
-          v-model="queryParams.insureValueCurrency"
-          :placeholder="$t('投保货值币种')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureFeeCurrency">
-        <el-input
-          v-model="queryParams.insureFeeCurrency"
-          :placeholder="$t('保费币种')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureFee">
-        <el-input
-          v-model="queryParams.insureFee"
-          :placeholder="$t('保费')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureRemark">
-        <el-input
-          v-model="queryParams.insureRemark"
-          :placeholder="$t('保险备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureSiteCode">
-        <el-input
-          v-model="queryParams.insureSiteCode"
-          :placeholder="$t('保险站点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="insureDate">
-        <el-input
-          v-model="queryParams.insureDate"
-          :placeholder="$t('投保日期')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blPrint">
-        <el-input
-          v-model="queryParams.blPrint"
-          :placeholder="$t('是否打印')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="printManCode">
-        <el-input
-          v-model="queryParams.printManCode"
-          :placeholder="$t('打印人编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="printSite">
-        <el-input
-          v-model="queryParams.printSite"
-          :placeholder="$t('打印站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="printDate">
-        <el-input
-          v-model="queryParams.printDate"
-          :placeholder="$t('打印时间')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="printCount">
-        <el-input
-          v-model="queryParams.printCount"
-          :placeholder="$t('打印次数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blDispFd">
-        <el-input
-          v-model="queryParams.blDispFd"
-          :placeholder="$t('是否同行转单')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="transferCode">
-        <el-input
-          v-model="queryParams.transferCode"
-          :placeholder="$t('转单代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="transferBillcode">
-        <el-input
-          v-model="queryParams.transferBillcode"
-          :placeholder="$t('转单单号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispFdDate">
-        <el-date-picker clearable
-          v-model="queryParams.dispFdDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('转单时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="dispFdReason">
-        <el-input
-          v-model="queryParams.dispFdReason"
-          :placeholder="$t('转单原因')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="currentSiteCode">
-        <el-input
-          v-model="queryParams.currentSiteCode"
-          :placeholder="$t('当前网点编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="lastSiteCode">
-        <el-input
-          v-model="queryParams.lastSiteCode"
-          :placeholder="$t('上一网点点号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="registerSiteCode">
-        <el-input
-          v-model="queryParams.registerSiteCode"
-          :placeholder="$t('寄件站点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="registerDate">
-        <el-date-picker clearable
-          v-model="queryParams.registerDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('寄件日期')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="registerManCode">
-        <el-input
-          v-model="queryParams.registerManCode"
-          :placeholder="$t('寄件人编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="takePieceEmployeeCode">
-        <el-input
-          v-model="queryParams.takePieceEmployeeCode"
-          :placeholder="$t('取件员代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendSiteCode">
-        <el-input
-          v-model="queryParams.sendSiteCode"
-          :placeholder="$t('发件网点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="sendDate">
-        <el-date-picker clearable
-          v-model="queryParams.sendDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('发货时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="dispatchManCode">
-        <el-input
-          v-model="queryParams.dispatchManCode"
-          :placeholder="$t('派件人代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispatchDate">
-        <el-input
-          v-model="queryParams.dispatchDate"
-          :placeholder="$t('派件时间')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispatchSiteCode">
-        <el-input
-          v-model="queryParams.dispatchSiteCode"
-          :placeholder="$t('派件网点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="produceBillDate">
-        <el-date-picker clearable
-          v-model="queryParams.produceBillDate"
-          type="date"
-          value-format="yyyy-MM-dd HH:mm:ss"
-          :placeholder="$t('生成账单时间')">
-        </el-date-picker>
-      </el-form-item>
-      <el-form-item label="" prop="produceBillSiteCode">
-        <el-input
-          v-model="queryParams.produceBillSiteCode"
-          :placeholder="$t('生成账单站点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="produceBillManCode">
-        <el-input
-          v-model="queryParams.produceBillManCode"
-          :placeholder="$t('生成账单人代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="destinationCode">
-        <el-input
-          v-model="queryParams.destinationCode"
-          :placeholder="$t('目的地编号')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="destinationProvince">
-        <el-input
-          v-model="queryParams.destinationProvince"
-          :placeholder="$t('目的省')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="destinationCity">
-        <el-input
-          v-model="queryParams.destinationCity"
-          :placeholder="$t('目的城市')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="destinationCounty">
-        <el-input
-          v-model="queryParams.destinationCounty"
-          :placeholder="$t('目的国家')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="dispatchUnderlingSiteCode">
-        <el-input
-          v-model="queryParams.dispatchUnderlingSiteCode"
-          :placeholder="$t('目的地网点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="destinationCenterCode">
-        <el-input
-          v-model="queryParams.destinationCenterCode"
-          :placeholder="$t('目的地财务中心代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="marketManCode">
-        <el-input
-          v-model="queryParams.marketManCode"
-          :placeholder="$t('业务人代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="payee">
-        <el-input
-          v-model="queryParams.payee"
-          :placeholder="$t('销售回款人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="salesmen">
-        <el-input
-          v-model="queryParams.salesmen"
-          :placeholder="$t('销售联系人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="operateEmployeeCode">
-        <el-input
-          v-model="queryParams.operateEmployeeCode"
-          :placeholder="$t('操作员代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blIsQuestion">
-        <el-input
-          v-model="queryParams.blIsQuestion"
-          :placeholder="$t('是否问题件')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="problemType">
-        <el-input
-          v-model="queryParams.problemType"
-          :placeholder="$t('问题件类型')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="" prop="problemDelayDays">
-        <el-input
-          v-model="queryParams.problemDelayDays"
-          :placeholder="$t('问题件延期天数')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blMessage">
-        <el-input
-          v-model="queryParams.blMessage"
-          :placeholder="$t('是否备注消息')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blAcceptMessage">
-        <el-input
-          v-model="queryParams.blAcceptMessage"
-          :placeholder="$t('是否发送收件人短信')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="blGenSubbill">
-        <el-input
-          v-model="queryParams.blGenSubbill"
-          :placeholder="$t('是否生成子单')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="signMan">
-        <el-input
-          v-model="queryParams.signMan"
-          :placeholder="$t('签收人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="signManCode">
-        <el-input
-          v-model="queryParams.signManCode"
-          :placeholder="$t('签收人代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="signSiteCode">
-        <el-input
-          v-model="queryParams.signSiteCode"
-          :placeholder="$t('签收站点代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="signDate">
-        <el-input
-          v-model="queryParams.signDate"
-          :placeholder="$t('签收时间')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billPicSendRmk">
-        <el-input
-          v-model="queryParams.billPicSendRmk"
-          :placeholder="$t('揽收图片备注')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="billPicDispatchRmk">
-        <el-input
-          v-model="queryParams.billPicDispatchRmk"
-          :placeholder="$t('签收底单图片')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="timezoneOffset">
-        <el-input
-          v-model="queryParams.timezoneOffset"
-          :placeholder="$t('时区偏差')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="delFlag">
-        <el-input
-          v-model="queryParams.delFlag"
-          :placeholder="$t('删除标志（0代表存在')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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> -->
+              <div slot="label">
+                <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
+                    <el-radio label="1">运单号</el-radio>
+                    <el-radio label="0">订单号</el-radio>
+                  </el-radio-group>
+              </div>
+              <el-input
+                v-model="queryParams.billCode"
+                :placeholder="$t('多个流水号逗号或换行隔开')"
+                clearable
+                          type="textarea"
+                          rows="2"
+                @keyup.enter.native="handleQuery"
+              />
+            </el-form-item>
+
+
+
+            <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="receiveCountry">
+              <CountryPicker0 v-model="queryParams.receiveCountry" :placeholder="$t('目的国')" @onChange="handleQuery"></CountryPicker0>
+            </el-form-item>
+
+            <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="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 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 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="paymentType" label-width="70px">
+              <el-select 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-form-item label="" prop="dateTimeRange">
+              <div slot="label">
+                      <el-radio-group  class="query-label" v-model="queryParams.params.queryOrderDateType">
+                          <el-radio label="1">下单时间</el-radio>
+                          <el-radio label="0">录单时间</el-radio>
+                        </el-radio-group>
+              </div>
+              <elDateAdvPicker clearable v-model="dateTimeRange" @dateTimeChange="onDateSelect" ></elDateAdvPicker>
+            </el-form-item>
+
+
+
     </SearchForm>
 
 
@@ -1318,7 +282,7 @@
             </router-link>
          </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="orderSn" width="100" :show-overflow-tooltip="true"/> -->
       <el-table-column :label="$t('进仓单号')" align="center" prop="warehouseInNo" width="100" :show-overflow-tooltip="true"/>
       <!-- <el-table-column :label="$t('子单号,逗号隔开')" align="center" prop="billCodeSub" min-width="100" /> -->
       <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
@@ -1329,7 +293,7 @@
        </el-table-column>
        <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" />
 
-       <el-table-column :label="$t('国家')" align="center" prop="receiveCountryName" min-width="100" />
+       <el-table-column :label="$t('国家')" align="center" prop="receiveCountryName" width="100" />
        <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="timeType" min-width="100" />
@@ -1488,12 +452,15 @@ import { listEmisWaybill, getEmisWaybill, delEmisWaybill, addEmisWaybill, update
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
 // import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
 import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm';
-import { sendWebsocket, closeWebsocket } from '@/utils/TnPrinterSdk.js'
+import elDateAdvPicker from '@/components/DatePickerAdv/elDateAdvPicker';
+import CountryPicker0 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+import CountryPicker1 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
+
 
 export default {
-  name: "WaybillList",
-  components: { elDateSimplePicker,emisWaybillForm },
-  dicts: ['emis_waybill_status'
+  name: "WaybillIsPrinted",
+  components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
+  dicts: ['emis_waybill_status','emis_declare_mode','emis_customs_clear','emis_payment_type'
   ],
   data() {
     return {
@@ -1692,6 +659,10 @@ export default {
         timezoneOffset: null,
         delFlag: null,
         remark: null,
+        params:{
+          queryOrderType:1,
+          queryOrderDateType:1
+        }
       },
     };
   },
@@ -1750,6 +721,11 @@ export default {
       });
     },
 
+    onDateSelect(value){
+      console.log("date picker---->", value)
+      this.dateTimeRange=value;
+      // scanDate
+    },
     /** 搜索按钮操作 */
     handleQuery() {
       this.queryParams.pageNum = 1;
@@ -1869,7 +845,8 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+
   .el-divider{
     margin-top: 0px;
     background: 0 0;
@@ -1879,4 +856,15 @@ export default {
     color: #0955ee;
     cursor: pointer;
   }
+
+
+   .query-label {
+    .el-radio{
+        display: block;
+        line-height: 23px;
+        white-space: normal;
+        margin-right: 0;
+    }
+  }
+
 </style>
diff --git a/src/views/system/post/index.vue b/src/views/system/post/index.vue
index 444bf634..c71650ae 100644
--- a/src/views/system/post/index.vue
+++ b/src/views/system/post/index.vue
@@ -81,7 +81,7 @@
 
     <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
-      <el-table-column label="岗位编号" align="center" prop="postId" />
+      <!-- <el-table-column label="岗位编号" align="center" prop="postId" /> -->
       <el-table-column label="岗位编码" align="center" prop="postCode" />
       <el-table-column label="岗位名称" align="center" prop="postName" />
       <el-table-column label="岗位排序" align="center" prop="postSort" />