From 251bc69e0a71c2b527fc564de58b2066766cd761 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Fri, 17 May 2024 06:28:20 +0800
Subject: [PATCH] md

---
 package.json                                  |    2 +
 .../emis/EmisBaseTools/CountryPicker.vue      |   82 +-
 .../EmisBaseTools/EmisUserSimplePicker.vue    |  108 +-
 .../EmisBaseTools/TransProductCasPicker.vue   |   36 +-
 .../emis/emisCustomerUser/monthUserList.vue   |   10 +
 .../emisQuotePrice/emisQuotePriceForm.vue     |   21 +-
 src/views/emis/emisSite/index.vue             |    1 -
 src/views/emis/emisUser/index.vue             |   31 +-
 .../emis/emisWaybill/emisWaybillRecord.vue    |  239 +-
 src/views/emis/emisWaybill/orderList.vue      | 2175 ++++-------------
 src/views/emis/emisWaybill/orderRecord.vue    | 1467 ++++++-----
 src/views/emis/emisWaybill/waybillList.vue    |  370 ++-
 vue.config.js                                 |   13 +-
 13 files changed, 1771 insertions(+), 2784 deletions(-)

diff --git a/package.json b/package.json
index 78d75519..8abfd5a6 100644
--- a/package.json
+++ b/package.json
@@ -115,12 +115,14 @@
     "el-tree-select": "^3.1.14",
     "eslint": "7.15.0",
     "eslint-plugin-vue": "7.2.0",
+    "hard-source-webpack-plugin": "^0.13.1",
     "lint-staged": "10.5.3",
     "runjs": "4.4.2",
     "sass": "1.32.13",
     "sass-loader": "10.1.1",
     "script-ext-html-webpack-plugin": "2.1.5",
     "script-loader": "^0.7.2",
+    "speed-measure-webpack-plugin": "^1.5.0",
     "svg-sprite-loader": "5.1.1",
     "vue-template-compiler": "2.6.12",
     "webpack-bundle-analyzer": "^4.9.1"
diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue
index 064b486c..8d41e706 100644
--- a/src/views/emis/EmisBaseTools/CountryPicker.vue
+++ b/src/views/emis/EmisBaseTools/CountryPicker.vue
@@ -1,17 +1,20 @@
 <template>
    <el-select
       style="width:100%"
+      ref="selectRef"
       filterable
       clearable
+      remote
+      :remote-method="queryData"
       v-model="svalue"
       :placeholder="placeholder"
-      :filter-method="dataFilter"
       @blur="onBlur"
       @change="onChange"
+      @focus="onFocus"
+      @visible-change="reverseArrow"
       >
         <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
     </el-select>
-    <!-- style="width:100%" -->
 </template>
 <script>
   import emitter from 'element-ui/src/mixins/emitter';
@@ -32,58 +35,67 @@
     },
     data() {
       return {
-        bakOptionItems:[],
         optionItems: [],
         svalue: this.value,
-        optionDefault:null,
+        countryCode:null,
         countryMap:new Map(),
       };
     },
     watch: {
       value(newVal) {
         this.svalue = newVal;
+        if(this.svalue!=null) {
+          this.countryCode=this.svalue;
+        }
       },
     },
     created() {
-      this.initData();
+      this.queryData();
+    },
+    mounted(){
+      let rulesDom = this.$refs["selectRef"].$el.querySelector(".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"); // 找到dom
+      rulesDom.classList.add("el-icon-arrow-up"); // 对dom新增class
     },
     methods: {
+      onFocus(){
+        this.countryCode=null;
+        this.queryData();
+      },
       onBlur(val){
         this.$emit("input", this.svalue);
-        this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
+        this.dispatch('ElFormItem', 'el.form.blur');
       },
       onChange() {
-        this.$emit("input", this.svalue);
-        let itemData ={};
-        this.optionItems.forEach(item=>{
-          if(item.code === this.svalue){
-            itemData = item;
-          }
-        });
-        this.$emit("change",itemData);
-        this.$emit("onChange",itemData);
-        this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
-        this.optionItems = this.bakOptionItems;
-      },
-      initData() {
-        let queryParams = {};
-        listSimpleEmisCountry(queryParams).then(response => {
-          this.bakOptionItems =  response.rows;
-          this.optionItems =this.bakOptionItems;
-        });
-      },
-      dataFilter(val) {
-        this.optionDefault = val
-
-        if (val) {
-          let searchVal = val.toLowerCase();
-          this.optionItems = this.bakOptionItems.filter(item => {
-            if (item.code.indexOf(searchVal) != -1 || item.name.toLowerCase().indexOf(searchVal) != -1 || item.nameEn.toLowerCase().indexOf(searchVal) != -1) {
-              return true
+        if(this.svalue!=null){
+          this.$emit("input", this.svalue);
+          let itemData ={};
+          this.optionItems.forEach(item=>{
+            if(item.code === this.svalue){
+              itemData = item;
             }
-          })
+          });
+          this.$emit("change",itemData);
+          this.$emit("onChange",itemData);
+          this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
+        }
+      },
+      queryData(val) {
+        let queryParams = {
+          code:this.countryCode,
+          name:val
+        };
+        listSimpleEmisCountry(queryParams).then(response => {
+          this.optionItems =response.rows;
+        });
+      },
+      reverseArrow(flag) {
+        let rulesDom = this.$refs["selectRef"].$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 {
-          this.optionItems = this.bakOptionItems;
+          rulesDom.classList.remove("is-reverse"); // 对dom新增class
         }
       },
     }
diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
index 3ebdf25e..bdd96f63 100644
--- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
@@ -99,40 +99,52 @@ import { getStaffList } from "@/api/emis/emisStaff";
        queryParams:{
          pageNum:1,
          pageSize:5,
+         empCode:null,
          searchValue:null,
-         siteCode:this.sideCode,
-         postCode:this.postCode
+         ownerSiteCode:null,
+         postCode:null
        }
      };
    },
    watch: {
      value(newVal,oldVal) {
         this.svalue = newVal;
-        this.initData();
+        console.log("empCode1==>"+newVal);
+        console.log("this.svalue1==>"+this.svalue);
+        console.log("this.svalue1==>"+this.firstFlag);
+        if(this.svalue!=null&&this.firstFlag){
+          this.queryParams.empCode=this.svalue;
+          this.queryData();
+        }
      },
      siteCode(newVal){
-      this.initData();
+      console.log("siteCode==>"+newVal);
+      this.queryParams.ownerSiteCode=newVal;
+      this.queryData();
+     },
+     postCode(newVal){
+      console.log("postCode==>"+newVal);
+      this.queryParams.postCode=newVal;
+      this.queryData();
      }
    },
-   beforeDestroy(){
-      // this.firstFlag = true;
-   },
    mounted() {
     // 给个随机id 判断是否clickoutside
     this.createdId = String(new Date().getTime())
    },
    created() {
-
+    this.queryData();
    },
    methods: {
     changeValue(val) {
       if(this.queryParams.searchValue === val ) return;
+
       this.slable = val;
       this.isEdit = true;
       this.queryParams.searchValue = val
       this.queryParams.pageNum = 1
 
-      this.getList()
+      this.queryData()
     },
     onRowClick(row, column, event) {
         this.svalue=row.empCode;
@@ -146,12 +158,15 @@ import { getStaffList } from "@/api/emis/emisStaff";
      },
     changePage(cur) {
       this.queryParams.pageNum = cur
-      this.getList()
+      this.queryData()
 
       this.visible = true
       this.$refs.popoverRef.doShow();
     },
     onfocus(el) {
+      this.firstFlag = false;
+      this.queryParams.empCode=null;
+
       if(this.slable) {
         this.splaceholder= this.slable
       }
@@ -159,9 +174,12 @@ import { getStaffList } from "@/api/emis/emisStaff";
       this.slable = null;
       this.queryParams.searchValue = null;
       this.queryParams.pageNum = 1
-      this.getList();
+      this.queryData();
     },
     onclear(el){
+      this.firstFlag = false;
+      this.queryParams.empCode=null;
+
       this.splaceholder = this.placeholder;
       this.slable = null;
       this.svalue = null;
@@ -173,7 +191,7 @@ import { getStaffList } from "@/api/emis/emisStaff";
       this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
 
       if(this.visible){
-        this.getList();
+        this.queryData();
       }
     },
     onblur(el) {
@@ -183,55 +201,47 @@ import { getStaffList } from "@/api/emis/emisStaff";
       this.$emit("input", this.svalue);
       this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
     },
-    initData(){
-      // && this.firstFlag
-        if(this.svalue){
-          let queryParams = {
-              empCode:this.svalue
-          }
-          getStaffList(queryParams).then(response => {
-            // this.dataList=response.rows;
-            if(response.rows.length > 0) {
-              const curItem = response.rows[0];
-              this.showItem(curItem);
-            }else{
-              const curItem ={
-                 empCode:this.svalue,
-                 empName:''
-              };
-              this.showItem(curItem);
-            }
+    queryData() {
+      console.log("this.firstFlag2==>"+this.firstFlag)
+      console.log("this.empCode2==>"+this.queryParams.empCode)
+
+      if(this.firstFlag&&!this.queryParams.empCode){
+        return;
+      }
 
-            this.firstFlag = false;
-          });
-        }
-    },
-    getList() {
        this.loading = true;
-       // 首次执行
-      //  this.queryParams.empCode = this.firstFlag?this.value:null;
+
+       console.log(this.queryParams)
+
        getStaffList(this.queryParams).then(response => {
          this.loading = false;
          this.total = response.total;
          this.dataList =  response.rows;
-          // if(this.firstFlag){
-          //   const selItem = this.dataList.find(item => item.empCode==this.svalue)
-          //   if(selItem){
-          //     this.showItem(selItem);
-          //   }
-          //   // 首次执行结束
-          //   this.firstFlag = false;
-          // }
+         this.firstFlag = false;
+
+         if(response.rows.length > 0) {
+              const curItem = response.rows.find(item => item.empCode === this.svalue);
+              this.showItem(curItem);
+          }else{
+            const curItem ={
+                empCode:this.svalue,
+                empName:''
+            };
+            this.showItem(curItem);
+          }
+
        });
      },
      showItem(item){
       console.log(item);
 
       // this.slable=item.empCode+'-'+item.empName;
-      this.slable=item.empName;
-      this.$emit("input", this.svalue);
-      this.$emit("onChange",item);
-      this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
+      if(item!=null){
+        this.slable=item.empName;
+        this.$emit("input", this.svalue);
+        this.$emit("onChange",item);
+        this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
+      }
      },
      getIndex($index) {
           return (this.queryParams.pageNum - 1) * this.queryParams.pageSize + $index + 1
diff --git a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
index d180df1c..c1523e45 100644
--- a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
@@ -8,6 +8,7 @@
       style="width: 100%"
       clearable
       filterable
+      @focus="onFocus"
     ></el-cascader>
 </template>
 <script>
@@ -36,6 +37,8 @@ export default {
     return {
       resetCascader:0,
       svalue: this.value,
+      lineCode:null,
+      prodCode:null,
       props: {
         // checkStrictly: true,
         lazy: true,
@@ -51,13 +54,10 @@ export default {
           let parentCode = node.value;
           this.queryData(level,parentCode)
             .then((res) => {
-
-              console.log(res);
-
+              // console.log(res);
               if (res.code != 200) {
                 return;
               }
-
               res.rows.map((item) => {
 
                if(level==0){
@@ -92,11 +92,12 @@ export default {
   watch: {
       value(newVal) {
         this.svalue = newVal;
+        if(this.svalue!=null) {
+          this.lineCode=this.svalue[0];
+          this.prodCode=this.svalue[1];
+        }
       },
       svalue(newVal, oldVal) {
-        if (newVal !== oldVal) {
-
-        }
       },
       countryCode(newVal) {
         this.queryData(0,0);
@@ -107,21 +108,18 @@ export default {
     this.queryData(0,0);
   },
   methods: {
+    onFocus(){
+        this.lineCode=null;
+        this.prodCode=null;
+        this.queryData(0,0);
+    },
     async queryData(level,parentCode) {
-      // console.log(level)
-      // 第一级国家
-      // if(level == 0){
-      //   let queryParams={};
-      //   let res=await listSimpleEmisCountry(queryParams);
-      //   console.log("xxxx1")
-      //   console.log(res)
-      //   return res;
-      // }
 
-      // 第二级是线路
+      // 第1级是线路
       if(level == 0){
         let queryParams={
-          country:this.countryCode
+          country:this.countryCode,
+          lineCode:this.lineCode,
         };
         let res=await listSimpleEmisTransLine(queryParams);
         return res;
@@ -131,13 +129,13 @@ export default {
       if(level == 1){
         let queryParams={
           transLineCode:parentCode,
+          prodCode:this.prodCode,
           status:1
         };
         let res=await listSimpleEmisTransProduct(queryParams);
         return res;
       }
 
-
     },
     handleChange(value) {
       console.log(value);
diff --git a/src/views/emis/emisCustomerUser/monthUserList.vue b/src/views/emis/emisCustomerUser/monthUserList.vue
index ea0f9081..0a80f73c 100644
--- a/src/views/emis/emisCustomerUser/monthUserList.vue
+++ b/src/views/emis/emisCustomerUser/monthUserList.vue
@@ -54,6 +54,7 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+           v-if="tableHeight" :max-height="tableHeight + 'px'"
            >
 
       <div slot="toolbar">
@@ -250,6 +251,7 @@ export default {
   ],
   data() {
     return {
+      tableHeight: 200,
       // 遮罩层
       loading: true,
       // 选中数组
@@ -294,6 +296,14 @@ export default {
   },
   created() {
     this.getList();
+
+     // 调整表格的高度，不允许滚动
+     this.$nextTick(function() {
+      let queryFormEl = this.$refs.queryForm.$el;
+      let tableH = queryFormEl.offsetHeight+190;
+      this.tableHeight = window.innerHeight - tableH;
+    });
+
   },
   methods: {
     /** 查询快递客户用户列表 */
diff --git a/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue b/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
index c063979c..9fba7dc6 100644
--- a/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
+++ b/src/views/emis/emisQuotePrice/emisQuotePriceForm.vue
@@ -15,7 +15,9 @@
                 </el-col> -->
                 <el-col :span="24">
                   <el-form-item label="使用网点" prop="useSiteCode">
-                    <EmisSiteSimplePicker   v-model="form.useSiteCode" :placeholder="$t('使用网点')"   isInitiated="true" @onChange="onUseSiteChange" @onClear="onUseSiteChange"></EmisSiteSimplePicker>
+                    <EmisSiteSimplePicker  v-if="ownerSiteCode == '88888'" v-model="form.useSiteCode" :placeholder="$t('使用网点')"   isInitiated="true" @onChange="onUseSiteChange" @onClear="onUseSiteChange"></EmisSiteSimplePicker>
+                    <el-input v-else v-model="ownerSiteName" placeholder="寄件网点" disabled />
+
                     <!-- <div v-if="ownerSiteCode == 88888">
                       <EmisSiteSimplePicker   v-model="form.useSiteCode" :placeholder="$t('使用网点')"  siteType="2" isInitiated="true" :disabled="false" ></EmisSiteSimplePicker>
                     </div>
@@ -102,7 +104,7 @@
                     <el-option
                       v-for="dict of dict.type.emis_fee_type.filter(el=> el.value != 1001)"
                       :key="dict.value"
-                      :label="dict.value+'-'+dict.label"
+                      :label="dict.label"
                       :value="dict.value"
                     />
                   </el-select>
@@ -110,7 +112,7 @@
                     <el-option
                     v-for="dict of dict.type.emis_fee_type.filter(el=> el.value == 1001)"
                       :key="dict.value"
-                      :label="dict.value+'-'+dict.label"
+                      :label="dict.label"
                       :value="dict.value"
                     />
                   </el-select>
@@ -358,27 +360,19 @@ export default {
   },
 
   created() {
-    // this.form.useSiteName="总部";
-    // this.form.useSitCode='88888';
-    // if(checkRole(['admin'])){
-    //   this.form.useSiteName="总部";
-    //   this.form.useSitCode='88888';
-    //   // this.ownerSiteCode='88888';
-    // }
 
-    // console.log(this.ownerSiteCode);
+    console.log(this.ownerSiteCode);
     this.initData();
 
 
   },
   methods: {
     initData() {
-        // this.form.useSiteCode=this.ownerSiteCode;
         if(this.quoteId !=null) {
           this.loading = true;
           getEmisQuotePrice(this.quoteId).then(response => {
+            this.form.useSiteCode=this.ownerSiteCode;
             this.form = response.data;
-
             if(this.isCopy){
               this.form.quoteName=this.form.quoteName+"_Copy"
               console.log(this.form);
@@ -398,6 +392,7 @@ export default {
             }else{
               this.form.feeType='9999';
             }
+            this.form.useSiteCode=this.ownerSiteCode;
             this.initSendAreaList();
             this.initDispAreaList();
 
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 4f40cdf4..8a00521f 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -174,7 +174,6 @@
           <template slot-scope="scope">
               <el-tag v-if="scope.row.status==1" type="success">启用</el-tag>
               <el-tag v-if="scope.row.status==0" type="danger">停用</el-tag>
-            <!-- <dict-tag :options="dict.type.sys_biz_enable_status" :value="scope.row.status"/> -->
           </template>
         </el-table-column>
         <el-table-column label="国家" align="center" prop="countryName" width="80"  :show-overflow-tooltip="true"/>
diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue
index ef2f893f..3f4eabfd 100644
--- a/src/views/emis/emisUser/index.vue
+++ b/src/views/emis/emisUser/index.vue
@@ -504,17 +504,28 @@ export default {
     handleResetPwd(row) {
       const userId= row.userId || this.ids[0];
 
-      this.$prompt('请输入新密码', "提示", {
-        confirmButtonText: "确定",
-        cancelButtonText: "取消",
-        closeOnClickModal: false,
-        inputPattern: /^.{5,20}$/,
-        inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
-      }).then(({ value }) => {
-          resetUserPwd(userId, value).then(response => {
-            this.$modal.msgSuccess("修改成功，新密码是：" + value);
+      this.$confirm('密码将重置为初始密码:'+this.initPassword+' 吗?', '提示', {
+                        confirmButtonText: '确定',
+                        cancelButtonText: '取消',
+                        type: 'warning'
+      }).then(() => {
+        resetUserPwd(userId, this.initPassword).then(response => {
+            this.$modal.msgSuccess("重置成功");
           });
-        }).catch(() => {});
+      }).catch(() => {
+      })
+
+      // this.$prompt('请输入新密码', "提示", {
+      //   confirmButtonText: "确定",
+      //   cancelButtonText: "取消",
+      //   closeOnClickModal: false,
+      //   inputPattern: /^.{5,20}$/,
+      //   inputErrorMessage: "用户密码长度必须介于 5 和 20 之间"
+      // }).then(({ value }) => {
+      //     resetUserPwd(userId, value).then(response => {
+      //       this.$modal.msgSuccess("修改成功，新密码是：" + value);
+      //     });
+      //   }).catch(() => {});
     },
     /** 分配角色操作 */
     handleAuthRole: function(row) {
diff --git a/src/views/emis/emisWaybill/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
index 1749a152..b835d6fb 100644
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ b/src/views/emis/emisWaybill/emisWaybillRecord.vue
@@ -1,10 +1,10 @@
 <template>
-  <div class="app-container">
-      <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="100px">
+  <div class="app-container" >
+    <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="100px">
         <el-collapse v-model="activeNames">
           <el-collapse-item title="" name="1">
             <template slot="title">
-              <div class="form-group-title"><span class="title">{{ $t('基础信息') }}</span></div>
+              <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
             </template>
             <div>
               <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
@@ -28,11 +28,7 @@
                         <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
                     </el-form-item>
                   </el-col>
-                  <!-- <el-col :span="6">
-                    <el-form-item label="线路" prop="transLine">
-                      <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
-                    </el-form-item>
-                  </el-col> -->
+
                   <el-col :span="8">
                     <el-form-item label="产品类型" prop="productType">
                       <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
@@ -103,7 +99,7 @@
                   </el-col>
                   <el-col :span="6">
                       <el-form-item label="寄件网点" prop="sendSiteName">
-                        <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
+                        <el-input v-model="form.sendSiteName" placeholder="" disabled />
                       </el-form-item>
                   </el-col>
 
@@ -154,7 +150,7 @@
                             padding: 5px 15px;
                             background: black;
                             font-size: 13px;
-                            color: white;">寄件</span>
+                            color: white;">寄件信息</span>
                       </div>
                       <div style="width:50%;text-align:right;padding-right: 15px;">
                           <!-- icon="el-icon-edit" -->
@@ -210,13 +206,13 @@
 
                 <el-col :span="12">
                   <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
-                      <el-col :span="24" style="display:inline-flex;border-bottom: 1px dotted #e6ebf5">
+                      <el-col :span="24" style="display:inline-flex;margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
                         <div class="form-group-title" style="width:50%">
                           <span style="border-radius: 15px;
                               padding: 5px 15px;
                               background: #b12e29;
                               font-size: 13px;
-                              color: white;">收件</span>
+                              color: white;">收件信息</span>
                           </div>
                         <div style="width:50%;text-align:right;padding-right: 15px;">
                           <el-button
@@ -229,20 +225,6 @@
                         </div>
                       </el-col>
 
-                      <!-- <el-col :span="12">
-                        <el-form-item label="收件客户" prop="customerCode">
-                          <customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1>
-                        </el-form-item>
-                      </el-col> -->
-                      <!-- <el-col :span="12">
-                        <el-form-item label="选择收件人" prop="customerCode">
-                        </el-form-item>
-                      </el-col> -->
-                      <!-- <el-col :span="12">
-                        <el-form-item label="客户名称" prop="customerName">
-                          <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-                        </el-form-item>
-                      </el-col> -->
                       <el-col :span="12">
                         <el-form-item label="收件人" prop="reciever.name">
                           <CustomerAddressSimplePicker1 addressType="2"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
@@ -251,7 +233,7 @@
 
                       <el-col :span="12">
                         <el-form-item label="收件电话" prop="reciever.phone">
-                          <el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" />
+                          <el-input v-model="form.reciever.phone" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
@@ -266,12 +248,12 @@
                       </el-col>
                       <el-col :span="24">
                         <el-form-item label="收件地址" prop="reciever.address">
-                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="详细地址" />
+                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
                         <el-form-item label="收件公司" prop="reciever.company">
-                          <el-input v-model="form.reciever.company" placeholder="请输入收件公司" />
+                          <el-input v-model="form.reciever.company" placeholder="" />
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
@@ -281,7 +263,7 @@
                       </el-col>
                       <el-col :span="12">
                         <el-form-item label="派件网点" prop="dispatchSite">
-                          <el-input v-model="form.dispatchSite" placeholder="请输入派件网点" disabled />
+                          <el-input v-model="form.dispatchSite" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
                       <el-col :span="24">
@@ -310,7 +292,7 @@
                     <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
                     <el-col :span="24">
                         <el-form-item label="" prop="goodsType" label-width="0px">
-                          <GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsPicker>
+                          <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker>
                             <el-table
                             class="cargoList"
                             :cell-style="{
@@ -325,17 +307,16 @@
                             border
                             stripe
                             :data="form.cargoList"
-                            size="mini"
+                            size="small"
                             style="width: 100%"
                             max-height="300px"
                           >
 
-                            <el-table-column label="操作" align="center" width="50">
-                                  <template slot-scope="scope">
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
-                                  </template>
+
+                          <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
                             </el-table-column>
 
                             <el-table-column prop="length" label="长(cm)" align="center" width="60">
@@ -364,13 +345,18 @@
                               </template>
                             </el-table-column>
 
-                          <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
-                              </template>
+
+                            <el-table-column label="操作" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    @click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
+                                  </template>
                             </el-table-column>
+
                           </el-table>
-                          <el-input v-model="form.goodsInfo" type="textarea" placeholder="" disabled />
+
+                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" disabled />
                         </el-form-item>
                     </el-col>
 
@@ -383,17 +369,6 @@
                       </el-col>
                       <el-col :span="12">
                         <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
-                          <!-- <div style="display:inline-flex">
-                            <el-input v-model="form.length" style="width:100px" placeholder="长" >
-                              <span slot="suffix">(cm)</span>
-                            </el-input>
-                            <el-input v-model="form.width" style="margin-left:5px;width:100px" placeholder="宽" >
-                              <span slot="suffix">(cm)</span>
-                            </el-input>
-                            <el-input v-model="form.height" style="margin-left:5px;width:100px" placeholder="高" >
-                              <span slot="suffix">(cm)</span>
-                            </el-input>
-                          </div> -->
                           <div style="">
                             <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
                               <span slot="suffix">(m³)</span>
@@ -445,8 +420,8 @@
                         </el-form-item>
                       </el-col>
                       <el-col :span="12">
-                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px">
-                          <el-radio-group v-model="form.blGenSubbill" @change="onGenSubbill">
+                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" v-if="this.form.billCode && this.form.parcelQty>0">
+                          <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill">
                             <el-radio :key="1"  :label="1">是</el-radio>
                             <el-radio :key="0"  :label="0">否</el-radio>
                           </el-radio-group>
@@ -455,7 +430,7 @@
                       </el-col>
                       <el-col :span="24" v-if="form.blGenSubbill==1">
                         <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
-                          <el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled />
+                          <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
                         </el-form-item>
                       </el-col>
 
@@ -515,14 +490,7 @@
                             style="width: 100%"
                           >
 
-                            <el-table-column label="操作" align="center" width="50">
-                                  <template slot-scope="scope">
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    v-if="scope.row.blAutoGen==0"
-                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
-                                  </template>
-                            </el-table-column>
+
                             <el-table-column prop="feeName" label="收费项" align="center" width="70">
                               <template slot-scope="scope">
                                 <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
@@ -554,6 +522,15 @@
                                 <el-input  v-model="scope.row.remark" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
+                            <el-table-column label="操作" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    v-if="scope.row.blAutoGen==0"
+                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
+                                  </template>
+                            </el-table-column>
+
                           </el-table>
                           <div>
                             <el-popover
@@ -573,7 +550,7 @@
                                       icon="el-icon-plus"
                                       @click="handleAddFee"
                                     >增加自定义费用</el-button>
-                          </el-popover>
+                              </el-popover>
                           </div>
 
                         </el-form-item>
@@ -641,13 +618,6 @@
         <AddressSelectPicker0 :addressType="addressType"   @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
     </el-dialog>
 
-
-
-
-
-
-
-
 </div>
 </template>
 
@@ -685,7 +655,7 @@ import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
 // import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
 // import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
 
-import GoodsPicker from '@/views/emis/EmisBaseTools/GoodsPicker.vue';
+import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
 import CustomerAddressSimplePicker0 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
 import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
 import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
@@ -714,7 +684,7 @@ components: {
   AddressSelectPicker1,
   CustomerAddressSimplePicker0,
   CustomerAddressSimplePicker1,
-  GoodsPicker,
+  GoodsSimplePicker,
   EmisUserSimplePicker0,
   EmisUserSimplePicker1,
   EmisUserSimplePicker2,
@@ -749,7 +719,7 @@ data() {
     addressType:null,
     // 遮罩层
     loading: true,
-    isInit:true,
+    isNeedSave:false,
     triggerCount:0,
     printTypeCheckList:['1','2','5'],
     // 表单参数
@@ -884,9 +854,11 @@ data() {
  watch: {
     "form.reciever.province":{
       handler (newValue, oldValue) {
-          this.calcDestSite();
+        // this.isNeedSave=true;
+        this.calcDestSite();
       },
-      deep: true
+      immediate: false,
+      deep: true,
     },
     "form.totalVolume":{
       handler (newValue, oldValue) {
@@ -898,30 +870,44 @@ data() {
       handler (newValue, oldValue) {
         this.reCalcSettlementWeight();
       },
+      immediate: false,
       deep: true
     },
     "form.billWeight":{
       handler (newValue, oldValue) {
         this.reCalcSettlementWeight();
       },
+      immediate: false,
       deep: true
     },
     "form.calcFeeType":{
       handler (newValue, oldValue) {
           this.calcBillFee();
       },
+      immediate: false,
       deep: true
     },
     "form.settlementWeight":{
       handler (newValue, oldValue) {
           this.calcBillFee();
       },
+      immediate: false,
+      deep: true
+    },
+    "form.parcelQty":{
+      handler (newValue, oldValue) {
+          this.handleGenSubbill();
+      },
+      immediate: false,
       deep: true
     },
 
+},
+activated(){
 },
 mouted(){
-
+},
+updated(){
 },
 created() {
   this.billCode=this.$route.query.billCode;
@@ -965,7 +951,6 @@ methods: {
         type: 'warning'
     }).then(() => {
       let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
-
       this.form.cargoList=newList;
       this.handleCalcQty();
       this.handleCalcVolume();
@@ -976,13 +961,16 @@ methods: {
   lpadZero(val,len) {
     return (new Array(len + 1).join('0') + val).slice(-len);
   },
-  onGenSubbill(value){
-    if(value==1 && this.form.parcelQty>0 && this.form.billCode){
-        let billSubCodeStr="";
-        for(let i=1;i<this.form.parcelQty;i++){
-          let subBillCode = this.form.billCode+""+this.lpadZero(i,3);
-          billSubCodeStr=billSubCodeStr+subBillCode+";"
-        }
+  handleGenSubbill(value){
+    if(this.form.blGenSubbill==1 && this.form.parcelQty > 0 && this.form.billCode){
+        // let billSubCodeStr="";
+        // for(let i=1;i<this.form.parcelQty;i++){
+        //   let subBillCode = this.form.billCode+""+this.lpadZero(i,3);
+        //   billSubCodeStr=billSubCodeStr+subBillCode+";"
+        //   console.log(billSubCodeStr);
+        // }
+        let billSubCodeStr = this.form.billCode+"["+this.lpadZero(1,3)+"-"+this.lpadZero(this.form.parcelQty,3)+"]";
+        console.log(billSubCodeStr);
         this.form.billCodeSub=billSubCodeStr;
     }else{
       this.form.billCodeSub=null;
@@ -997,8 +985,7 @@ methods: {
       this.form.sendDate =  parseTime(new Date());
       this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
       this.form.sendSiteName=this.$store.getters.ownerSiteName;
-
-      // console.log(this.form.sendSiteCode);
+      console.log(this.form.sendSiteName)
 
       if(this.billCode !=null) {
         this.loading = true;
@@ -1007,7 +994,8 @@ methods: {
           this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
           this.loading = false;
 
-          this.isInit=false;
+          this.isNeedSave=true;
+
         });
       }else{
         // console.log(this.dict.type.emis_declare_mode[0]);
@@ -1027,7 +1015,7 @@ methods: {
         this.form.calcFeeType='1';
         this.form.blMessage='1'
 
-        this.isInit=false;
+        this.isNeedSave=true;
       }
 
 
@@ -1131,14 +1119,11 @@ methods: {
       blAcceptMessage: null,
       meterType:null,
       blGenSubbill:null,
+      billCodeSub:null,
   };
     this.resetForm("form");
   },
-  onTransLineChange(item){
-    // this.form.meterType = item.meterRate;
-  },
   onProductChange(item){
-    console.log(item);
     this.form.transLine=item[0];
     this.form.productType=item[1];
   },
@@ -1146,7 +1131,6 @@ methods: {
   submitForm() {
     this.$refs["form"].validate(valid => {
       if (valid) {
-        console.log(this.form);
         realSubmitOrder(this.form).then(response => {
             this.$modal.msgSuccess("下单成功");
             this.$emit("on-changed");
@@ -1196,16 +1180,15 @@ methods: {
   // 计算目的站点
   calcDestSite(){
     // 初始化不计算
-    if(this.isInit){
+    if(!this.isNeedSave){
       return;
     }
 
     let queryParams = {
-            lineCode:this.form.transLine,
             province:this.form.reciever.province
     };
 
-    if(this.form.transLine && this.form.reciever.province){
+    if(this.form.reciever.province){
         getDestSite(queryParams).then(response => {
           console.log(response);
           this.form.destinationCode = response.data.destCode+'';
@@ -1220,7 +1203,7 @@ methods: {
   },
   handleCalcVolume(val,row){
     // 初始化不计算
-    if(this.isInit){
+    if(!this.isNeedSave){
       return;
     }
 
@@ -1233,15 +1216,23 @@ methods: {
     this.form.cargoList.forEach(item=>{
         totalVolume=totalVolume+item.volume;
     });
-    this.form.totalVolume = totalVolume;
+    this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
 
   },
   handleCalcQty(val,row){
     let totalCargoQty=0;
+    let goodsInfo='';
+
     this.form.cargoList.forEach(item=>{
         totalCargoQty=totalCargoQty+parseInt(item.cargoQty);
+        goodsInfo=goodsInfo+item.goodsName+"x"+item.cargoQty+",";
+
     });
+
+    this.form.goodsInfo = goodsInfo;
     this.form.parcelQty = totalCargoQty;
+
+    this.handleGenSubbill();
   },
   handleCalcFeeItem(val,row){
     let totalFee=0;
@@ -1253,7 +1244,7 @@ methods: {
   // 计算体积重量
   reCalcVolumeWeight(){
     // 初始化不计算
-    if(this.isInit){
+    if(!this.isNeedSave){
       return;
     }
 
@@ -1274,7 +1265,7 @@ methods: {
    // 计算计算重量
   reCalcSettlementWeight(){
     // 初始化不计算
-    if(this.isInit){
+    if(!this.isNeedSave){
       return;
     }
 
@@ -1299,7 +1290,7 @@ methods: {
   },
   calcBillFee(){
     // 初始化不计算
-    if(this.isInit){
+    if(!this.isNeedSave){
       return;
     }
 
@@ -1347,9 +1338,8 @@ methods: {
     this.form.dispatchUnderlingSite= item.siteName;
     this.form.dispatchSite= item.siteName;
   },
-  onGoodsChange(goodsList,goodsInfo){
-
-      if(goodsList!=null && goodsList.length>0) {
+  onGoodsChange(goodsName){
+      if(goodsName&& goodsName!='') {
         // 旧map
         let nameOldMap = new Map();
         if(this.form.cargoList!=null&& this.form.cargoList.length>0){
@@ -1358,38 +1348,19 @@ methods: {
           });
         }
 
-        // 新map
-        let nameNewMap = new Map();
-        goodsList.forEach(item=>{
-          nameNewMap[item.goodsName]=item;
-        });
-
-        // 添加没有的
-        goodsList.forEach(item=>{
-          if(!(item.goodsName in nameOldMap)){
+        if(!(goodsName in nameOldMap)){
             let cargo={
-            "goodsCode": item.goodsCode,
-            "goodsName": item.goodsName,
-            "cargoQty": 1,
-            "length": 0,
-            "width": 0,
-            "height": 0,
-            "volume": 0,
+              "goodsCode": goodsName,
+              "goodsName": goodsName,
+              "cargoQty": 1,
+              "length": 0,
+              "width": 0,
+              "height": 0,
+              "volume": 0,
             }
             this.form.cargoList.push(cargo);
-          }
-        });
-
-        let goodsInfo='';
-
-        if(this.form.cargoList!=null&& this.form.cargoList.length>0){
-          this.form.cargoList.forEach(item=>{
-            goodsInfo=goodsInfo+item.goodsName+",";
-          });
         }
 
-        this.form.goodsInfo = goodsInfo;
-
         this.handleCalcQty();
         this.handleCalcVolume();
       }
diff --git a/src/views/emis/emisWaybill/orderList.vue b/src/views/emis/emisWaybill/orderList.vue
index ce200dbd..ed698001 100644
--- a/src/views/emis/emisWaybill/orderList.vue
+++ b/src/views/emis/emisWaybill/orderList.vue
@@ -1,1238 +1,141 @@
 <template>
   <div class="app-container">
-    <search-form  :model="queryParams" ref="queryForm"   size="small" :maxShow="3"  label-width="68px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" 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>
       <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="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="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="paymentType">
-        <el-input
-          v-model="queryParams.paymentType"
-          :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="calcFeeType">
-        <el-input
-          v-model="queryParams.calcFeeType"
-          :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="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="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="insureSite">
-        <el-input
-          v-model="queryParams.insureSite"
-          :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="printMan">
-        <el-input
-          v-model="queryParams.printMan"
-          :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="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="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="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="registerSite">
-        <el-input
-          v-model="queryParams.registerSite"
-          :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="registerMan">
-        <el-input
-          v-model="queryParams.registerMan"
-          :placeholder="$t('寄件人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="takePieceEmployee">
-        <el-input
-          v-model="queryParams.takePieceEmployee"
-          :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="sendSite">
-        <el-input
-          v-model="queryParams.sendSite"
-          :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="dispatchMan">
-        <el-input
-          v-model="queryParams.dispatchMan"
-          :placeholder="$t('派件员')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="dispatchSite">
-        <el-input
-          v-model="queryParams.dispatchSite"
-          :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="produceBillSite">
-        <el-input
-          v-model="queryParams.produceBillSite"
-          :placeholder="$t('生成账单站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </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="produceBillMan">
-        <el-input
-          v-model="queryParams.produceBillMan"
-          :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="destination">
-        <el-input
-          v-model="queryParams.destination"
-          :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="dispatchUnderlingSite">
-        <el-input
-          v-model="queryParams.dispatchUnderlingSite"
-          :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="destinationCenter">
-        <el-input
-          v-model="queryParams.destinationCenter"
-          :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="marketMan">
-        <el-input
-          v-model="queryParams.marketMan"
-          :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="operateEmployee">
-        <el-input
-          v-model="queryParams.operateEmployee"
-          :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="problemCause">
-        <el-input
-          v-model="queryParams.problemCause"
-          :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="signSite">
-        <el-input
-          v-model="queryParams.signSite"
-          :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="modifier">
-        <el-input
-          v-model="queryParams.modifier"
-          :placeholder="$t('修改人')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="modifierCode">
-        <el-input
-          v-model="queryParams.modifierCode"
-          :placeholder="$t('修改人代码')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="modifyDate">
-        <el-input
-          v-model="queryParams.modifyDate"
-          :placeholder="$t('修改时间')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="modifySite">
-        <el-input
-          v-model="queryParams.modifySite"
-          :placeholder="$t('修改站点')"
-          clearable
-          @keyup.enter.native="handleQuery"
-        />
-      </el-form-item>
-      <el-form-item label="" prop="modifySiteCode">
-        <el-input
-          v-model="queryParams.modifySiteCode"
-          :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>
-    </search-form>
+              <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="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>
+
+            <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>
+
+    </SearchForm>
 
 
-    <xd-table v-loading="loading"
-          :header-cell-style="{background:'#f7f7f7',color:'#606266'}"
+    <XdTable v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisWaybillList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -1240,43 +143,100 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+           v-if="tableHeight" :max-height="tableHeight + 'px'"
+
            >
 
       <div slot="toolbar">
         <el-row :gutter="10" class="mb8">
+                <!-- icon="el-icon-plus" -->
               <el-col :span="1.5">
-                <router-link to="/d24/waybillManagement/waybillEntry">
-                    <el-button
-                    type="primary"
-                    plain
-                    size="mini"
-                    v-hasPermi="['emis:emisWaybill:add']"
-                  >去录单</el-button>
-                </router-link>
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  @click="handleAccept"
+                  v-hasPermi="['emis:emisWaybill:add']"
+                >接单</el-button>
               </el-col>
-              <!--
               <el-col :span="1.5">
+                <el-button
+                  type="danger"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleCancelOrder"
+                  v-hasPermi="['emis:emisWaybill:edit']"
+                >取消订单</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleSetSite"
+                  v-hasPermi="['emis:emisWaybill:edit']"
+                >指派网点</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="success"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleSetTakeMan"
+                  v-hasPermi="['emis:emisWaybill:edit']"
+                >指派取件员</el-button>
+              </el-col>
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="success"
                   plain
                   icon="el-icon-edit"
                   size="mini"
                   :disabled="single"
-                  @click="handleUpdate"
-                  v-hasPermi="['emis:emisWaybill:edit']"
-                >修改</el-button>
+                  @click="handleView"
+                >查看</el-button>
               </el-col> -->
               <!-- <el-col :span="1.5">
                 <el-button
-                  type="danger"
+                  type="primary"
                   plain
-                  icon="el-icon-delete"
                   size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                  v-hasPermi="['emis:emisWaybill:remove']"
-                >删除</el-button>
+                  :disabled="single"
+                  @click="handleView"
+                >预览面单</el-button>
               </el-col> -->
+              <!-- <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleView"
+                >下载进仓单</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleView"
+                >下载打印pdf</el-button>
+              </el-col>
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  icon="el-icon-print"
+                  size="mini"
+                  :disabled="single"
+                  @click="handleView"
+                >打印</el-button>
+              </el-col> -->
+
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
@@ -1304,214 +264,162 @@
          </template>
       </el-table-column>
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
       -->
-                  <!-- <div  class="link-type" @click="handleUpdate(scope.row)">{{scope.row.billCode}}</div> -->
 
-      <!-- <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" >
-        <template slot-scope="scope">
-            <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
-              <span>{{ scope.row.billCode }}</span>
-            </router-link>
-         </template>
-      </el-table-column> -->
-      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
-      <el-table-column :label="$t('进仓单号')" align="center" prop="intoWarehouseBillCode" min-width="100" />
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" min-width="100" />
-      <!-- <el-table-column :label="$t('运单状态')" align="center" prop="orderStatus" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('物流信息')" align="center" prop="orderStatus" min-width="100" /> -->
-      <el-table-column :label="$t('国家')" align="center" prop="receiveCountryName" min-width="100" />
-      <el-table-column :label="$t('线路')" align="center" prop="transLineType" min-width="100" />
-      <el-table-column :label="$t('产品类型')" align="center" prop="productName" min-width="100" />
-      <!-- <el-table-column :label="$t('时效')" align="center" prop="timeType" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" /> -->
-      <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
-      <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-      <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-      <el-table-column :label="$t('体积')" align="center" prop="totalVolume" min-width="100" />
-      <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
-      <!-- <el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" /> -->
-      <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
-      <!-- <el-table-column :label="$t('计费重量')" align="center" prop="feeWeight" min-width="100" /> -->
-      <el-table-column :label="$t('收件人')" align="center" prop="receiveName" min-width="100" />
-      <el-table-column :label="$t('收件公司')" align="center" prop="receiveCompany" min-width="100" />
-      <el-table-column :label="$t('取件员')" align="center" prop="takePieceEmployee" min-width="100" />
-      <!-- <el-table-column :label="$t('取件员代码')" align="center" prop="takePieceEmployeeCode" min-width="100" /> -->
-      <el-table-column :label="$t('取件方式')" align="center" prop="pickupMethod" min-width="100" />
-      <el-table-column :label="$t('付款方式')" align="center" prop="paymentType" min-width="100" />
-      <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-      <!-- <el-table-column :label="$t('寄件人编号')" align="center" prop="registerManCode" min-width="100" /> -->
-      <el-table-column :label="$t('寄件人')" align="center" prop="sendName" min-width="100" />
-      <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" />
-      <!-- <el-table-column :label="$t('寄件人')" align="center" prop="registerMan" min-width="100" /> -->
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" />
 
+      <!-- <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="orderType" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('下单时间')" align="center" prop="orderDate" min-width="100" />
-      <el-table-column :label="$t('客户编号2502021')" align="center" prop="customerCode" min-width="100" />
-      <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" />
-      <el-table-column :label="$t('收件客户编号2502021')" align="center" prop="receiveCustomerCode" min-width="100" />
-      <el-table-column :label="$t('收件客户客户名称')" align="center" prop="receiveCustomerName" min-width="100" />
-      <el-table-column :label="$t('第三方客户客户编号')" align="center" prop="thirdCustomerCode" min-width="100" />
-      <el-table-column :label="$t('第三方客户客户名称')" align="center" prop="thirdCustomerName" min-width="100" />
-       <el-table-column :label="$t('收货人手机号')" align="center" prop="receiveMobile" min-width="100" />
-      <el-table-column :label="$t('收货人电话')" align="center" prop="receiveTel" min-width="100" />
-      <el-table-column :label="$t('省')" align="center" prop="receiveProvince" min-width="100" />
-      <el-table-column :label="$t('市')" align="center" prop="receiveCity" min-width="100" />
-      <el-table-column :label="$t('区')" align="center" prop="receiveCounty" min-width="100" />
-      <el-table-column :label="$t('县')" align="center" prop="receiveTown" min-width="100" />
-      <el-table-column :label="$t('收货地址')" align="center" prop="receiveAddress" min-width="100" />
-      <el-table-column :label="$t('邮编')" align="center" prop="receivePostcode" min-width="100" />
-         <el-table-column :label="$t('寄件人手机号')" align="center" prop="sendMobile" min-width="100" />
-      <el-table-column :label="$t('寄件人电话')" align="center" prop="sendTel" min-width="100" />
-      <el-table-column :label="$t('寄件人国家')" align="center" prop="sendCountry" min-width="100" />
-      <el-table-column :label="$t('寄件省')" align="center" prop="sendProvince" min-width="100" />
-      <el-table-column :label="$t('寄件市')" align="center" prop="sendCity" min-width="100" />
-      <el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="100" />
-      <el-table-column :label="$t('寄件县')" align="center" prop="sendTown" min-width="100" />
-      <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="100" />
-      <el-table-column :label="$t('寄件邮编')" align="center" prop="sendPostcode" min-width="100" />
-      <el-table-column :label="$t('支付月结编号')" align="center" prop="custNo" min-width="100" />
-      <el-table-column :label="$t('计费方式')" align="center" prop="calcFeeType" min-width="100" />
-         <el-table-column :label="$t('清关方式')" align="center" prop="customsClear" min-width="100" />
-      <el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="100" />
-      <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="100" />
-      <el-table-column :label="$t('派件方式:1-送货上门')" align="center" prop="dispatchMethod" min-width="100" />
-      <el-table-column :label="$t('预计上门取件开始时间')" align="center" prop="pickStartDate" min-width="100" />
-      <el-table-column :label="$t('预计上门取件结束时间')" align="center" prop="pickFinishDate" min-width="100" />
-      <el-table-column :label="$t('取货失败原因')" align="center" prop="pickFailReason" min-width="100" />
-      <el-table-column :label="$t('入仓代码')" align="center" prop="intoWarehouseCode" min-width="100" />
-      <el-table-column :label="$t('入仓名称')" align="center" prop="intoWarehouseName" min-width="100" />
-      <el-table-column :label="$t('入仓地址')" align="center" prop="intoWarehouseAddress" min-width="100" />
-      <el-table-column :label="$t('入仓联系人')" align="center" prop="intoWarehouseContact" min-width="100" />
-      <el-table-column :label="$t('入仓联系人电话')" align="center" prop="intoWarehousePhone" min-width="100" />
-      <el-table-column :label="$t('客户发货开始时间')" align="center" prop="customerDeliveryBeginTime" min-width="100" />
-      <el-table-column :label="$t('客户发货截止时间')" align="center" prop="customerDeliveryEndTime" min-width="100" />
-      <el-table-column :label="$t('货物大类')" align="center" prop="goodsType" min-width="100" />
-      <el-table-column :label="$t('货物描述')" align="center" prop="goodsInfo" min-width="100" />
-      <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
+      <!-- <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" /> -->
+       <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
 
-      <el-table-column :label="$t('是否超长')" align="center" prop="blOverLong" min-width="100" />
-      <el-table-column :label="$t('是否出账')" align="center" prop="blBill" min-width="100" />
-      <el-table-column :label="$t('是否超重')" align="center" prop="blOverWeight" min-width="100" />
-      <el-table-column :label="$t('超重重量')" align="center" prop="overWeightNumber" min-width="100" />
-      <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="100" />
-      <el-table-column :label="$t('三段码')" align="center" prop="thirdCode" min-width="100" />
-      <el-table-column :label="$t('实际货值')" align="center" prop="realValue" min-width="100" />
-      <el-table-column :label="$t('是否投保')" align="center" prop="blInsure" min-width="100" />
-      <el-table-column :label="$t('投保货值')" align="center" prop="insureValue" min-width="100" />
-      <el-table-column :label="$t('投保货值币种')" align="center" prop="insureValueCurrency" min-width="100" />
-      <el-table-column :label="$t('保费币种')" align="center" prop="insureFeeCurrency" min-width="100" />
-      <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="100" />
-      <el-table-column :label="$t('保险备注')" align="center" prop="insureRemark" min-width="100" />
-      <el-table-column :label="$t('保险站点')" align="center" prop="insureSite" min-width="100" />
-      <el-table-column :label="$t('保险站点代码')" align="center" prop="insureSiteCode" min-width="100" />
-      <el-table-column :label="$t('投保日期')" align="center" prop="insureDate" min-width="100" />
-      <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="100" />
-      <el-table-column :label="$t('打印人')" align="center" prop="printMan" min-width="100" />
-      <el-table-column :label="$t('打印人编号')" align="center" prop="printManCode" min-width="100" />
-      <el-table-column :label="$t('打印站点')" align="center" prop="printSite" min-width="100" />
-      <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="100" />
-      <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="100" />
-      <el-table-column :label="$t('是否同行转单')" align="center" prop="blDispFd" min-width="100" />
-      <el-table-column :label="$t('转单时间')" align="center" prop="dispFdDate" min-width="100" />
-      <el-table-column :label="$t('转单原因')" align="center" prop="dispFdReason" min-width="100" />
-      <el-table-column :label="$t('转单代码')" align="center" prop="transferCode" min-width="100" />
-      <el-table-column :label="$t('转单单号')" align="center" prop="transferBillcode" min-width="100" />
-      <el-table-column :label="$t('当前网点编号')" align="center" prop="currentSiteCode" min-width="100" />
-      <el-table-column :label="$t('上一网点点号')" align="center" prop="lastSiteCode" min-width="100" />
-      <el-table-column :label="$t('寄件网点')" align="center" prop="registerSite" min-width="100" />
-      <el-table-column :label="$t('寄件站点代码')" align="center" prop="registerSiteCode" min-width="100" />
-      <el-table-column :label="$t('寄件日期')" align="center" prop="registerDate" min-width="100" />
-       <el-table-column :label="$t('发件网点')" align="center" prop="sendSite" min-width="100" />
-      <el-table-column :label="$t('发件网点代码')" align="center" prop="sendSiteCode" min-width="100" />
-      <el-table-column :label="$t('发货时间')" align="center" prop="sendDate" min-width="100" />
-      <el-table-column :label="$t('派件员')" align="center" prop="dispatchMan" min-width="100" />
-      <el-table-column :label="$t('派件人代码')" align="center" prop="dispatchManCode" min-width="100" />
-      <el-table-column :label="$t('派件时间')" align="center" prop="dispatchDate" min-width="100" />
-      <el-table-column :label="$t('派件网点')" align="center" prop="dispatchSite" min-width="100" />
-      <el-table-column :label="$t('派件网点代码')" align="center" prop="dispatchSiteCode" min-width="100" />
-      <el-table-column :label="$t('生成账单时间')" align="center" prop="produceBillDate" min-width="100" />
-      <el-table-column :label="$t('生成账单站点')" align="center" prop="produceBillSite" min-width="100" />
-      <el-table-column :label="$t('生成账单站点代码')" align="center" prop="produceBillSiteCode" min-width="100" />
-      <el-table-column :label="$t('生成账单人')" align="center" prop="produceBillMan" min-width="100" />
-      <el-table-column :label="$t('生成账单人代码')" align="center" prop="produceBillManCode" min-width="100" />
-      <el-table-column :label="$t('目的地')" align="center" prop="destination" min-width="100" />
-      <el-table-column :label="$t('目的地编号')" align="center" prop="destinationCode" min-width="100" />
-      <el-table-column :label="$t('目的省')" align="center" prop="destinationProvince" min-width="100" />
-      <el-table-column :label="$t('目的城市')" align="center" prop="destinationCity" min-width="100" />
-      <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100" />
-      <el-table-column :label="$t('目的地网点')" align="center" prop="dispatchUnderlingSite" min-width="100" />
-      <el-table-column :label="$t('目的地网点代码')" align="center" prop="dispatchUnderlingSiteCode" min-width="100" />
-      <el-table-column :label="$t('目的财务中心')" align="center" prop="destinationCenter" min-width="100" />
-      <el-table-column :label="$t('目的地财务中心代码')" align="center" prop="destinationCenterCode" min-width="100" />
-      <el-table-column :label="$t('业务人')" align="center" prop="marketMan" min-width="100" />
-      <el-table-column :label="$t('业务人代码')" align="center" prop="marketManCode" min-width="100" />
-      <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="operateEmployee" min-width="100" />
-      <el-table-column :label="$t('操作员代码')" align="center" prop="operateEmployeeCode" min-width="100" />
-      <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="100" />
-      <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" />
-      <el-table-column :label="$t('是否备注消息')" align="center" prop="blMessage" min-width="100" />
-      <el-table-column :label="$t('是否发送收件人短信')" align="center" prop="blAcceptMessage" min-width="100" />
-      <el-table-column :label="$t('是否生成子单')" align="center" prop="blGenSubbill" min-width="100" />
-      <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
-      <el-table-column :label="$t('签收人代码')" align="center" prop="signManCode" min-width="100" />
-      <el-table-column :label="$t('签收站点')" align="center" prop="signSite" min-width="100" />
-      <el-table-column :label="$t('签收站点代码')" align="center" prop="signSiteCode" min-width="100" />
-      <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="100" />
-      <el-table-column :label="$t('揽收图片备注')" align="center" prop="billPicSendRmk" min-width="100" />
-      <el-table-column :label="$t('签收底单图片')" align="center" prop="billPicDispatchRmk" min-width="100" />
-      <el-table-column :label="$t('时区偏差')" align="center" prop="timezoneOffset" min-width="100" />
-      <el-table-column :label="$t('修改人')" align="center" prop="modifier" min-width="100" />
-      <el-table-column :label="$t('修改人代码')" align="center" prop="modifierCode" min-width="100" />
-      <el-table-column :label="$t('修改时间')" align="center" prop="modifyDate" min-width="100" />
-      <el-table-column :label="$t('修改站点')" align="center" prop="modifySite" min-width="100" />
-      <el-table-column :label="$t('修改站点代码')" align="center" prop="modifySiteCode" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('操作')" align="center" class-name="small-padding fixed-width">
+      <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" />
+      <el-table-column :label="$t('订单状态')" align="center" prop="orderStatus" min-width="100" >
         <template slot-scope="scope">
-          <el-button
-            size="mini"
-            type="text"
-            icon="el-icon-edit"
-            @click="handleUpdate(scope.row)"
-            v-hasPermi="['emis:emisWaybill:edit']"
-          >修改</el-button>
-        </template>
-      </el-table-column> -->
-    </xd-table>
+            <dict-tag :options="dict.type.emis_order_status" :value="scope.row.orderStatus"/>
+          </template>
+       </el-table-column> -
+
+      <el-table-column label="发货信息"  align="center" >
+        <!-- <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+                <span>{{ scope.row.billCode }}</span>
+              </router-link>
+          </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="salesmen" min-width="100" :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="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="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
+        <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="meterType" min-width="100" /> -->
+        <!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> -->
+      </el-table-column>
 
 
+      <el-table-column label="寄件信息" align="center" >
+        <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-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="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="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
+              <el-tag v-else type="danger">不发送</el-tag>
+          </template>
+        </el-table-column>
+      </el-table-column>
+      <el-table-column :label="$t('寄件日期')" align="center" prop="sendDate" min-width="100" :show-overflow-tooltip="true"/>
 
-    <!--
-    <el-dialog :title="titleForm" :visible.sync="openForm" width="500px" v-dialogDrag append-to-body>
-      <emisWaybillForm :id="currentId"   @on-changed="handleFormChanged" @on-cancel="cancelForm"></EmisWaybillForm>
-    </el-dialog>
-    -->
+
+      <el-table-column label="收件信息" align="center">
+        <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="receiveCustomerName" min-width="100" /> -->
+        <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">
+                <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
+                <el-tag v-else type="danger">不发送</el-tag>
+            </template>
+        </el-table-column>
+
+      </el-table-column>
+
+      <el-table-column label="货物信息" align="center">
+
+        <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">
+              <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
+              <el-tag v-else type="info">自提</el-tag>
+          </template>
+        </el-table-column>
+
+      </el-table-column>
+
+      <el-table-column label="收费信息" align="center">
+
+        <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" />
+        <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>
+
+      <el-table-column label="签收信息" align="center">
+
+        <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>
+
+      <el-table-column label="打印信息" align="center">
+        <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>
+      <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" />
+
+    </XdTable>
 
     <!--
     <el-dialog :title="titleView" :visible.sync="openView" width="60%" :close-on-click-modal="false"  v-dialogDrag append-to-body>
@@ -1525,16 +433,22 @@
 <script>
 import { listEmisWaybill, getEmisWaybill, delEmisWaybill, addEmisWaybill, updateEmisWaybill } from "@/api/emis/emisWaybill";
 import elDateSimplePicker from '@/components/DatePickerAdv/elDateSimplePicker';
-import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
+// import emisWaybillView from '@/views/emis/emisWaybill/emisWaybillView';
 import emisWaybillForm from '@/views/emis/emisWaybill/emisWaybillForm';
+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: "orderList",
-  components: { elDateSimplePicker,emisWaybillView,emisWaybillForm },
-  dicts: [
+  name: "WaybillIsPrinted",
+  components: { elDateAdvPicker,emisWaybillForm,CountryPicker0,CountryPicker1 },
+  dicts: ['emis_waybill_status','emis_declare_mode','emis_customs_clear','emis_payment_type'
   ],
   data() {
     return {
+      tableHeight: 200,
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -1551,44 +465,34 @@ export default {
       total: 0,
       // 运单列表表格数据
       emisWaybillList: [],
-      // 弹出层标题
-      title: "",
-      // 是否显示弹出层
-      open: false,
 
+      currentId:null,
       openForm: false,
       titleForm: "",
 
-      titleEmisWaybill: "",
-      openEmisWaybill: false,
-
-      // 显示编辑框更多
-      moreInputVisible: false,
-
       // 弹出展示层
-      currentId:null,
       id:null,
       titleView:"",
       openView: false,
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeOrderDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeEstimateDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangePickStartDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangePickFinishDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeDispFdDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeRegisterDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeSendDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeProduceBillDate: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeCreateTime: [],
-      // 备注时间范围
+      // 更新网点时间范围
       daterangeUpdateTime: [],
       // 查询参数
       queryParams: {
@@ -1598,6 +502,7 @@ export default {
         billCode: null,
         billCodeSub: null,
         orderStatus: null,
+        waybillStatus: null,
         orderType: null,
         orderDate: null,
         customerCode: null,
@@ -1617,6 +522,7 @@ export default {
         receiveTown: null,
         receiveAddress: null,
         receivePostcode: null,
+        receivePcd: null,
         sendName: null,
         sendCompany: null,
         sendMobile: null,
@@ -1628,9 +534,10 @@ export default {
         sendTown: null,
         sendAddress: null,
         sendPostcode: null,
+        sendPcd: null,
         paymentType: null,
-        custNo: null,
         calcFeeType: null,
+        custNo: null,
         transLineType: null,
         productType: null,
         timeType: null,
@@ -1650,10 +557,19 @@ export default {
         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,
@@ -1676,114 +592,74 @@ export default {
         insureFeeCurrency: null,
         insureFee: null,
         insureRemark: null,
-        insureSite: null,
         insureSiteCode: null,
         insureDate: null,
         blPrint: null,
-        printMan: null,
         printManCode: null,
         printSite: null,
         printDate: null,
         printCount: null,
         blDispFd: null,
-        dispFdDate: null,
-        dispFdReason: null,
         transferCode: null,
         transferBillcode: null,
+        dispFdDate: null,
+        dispFdReason: null,
         currentSiteCode: null,
         lastSiteCode: null,
-        registerSite: null,
         registerSiteCode: null,
         registerDate: null,
-        registerMan: null,
         registerManCode: null,
-        takePieceEmployee: null,
         takePieceEmployeeCode: null,
-        sendSite: null,
         sendSiteCode: null,
         sendDate: null,
-        dispatchMan: null,
         dispatchManCode: null,
         dispatchDate: null,
-        dispatchSite: null,
         dispatchSiteCode: null,
         produceBillDate: null,
-        produceBillSite: null,
         produceBillSiteCode: null,
-        produceBillMan: null,
         produceBillManCode: null,
-        destination: null,
         destinationCode: null,
         destinationProvince: null,
         destinationCity: null,
         destinationCounty: null,
-        dispatchUnderlingSite: null,
         dispatchUnderlingSiteCode: null,
-        destinationCenter: null,
         destinationCenterCode: null,
-        marketMan: null,
         marketManCode: null,
         payee: null,
         salesmen: null,
-        operateEmployee: null,
         operateEmployeeCode: null,
         blIsQuestion: null,
+        problemType: null,
         problemCause: null,
+        problemDelayDays: null,
         blMessage: null,
         blAcceptMessage: null,
         blGenSubbill: null,
         signMan: null,
         signManCode: null,
-        signSite: null,
         signSiteCode: null,
         signDate: null,
         billPicSendRmk: null,
         billPicDispatchRmk: null,
         timezoneOffset: null,
-        modifier: null,
-        modifierCode: null,
-        modifyDate: null,
-        modifySite: null,
-        modifySiteCode: null,
         delFlag: null,
-        remark: null
+        remark: null,
+        params:{
+          queryOrderType:1,
+          queryOrderDateType:1
+        }
       },
-      // 表单参数
-      form: {},
-      // 表单校验
-      rules: {
-        id: [
-          { required: true, message: "id不能为空", trigger: "blur" }
-        ],
-        orderSn: [
-          { required: true, message: "订单号不能为空", trigger: "blur" }
-        ],
-        orderStatus: [
-          { required: true, message: "订单状态不能为空", trigger: "blur" }
-        ],
-        receiveName: [
-          { required: true, message: "收货人名不能为空", trigger: "blur" }
-        ],
-        receiveMobile: [
-          { required: true, message: "收货人手机号不能为空", trigger: "blur" }
-        ],
-        receiveAddress: [
-          { required: true, message: "收货地址不能为空", trigger: "blur" }
-        ],
-        sendName: [
-          { required: true, message: "寄件人名不能为空", trigger: "blur" }
-        ],
-        sendMobile: [
-          { required: true, message: "寄件人手机号不能为空", trigger: "blur" }
-        ],
-        sendAddress: [
-          { required: true, message: "寄件地址不能为空", trigger: "blur" }
-        ],
-      }
     };
   },
   created() {
     this.getList();
+
+    // 调整表格的高度，不允许滚动
+    this.$nextTick(function() {
+      let queryFormEl = this.$refs.queryForm.$el;
+      let tableH = queryFormEl.offsetHeight+190;
+      this.tableHeight = window.innerHeight - tableH;
+    });
   },
   methods: {
     /** 查询运单列表列表 */
@@ -1836,179 +712,11 @@ export default {
         this.loading = false;
       });
     },
-    // 取消按钮
-    cancel() {
-      this.open = false;
-      this.reset();
-    },
-    // 表单重置
-    reset() {
-      this.form = {
-        id: null,
-        orderSn: null,
-        custOrderId: null,
-        billCode: null,
-        billCodeSub: null,
-        orderStatus: null,
-        orderType: null,
-        orderDate: null,
-        userId: null,
-        customerCode: null,
-        customerName: null,
-        receiveCustomerCode: null,
-        receiveCustomerName: null,
-        thirdCustomerCode: null,
-        thirdCustomerName: null,
-        openId: null,
-        receiveName: null,
-        receiveCompany: null,
-        receiveMobile: null,
-        receiveTel: null,
-        receiveCountry: null,
-        receiveProvince: null,
-        receiveCity: null,
-        receiveCounty: null,
-        receiveTown: null,
-        receiveAddress: null,
-        receivePostcode: null,
-        sendName: null,
-        sendCompany: null,
-        sendMobile: null,
-        sendTel: null,
-        sendCountry: null,
-        sendProvince: null,
-        sendCity: null,
-        sendCounty: null,
-        sendTown: null,
-        sendAddress: null,
-        sendPostcode: null,
-        paymentType: null,
-        custNo: null,
-        calcFeeType: 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,
-        customerDeliveryBeginTime: null,
-        customerDeliveryEndTime: null,
-        goodsType: null,
-        goodsInfo: 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,
-        blBillText: null,
-        feeRemaker: null,
-        thirdCode: null,
-        realValue: null,
-        blInsure: null,
-        insureValue: null,
-        insureValueCurrency: null,
-        insureFeeCurrency: null,
-        insureFee: null,
-        insureRemark: null,
-        insureSite: null,
-        insureSiteCode: null,
-        insureDate: null,
-        blPrint: null,
-        printMan: null,
-        printManCode: null,
-        printSite: null,
-        printDate: null,
-        printCount: null,
-        blDispFd: null,
-        dispFdDate: null,
-        dispFdReason: null,
-        transferCode: null,
-        transferBillcode: null,
-        currentSiteCode: null,
-        nextSiteCode: null,
-        lastSiteCode: null,
-        registerSite: null,
-        registerSiteCode: null,
-        registerDate: null,
-        registerMan: null,
-        registerManCode: null,
-        takePieceEmployee: null,
-        takePieceEmployeeCode: null,
-        sendSite: null,
-        sendSiteCode: null,
-        sendDate: null,
-        dispatchMan: null,
-        dispatchManCode: null,
-        dispatchDate: null,
-        dispatchSite: null,
-        dispatchSiteCode: null,
-        produceBillDate: null,
-        produceBillSite: null,
-        produceBillSiteCode: null,
-        produceBillMan: null,
-        produceBillManCode: null,
-        destination: null,
-        destinationCode: null,
-        destinationProvince: null,
-        destinationCity: null,
-        destinationCounty: null,
-        dispatchUnderlingSite: null,
-        dispatchUnderlingSiteCode: null,
-        destinationCenter: null,
-        destinationCenterCode: null,
-        marketMan: null,
-        marketManCode: null,
-        payee: null,
-        salesmen: null,
-        operateEmployee: null,
-        operateEmployeeCode: null,
-        blIsQuestion: null,
-        problemCause: null,
-        blMessage: null,
-        blAcceptMessage: null,
-        blGenSubbill: null,
-        signMan: null,
-        signManCode: null,
-        signSite: null,
-        signSiteCode: null,
-        signDate: null,
-        billPicSendRmk: null,
-        billPicDispatchRmk: null,
-        timezoneOffset: null,
-        modifier: null,
-        modifierCode: null,
-        modifyDate: null,
-        modifySite: null,
-        modifySiteCode: null,
-        delFlag: null,
-        createBy: null,
-        createTime: null,
-        updateBy: null,
-        updateTime: null,
-        remark: null
-      };
-      this.resetForm("form");
+
+    onDateSelect(value){
+      console.log("date picker---->", value)
+      this.dateTimeRange=value;
+      // scanDate
     },
     /** 搜索按钮操作 */
     handleQuery() {
@@ -2034,35 +742,18 @@ export default {
     },
     /** 新增按钮操作 */
     handleAdd(row) {
-      this.reset();
-      this.open = true;
-      this.title = "新增";
-
-    // 子组件打开模式
-    //   if(row != undefined){
-    //     this.currentParentId = row.id
-    //   }
-    //   this.openEmisWaybill = true;
-    //   this.titleEmisWaybill = "新增";
+      this.currentId=null;
+      this.openForm= true;
+      this.titleForm = "新增";
     },
     handleShowMoreInput(){
       this.moreInputVisible = !this.moreInputVisible;
     },
     /** 修改按钮操作 */
     handleUpdate(row) {
-      // this.reset();
-      // const id = row.id || this.ids
-      // getEmisWaybill(id).then(response => {
-      //   this.form = response.data;
-      //   this.open = true;
-      //   this.title = "修改";
-      // });
-
-       // 子组件打开模式
-    //    this.currentId= row.id || this.ids;
-    //    this.openEmisWaybill = true;
-    //    this.titleEmisWaybill = "修改";
-
+       this.currentId= row.id;
+       this.openForm = true;
+       this.titleForm = "修改";
     },
     handleView(row) {
        this.id=row.id;
@@ -2070,26 +761,6 @@ export default {
        this.openView=true;
     //   this.router.push({ path: '/emis/emisWaybill/viewDetail', query: { id: row.id }})
     },
-    /** 提交按钮 */
-    submitForm() {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          if (this.form.id != null) {
-            updateEmisWaybill(this.form).then(response => {
-              this.$modal.msgSuccess("修改成功");
-              this.open = false;
-              this.getList();
-            });
-          } else {
-            addEmisWaybill(this.form).then(response => {
-              this.$modal.msgSuccess("新增成功");
-              this.open = false;
-              this.getList();
-            });
-          }
-        }
-      });
-    },
     handleFormChanged(){
         this.openForm = false;
         this.getList();
@@ -2124,8 +795,8 @@ export default {
         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','orderType','orderDate','userId','customerCode','customerName','receiveCustomerCode','receiveCustomerName','thirdCustomerCode','thirdCustomerName','openId','receiveName','receiveCompany','receiveMobile','receiveTel','receiveCountry','receiveProvince','receiveCity','receiveCounty','receiveTown','receiveAddress','receivePostcode','sendName','sendCompany','sendMobile','sendTel','sendCountry','sendProvince','sendCity','sendCounty','sendTown','sendAddress','sendPostcode','paymentType','custNo','calcFeeType','transLineType','productType','timeType','meterType','customsClear','customsEclaration','estimateDate','packType','dispatchMethod','pickupMethod','pickStartDate','pickFinishDate','pickFailReason','intoWarehouseCode','intoWarehouseName','intoWarehouseAddress','intoWarehouseContact','intoWarehousePhone','intoWarehouseBillCode','customerDeliveryBeginTime','customerDeliveryEndTime','goodsType','goodsInfo','totalWeight','totalVolume','parcelQty','billWeight','volumeWeight','currency','settlementWeight','feeWeight','freight','blOverLong','blBill','blOverWeight','overWeightNumber','blBillText','feeRemaker','thirdCode','realValue','blInsure','insureValue','insureValueCurrency','insureFeeCurrency','insureFee','insureRemark','insureSite','insureSiteCode','insureDate','blPrint','printMan','printManCode','printSite','printDate','printCount','blDispFd','dispFdDate','dispFdReason','transferCode','transferBillcode','currentSiteCode','nextSiteCode','lastSiteCode','registerSite','registerSiteCode','registerDate','registerMan','registerManCode','takePieceEmployee','takePieceEmployeeCode','sendSite','sendSiteCode','sendDate','dispatchMan','dispatchManCode','dispatchDate','dispatchSite','dispatchSiteCode','produceBillDate','produceBillSite','produceBillSiteCode','produceBillMan','produceBillManCode','destination','destinationCode','destinationProvince','destinationCity','destinationCounty','dispatchUnderlingSite','dispatchUnderlingSiteCode','destinationCenter','destinationCenterCode','marketMan','marketManCode','payee','salesmen','operateEmployee','operateEmployeeCode','blIsQuestion','problemCause','blMessage','blAcceptMessage','blGenSubbill','signMan','signManCode','signSite','signSiteCode','signDate','billPicSendRmk','billPicDispatchRmk','timezoneOffset','modifier','modifierCode','modifyDate','modifySite','modifySiteCode','delFlag','createBy','createTime','updateBy','updateTime','remark',];
+                  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,
@@ -2166,7 +837,8 @@ export default {
 };
 </script>
 
-<style scoped>
+<style lang="scss" scoped>
+
   .el-divider{
     margin-top: 0px;
     background: 0 0;
@@ -2176,4 +848,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/emis/emisWaybill/orderRecord.vue b/src/views/emis/emisWaybill/orderRecord.vue
index c369ffb9..793d1064 100644
--- a/src/views/emis/emisWaybill/orderRecord.vue
+++ b/src/views/emis/emisWaybill/orderRecord.vue
@@ -1,467 +1,462 @@
 <template>
-  <div class="app-container">
-      <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="80px">
-        <el-row :gutter="0" >
-          <el-col :span="24">
-            <div class="form-group-title">{{ $t('发货信息') }}</div>
-          </el-col>
-          <el-col :span="7">
-              <el-form-item label="运单号" prop="billCode"  >
-                <div style="display:inline-flex">
-                  <!-- @keyup.enter.native="initData" -->
-                    <div><el-input v-model="form.billCode" placeholder="运单号" style="font-weight:600;color:black" /></div>
-                    <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
-                </div>
-              </el-form-item>
-          </el-col>
-
-            <el-col :span="5">
-              <el-form-item label="目的国" prop="reciever.country">
-                  <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="线路" prop="transLine">
-                <TransLinePicker v-model="form.transLine" :countryCode="form.reciever.country" @onChange="onTransLineChange"></TransLinePicker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="产品类型" prop="productType">
-                <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('发货时间')" prop="sendDate">
-                <el-input v-model="form.sendDate" placeholder="" readonly="" />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="报关方式" prop="customsEclaration">
-                <el-select v-model="form.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-col>
-            <el-col :span="6">
-              <el-form-item label="清关方式" prop="customsClear">
-                <el-select v-model="form.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-col>
-
-            <el-col :span="6">
-              <el-form-item label="取件类型" prop="pickupMethod">
-                <el-select v-model="form.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-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode">
-                <EmisUserSimplePicker0 :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item :label="$t('操作员')" prop="operateEmployeeCode">
-                <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="回款联系人" prop="payee" label-width="100px">
-                <el-input v-model="form.payee" placeholder="回款联系人" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="6">
-              <el-form-item label="销售联系人" prop="salesmen" label-width="100px">
-                <el-input v-model="form.salesmen" placeholder="销售联系人" disabled />
-              </el-form-item>
-            </el-col>
-            <el-col :span="12">
-                  <el-form-item label="派件方式" prop="dispatchMethod">
-                    <el-radio-group v-model="form.dispatchMethod">
-                      <el-radio
-                        v-for="dict in dict.type.emis_tab_dispatch_mode"
-                        :key="dict.value"
-                        :label="dict.value"
-                      >
-                      <span style="font-size:10px" >{{dict.label}}</span>
-                    </el-radio>
-                    </el-radio-group>
-                  </el-form-item>
-                </el-col>
-            <el-col :span="12">
-              <div style="display:flex;padding-left: 30px;">
-
-                <el-checkbox-group v-model="form.printTypeCheckList">
-                  <el-checkbox
-                    v-for="dict in dict.type.emis_print_type"
-                    :key="dict.value"
-                    :label="dict.label"
-                  >
-                    <span style="font-size:10px" >{{dict.label}}</span>
-                  </el-checkbox>
-                </el-checkbox-group>
-              </div>
-            </el-col>
-
-            <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
-              <el-form-item label="寄件客户" prop="customerCode">
-                    <customer-picker0 v-model="form.customerCode"></customer-picker0>
-              </el-form-item>
-            </el-col> -->
-        </el-row>
-
-        <el-row :gutter="0" style="border: 1px dotted #f5f7fa;border-radius: 5px;margin-top:10px">
-
-          <el-col :span="12">
-            <el-row :gutter="0" style="background: #fdfdfd;padding: 10px;border-radius:10px">
-              <el-col :span="24" style="display:inline-flex">
-                <div class="form-group-title" style="width:50%">寄件人</div>
-                <div style="width:50%;text-align:right;padding-right: 15px;">
-                    <!-- icon="el-icon-edit" -->
-                  <el-button
-                  size="mini"
-                  type="text"
-                  style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                  class="iconfont icon-dizhibao"
-                  @click="handleSelectCustomerAddress(1)"
-                >寄件地址薄</el-button>
-                </div>
-              </el-col>
-
-              <div class="form-row-group-panel">
-                <el-col :span="12">
-                  <el-form-item label="寄件人" prop="sender.name">
-                    <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="寄件电话" prop="sender.phone">
-                    <el-input v-model="form.sender.phone" placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="12">
-                  <el-form-item label="国家" prop="sender.country">
-                    <country-picker1 v-model="form.sender.country"></country-picker1>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="国家地区" prop="sender.province"  >
-                    <div style="display:inline-flex">
-                      <country-picker1 v-model="form.sender.country" ></country-picker1>
-                      <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
-                      <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
-                      <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="寄件地址" prop="sender.address">
-                    <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="寄件公司" prop="sender.company">
-                    <el-input v-model="form.sender.company" placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="寄件网点" prop="sendSiteName">
-                    <el-input v-model="form.sendSiteName" placeholder="寄件网点" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="" prop="blMessage">
-                    <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
-                  </el-form-item>
-                </el-col>
-            </div>
-
-            </el-row>
-          </el-col>
-
-          <el-col :span="12">
-            <el-row :gutter="0" style="padding: 8px;">
-              <el-col :span="24" style="display:inline-flex">
-                <div class="form-group-title" style="width:50%">收件人</div>
-                <div style="width:50%;text-align:right;padding-right: 15px;">
-                  <el-button
-                  size="mini"
-                  type="text"
-                  style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
-                  class="iconfont icon-dizhibao"
-                  @click="handleSelectCustomerAddress(2)"
-                >收件地址薄</el-button>
-                </div>
-              </el-col>
-
-              <div class="form-row-group-panel">
-
-                <!-- <el-col :span="12">
-                  <el-form-item label="收件客户" prop="customerCode">
-                    <customer-picker1 v-model="form.receiveCustomerCode"></customer-picker1>
-                  </el-form-item>
-                </el-col> -->
-                <!-- <el-col :span="12">
-                  <el-form-item label="选择收件人" prop="customerCode">
-                  </el-form-item>
-                </el-col> -->
-                <!-- <el-col :span="12">
-                  <el-form-item label="客户名称" prop="customerName">
-                    <el-input v-model="form.customerName" placeholder="请输入客户名称" />
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="12">
-                  <el-form-item label="收件人" prop="reciever.name">
-                    <CustomerAddressSimplePicker1 addressType="2" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
-                  </el-form-item>
+  <div class="app-container" >
+    <el-form ref="form"  size="mini" :model="form" :rules="rules" label-width="100px">
+        <el-collapse v-model="activeNames">
+          <el-collapse-item title="" name="1">
+            <template slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('发货信息') }}</span></div>
+            </template>
+            <div>
+              <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+                <el-col :span="6">
+                    <el-form-item :label="$t('发货时间')" prop="sendDate">
+                      <el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
+                    </el-form-item>
                 </el-col>
 
-                <el-col :span="12">
-                  <el-form-item label="收件电话" prop="reciever.phone">
-                    <el-input v-model="form.reciever.phone" placeholder="请输入收件人手机号" />
-                  </el-form-item>
+                <el-col :span="18">
+                    <el-form-item label="运单号" prop="billCode"  >
+                      <div style="display:inline-flex">
+                          <div><el-input v-model="form.billCode" placeholder="运单号" style="font-weight:600;color:black" /></div>
+                          <div style="padding-left:5px"> <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" @change="checked=>handleBillCodeChange(checked)"><span style="font-size:10px">电子主单</span></el-checkbox></div>
+                      </div>
+                    </el-form-item>
                 </el-col>
 
-                <!-- <el-col :span="12">
-                  <el-form-item label="国家" prop="reciever.country">
-                    <country-picker2 v-model="form.reciever.country"></country-picker2>
-                  </el-form-item>
-                </el-col> -->
-                <el-col :span="24">
-                  <el-form-item label="国家地区" prop="reciever.province">
-                    <div style="display:inline-flex">
-                      <country-picker2 v-model="form.reciever.country" ></country-picker2>
-                      <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
-                      <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
-                      <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="收件地址" prop="reciever.address">
-                    <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="详细地址" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="收件公司" prop="reciever.company">
-                    <el-input v-model="form.reciever.company" placeholder="请输入收件公司" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="目的地" prop="destinationCode">
-                    <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="派件网点" prop="dispatchSite">
-                    <el-input v-model="form.dispatchSite" placeholder="请输入派件网点" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="" prop="blAcceptMessage">
-                    <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
-                  </el-form-item>
-                </el-col>
-                <!-- <el-col :span="12">
-                  <el-form-item label="邮编" prop="receivePostcode">
-                    <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
-                  </el-form-item>
-                </el-col> -->
-              </div>
-            </el-row>
+                  <el-col :span="6">
+                    <el-form-item label="目的国" prop="reciever.country">
+                        <CountryPicker0 v-model="form.reciever.country"></CountryPicker0>
+                    </el-form-item>
+                  </el-col>
 
-          </el-col>
-        </el-row>
-        <el-row :gutter="0" style="border-radius: 5px;margin-top:10px">
-          <el-col :span="12">
-            <el-col :span="24">
-                <div class="form-group-title">货物信息</div>
-            </el-col>
+                  <el-col :span="8">
+                    <el-form-item label="产品类型" prop="productType">
+                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.reciever.country" @onChange="onProductChange" ></TransProductCasPicker>
+                      <!-- <trans-product-picker v-model="form.productType" :transLineCode="form.transLine"></trans-product-picker> -->
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="5">
+                    <el-form-item label="报关方式" prop="customsEclaration">
+                      <el-select v-model="form.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-col>
+                  <el-col :span="5">
+                    <el-form-item label="清关方式" prop="customsClear">
+                      <el-select v-model="form.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-col>
 
-            <div class="form-row-group-panel">
-              <el-col :span="24">
-                <el-form-item label="货物描述" prop="goodsType">
-                  <GoodsPicker v-model="form.goodsType" @onChange="onGoodsChange"></GoodsPicker>
-                  <el-input v-model="form.goodsInfo" type="textarea" placeholder="货物描述" disabled />
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                <el-form-item label="包装类型" prop="packType">
-                    <el-select v-model="form.packType" placeholder="请选择">
-                      <el-option
-                        v-for="dict in dict.type.emis_tab_packing_type"
-                        :key="dict.value"
-                        :label="dict.label"
-                        :value="dict.value"
-                      ></el-option>
-                    </el-select>
-                </el-form-item>
-              </el-col>
-              <el-col :span="12">
-                  <el-form-item label="件数" prop="parcelQty">
-                    <el-input v-model="form.parcelQty" style="text-align: right;" placeholder="请输入件数" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="8">
-                  <el-form-item label="实际重量" prop="billWeight">
-                    <el-input v-model="form.billWeight" @blur="calcWeight()" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
-                      <span slot="suffix">(kg)</span>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="16">
-                  <el-form-item label="体积" prop="totalVolume" label-width="60px" >
-                    <div style="display:inline-flex">
-                      <el-input v-model="form.length" style="width:80px" placeholder="长" >
-                        <span slot="suffix">(cm)</span>
-                      </el-input>
-                      <el-input v-model="form.width" style="margin-left:5px;width:80px" placeholder="宽" >
-                        <span slot="suffix">(cm)</span>
-                      </el-input>
-                      <el-input v-model="form.height" style="margin-left:5px;width:80px" placeholder="高" >
-                        <span slot="suffix">(cm)</span>
-                      </el-input>
-                    </div>
-                    <div style="">
-                      <el-input v-model="form.totalVolume" @blur="calcWeight()" style="text-align: right;width: 120px" placeholder="体积" >
-                        <span slot="suffix">(m³)</span>
-                      </el-input>
-                    </div>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="体积重量" prop="volumeWeight">
-                    <el-input v-model="form.volumeWeight" placeholder="" disabled>
-                      <span slot="suffix">(kg)</span>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="结算重量" prop="settlementWeight">
-                    <el-input v-model="form.settlementWeight" placeholder="" disabled >
-                      <span slot="suffix">(kg)</span>
-                    </el-input>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="" prop="blOverWeight">
-                    <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="超重件数" prop="overWeightNumber">
-                    <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="是否生成子单" prop="blGenSubbill" label-width="120px">
-                    <el-radio-group v-model="form.blGenSubbille">
-                      <el-radio  label="1">是</el-radio>
-                      <el-radio  label="0">否</el-radio>
-                    </el-radio-group>
+                  <el-col :span="6">
+                    <el-form-item label="取件方式" prop="pickupMethod">
+                      <el-select v-model="form.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-col>
+                  <el-col :span="6" v-if="form.pickupMethod==2">
+                    <el-form-item :label="$t('取件员')" prop="takePieceEmployeeCode" >
+                      <EmisUserSimplePicker0  :placeholder="$t('取件员')" v-model="form.takePieceEmployeeCode" postCode="RSD" ></EmisUserSimplePicker0>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6" v-if="form.pickupMethod==1">
+                    <el-form-item :label="$t('操作员')" prop="operateEmployeeCode" >
+                      <EmisUserSimplePicker1 :placeholder="$t('操作员')" v-model="form.operateEmployeeCode" postCode="OP" ></EmisUserSimplePicker1>
+                    </el-form-item>
+                  </el-col>
 
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="子单号" prop="billCodeSub">
-                    <el-input v-model="form.billCodeSub" type="textarea" placeholder="" disabled />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="合同号" prop="custOrderId">
-                    <el-input v-model="form.custOrderId" placeholder="" />
-                  </el-form-item>
-                </el-col>
-                <el-col :span="12">
-                  <el-form-item label="进仓单" prop="warehouseInNo">
-                    <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
-                  </el-form-item>
-                </el-col>
-                <el-col :span="24">
-                  <el-form-item label="运单备注" prop="remark">
-                    <el-input v-model="form.remark" type="textarea" placeholder="" />
-                  </el-form-item>
-                </el-col>
+                  <el-col :span="24">
+                    <el-form-item label="派件方式" prop="dispatchMethod">
+                      <el-radio-group v-model="form.dispatchMethod">
+                        <el-radio
+                          v-for="dict in dict.type.emis_tab_dispatch_mode"
+                          :key="dict.value"
+                          :label="dict.value"
+                        >
+                        <!-- style="font-size:10px" -->
+                        <span  >{{dict.label}}</span>
+                      </el-radio>
+                      </el-radio-group>
+                    </el-form-item>
+                  </el-col>
+                  <el-col :span="6">
+                      <el-form-item label="寄件网点" prop="sendSiteName">
+                        <el-input v-model="form.sendSiteName" placeholder="" disabled />
+                      </el-form-item>
+                  </el-col>
+
+                  <el-col :span="18">
+                    <el-form-item label="打印选项:" prop="sendSiteName">
+                      <el-checkbox-group v-model="printTypeCheckList">
+                        <el-checkbox
+                          v-for="dict in dict.type.emis_print_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                        >
+                          <span style="font-size:13px" >{{dict.label}}</span>
+                        </el-checkbox>
+                      </el-checkbox-group>
+                    </el-form-item>
+                    <!-- <div style="display:flex;padding-left: 30px;">
+                      <el-checkbox-group v-model="printTypeCheckList">
+                        <el-checkbox
+                          v-for="dict in dict.type.emis_print_type"
+                          :key="dict.value"
+                          :label="dict.label"
+                        >
+                          <span style="font-size:13px" >{{dict.label}}</span>
+                        </el-checkbox>
+                      </el-checkbox-group>
+                    </div> -->
+                  </el-col>
+
+                  <!-- <el-col :xs="{span: 24}" :sm="{span: 12}" :md="{span: 12}" :lg="{span: 6}" :xl="{span: 6}">
+                    <el-form-item label="寄件客户" prop="customerCode">
+                          <customer-picker0 v-model="form.customerCode"></customer-picker0>
+                    </el-form-item>
+                  </el-col> -->
+              </el-row>
 
             </div>
-          </el-col>
-          <el-col :span="12">
-            <el-col :span="24">
-                <div class="form-group-title">收费信息</div>
-            </el-col>
-
-            <div class="form-row-group-panel">
-
-              <el-col :span="24">
-                  <el-divider content-position="left"><span style="font-size: 12px;color: gray;">收费项明细</span></el-divider>
-                  <el-row>
-                    <el-col :span="24" v-for="item in this.form.feeItems" :key="item.code" >
-                        <el-form-item v-if="item.feeCode=='1001'" :label="item.feeName" prop="fee" >
-                            <div style="display:inline-flex">
-                              <div style="width:50%">
-                                <el-input v-model="item.fee" placeholder="" disabled>
-                                  <span slot="append">CNY</span>
-                                </el-input>
-                              </div>
-                              <div style="font-size: 12px;color: gray;width:50%">
-                                 (计算说明:{{item.calcExp}},续重单价:{{item.addWeightPrice}})
-                              </div>
-                            </div>
-                        </el-form-item>
-                        <el-form-item v-else :label="item.feeName" prop="fee" >
-                            <el-input v-model="item.fee" placeholder="" disabled>
-                              <span slot="append">CNY</span>
-                            </el-input>
-                        </el-form-item>
+          </el-collapse-item>
+          <el-collapse-item title="" name="2">
+            <template slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('收寄件信息') }}</span></div>
+            </template>
+            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;border: 1px dotted #f5f7fa;border-radius: 5px;">
+                <el-col :span="12">
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;background: #fdfdfd;padding:15px">
+                    <el-col :span="24" style="display:inline-flex; margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
+                      <div class="form-group-title" style="width:50%">
+                          <span style="border-radius: 15px;
+                            padding: 5px 15px;
+                            background: black;
+                            font-size: 13px;
+                            color: white;">寄件信息</span>
+                      </div>
+                      <div style="width:50%;text-align:right;padding-right: 15px;">
+                          <!-- icon="el-icon-edit" -->
+                        <el-button
+                        size="mini"
+                        type="text"
+                        style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;color: black;"
+                        class="iconfont icon-dizhibao"
+                        @click="handleSelectCustomerAddress(1)"
+                      >寄件地址薄</el-button>
+                      </div>
                     </el-col>
-                  </el-row>
-              </el-col>
 
-                <!-- <el-select size="mini" v-model="item.fee.currency" slot="append" placeholder="请选择">
-                                <el-option label="CNY" value="CNY"></el-option>
-                                <el-option label="USD" value="USD"></el-option>
-                              </el-select> -->
-
-              <el-col :span="24">
-                <el-divider content-position="left"><span style="font-size: 12px;color: gray;">付款方式</span></el-divider>
-                <el-row>
-                    <el-col :span="10">
-                      <el-form-item label="付款方式" prop="paymentType">
-                        <el-select v-model="form.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-col :span="12">
+                      <el-form-item label="寄件人" prop="sender.name">
+                        <CustomerAddressSimplePicker0 addressType="1" v-model="form.sender.name" @onChange="onChangeSelectSender"></CustomerAddressSimplePicker0>
                       </el-form-item>
                     </el-col>
-                    <el-col :span="14" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
-                      <el-form-item label="月结账号" prop="thirdCustomerCode" label-width="80px">
-                        <EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
+                    <el-col :span="12">
+                      <el-form-item label="寄件电话" prop="sender.phone">
+                        <el-input v-model="form.sender.phone" placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="国家地区" prop="sender.province"  >
+                        <div style="display:inline-flex">
+                          <country-picker1 v-model="form.sender.country" ></country-picker1>
+                          <province-picker1 v-model="form.sender.province" :countryCode="form.sender.country" style="margin-left:5px"></province-picker1>
+                          <city-picker1 v-model="form.sender.city" :parentCode="form.sender.province" style="margin-left:5px"></city-picker1>
+                          <district-picker1 v-model="form.sender.county" :parentCode="form.sender.city" style="margin-left:5px"></district-picker1>
+                        </div>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="寄件地址" prop="sender.address">
+                        <el-input v-model="form.sender.address" rows="3" type="textarea"  placeholder="" />
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="寄件公司" prop="sender.company">
+                        <el-input v-model="form.sender.company" placeholder="" />
                       </el-form-item>
                     </el-col>
 
                     <el-col :span="24">
-                      <el-form-item label="计费方式" prop="calcFeeType" >
+                      <el-form-item label="" prop="blMessage">
+                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">寄件/签收短信</span></el-checkbox>
+                      </el-form-item>
+                    </el-col>
+
+                  </el-row>
+                </el-col>
+
+                <el-col :span="12">
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding:15px">
+                      <el-col :span="24" style="display:inline-flex;margin-bottom: 10px;border-bottom: 1px dotted #e6ebf5">
+                        <div class="form-group-title" style="width:50%">
+                          <span style="border-radius: 15px;
+                              padding: 5px 15px;
+                              background: #b12e29;
+                              font-size: 13px;
+                              color: white;">收件信息</span>
+                          </div>
+                        <div style="width:50%;text-align:right;padding-right: 15px;">
+                          <el-button
+                          size="mini"
+                          type="text"
+                          style="cursor:hand;font-weight:700;border:1px dotted #e2d8d8;padding: 2px 5px;"
+                          class="iconfont icon-dizhibao"
+                          @click="handleSelectCustomerAddress(2)"
+                        >收件地址薄</el-button>
+                        </div>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="收件人" prop="reciever.name">
+                          <CustomerAddressSimplePicker1 addressType="2"  :countryCode="form.reciever.country" v-model="form.reciever.name" @onChange="onChangeSelectReceiver"></CustomerAddressSimplePicker1>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="收件电话" prop="reciever.phone">
+                          <el-input v-model="form.reciever.phone" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="国家地区" prop="reciever.province">
+                          <div style="display:inline-flex">
+                            <country-picker2 v-model="form.reciever.country" ></country-picker2>
+                            <ProvincePicker2 v-model="form.reciever.province" :countryCode="form.reciever.country"  style="margin-left:5px"></ProvincePicker2>
+                            <city-picker2 v-model="form.reciever.city" :parentCode="form.reciever.province" style="margin-left:5px"></city-picker2>
+                            <district-picker2 v-model="form.reciever.county" :parentCode="form.reciever.city" style="margin-left:5px"></district-picker2>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="收件地址" prop="reciever.address">
+                          <el-input v-model="form.reciever.address" type="textarea" rows="3" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="收件公司" prop="reciever.company">
+                          <el-input v-model="form.reciever.company" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="目的地" prop="destinationCode">
+                          <DestinationPicker v-model="form.destinationCode" :countryCode="form.reciever.country" :lineCode="form.transLine" @onChange="onDestinationChange"></DestinationPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="派件网点" prop="dispatchSite">
+                          <el-input v-model="form.dispatchSite" placeholder="" disabled />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="" prop="blAcceptMessage">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blAcceptMessage" :true-label="'1'" :false-label="'0'"><span style="font-size:10px">派件短信</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                      <!-- <el-col :span="12">
+                        <el-form-item label="邮编" prop="receivePostcode">
+                          <el-input v-model="form.receivePostcode" placeholder="请输入邮编" />
+                        </el-form-item>
+                      </el-col> -->
+                  </el-row>
+                </el-col>
+            </el-row>
+          </el-collapse-item>
+          <el-collapse-item title="" name="3">
+            <template slot="title">
+              <div class="form-group-title"><span class="title">{{ $t('重量收费信息') }}</span>
+              </div>
+            </template>
+            <el-row :gutter="0" style="display: flex;flex-wrap: wrap;">
+              <el-col :span="12">
+
+                <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
+                    <el-col :span="24"><div style="font-weight:600">货物信息</div></el-col>
+                    <el-col :span="24">
+                        <el-form-item label="" prop="goodsType" label-width="0px">
+                          <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker>
+                            <el-table
+                            class="cargoList"
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                            border
+                            stripe
+                            :data="form.cargoList"
+                            size="small"
+                            style="width: 100%"
+                            max-height="300px"
+                          >
+
+
+                          <el-table-column prop="goodsName" label="描述" align="center" min-width="100">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.goodsName" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+
+                            <el-table-column prop="length" label="长(cm)" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.length" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="width" label="宽(cm)" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.width" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="height" label="高(cm)" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.height" @input="(val)=>handleCalcVolume(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="volume" label="体积(m³)" align="center" width="80">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.volume" size="mini" placeholder="" disabled></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="cargoQty" label="件数" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.cargoQty" @input="(val)=>handleCalcQty(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+
+
+                            <el-table-column label="操作" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    @click="()=>deleteGoodsItem(scope.row)">&#xe7ae;</span>
+                                  </template>
+                            </el-table-column>
+
+                          </el-table>
+
+                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" disabled />
+                        </el-form-item>
+                    </el-col>
+
+                    <el-col :span="12">
+                        <el-form-item label="实际重量" prop="billWeight" label-width="70px">
+                          <el-input v-model="form.billWeight" @blur="reCalcSettlementWeight" style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="总体积" prop="totalVolume" label-width="70px" >
+                          <div style="">
+                            <el-input v-model="form.totalVolume"  style="text-align: right;width: 120px" placeholder="体积" >
+                              <span slot="suffix">(m³)</span>
+                            </el-input>
+                          </div>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="总件数" prop="parcelQty" label-width="70px">
+                          <el-input v-model="form.parcelQty" style="text-align: right;" placeholder=""  />
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="体积重量" prop="volumeWeight" label-width="70px">
+                          <el-input v-model="form.volumeWeight" placeholder="" disabled>
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="结算重量" prop="settlementWeight" label-width="70px">
+                          <el-input v-model="form.settlementWeight" placeholder="" disabled >
+                            <span slot="suffix">(kg)</span>
+                          </el-input>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="包装类型" prop="packType" label-width="70px"">
+                            <el-select v-model="form.packType" placeholder="请选择">
+                              <el-option
+                                v-for="dict in dict.type.emis_tab_packing_type"
+                                :key="dict.value"
+                                :label="dict.label"
+                                :value="dict.value"
+                              ></el-option>
+                            </el-select>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="" prop="blOverWeight">
+                          <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blOverWeight" :true-label="'1'" :false-label="'0'" ><span style="font-size:10px">是否超重</span></el-checkbox>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12" v-if="form.blOverWeight==1">
+                        <el-form-item label="超重件数" prop="overWeightNumber" label-width="70px">
+                          <el-input :disabled="!form.blOverWeight" v-model="form.overWeightNumber" placeholder="超重件数" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="生成子单" prop="blGenSubbill" label-width="70px" v-if="this.form.billCode && this.form.parcelQty>0">
+                          <el-radio-group v-model="form.blGenSubbill" @change="handleGenSubbill">
+                            <el-radio :key="1"  :label="1">是</el-radio>
+                            <el-radio :key="0"  :label="0">否</el-radio>
+                          </el-radio-group>
+
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24" v-if="form.blGenSubbill==1">
+                        <el-form-item label="子单号" prop="billCodeSub" label-width="70px">
+                          <el-input v-model="form.billCodeSub" rows="5" type="textarea" placeholder="" disabled />
+                        </el-form-item>
+                      </el-col>
+
+                      <el-col :span="12">
+                        <el-form-item label="进仓单" prop="warehouseInNo" label-width="70px">
+                          <WarehouseInNoPicker v-model="form.warehouseInNo"></WarehouseInNoPicker>
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="12">
+                        <el-form-item label="合同号" prop="custOrderId" label-width="70px">
+                          <el-input v-model="form.custOrderId" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                      <el-col :span="24">
+                        <el-form-item label="运单备注" prop="remark" label-width="70px">
+                          <el-input v-model="form.remark" type="textarea" placeholder="" />
+                        </el-form-item>
+                      </el-col>
+                  </el-row>
+
+              </el-col>
+               <el-col :span="12" >
+                  <el-row :gutter="0" style="display: flex;flex-wrap: wrap;padding: 0px 15px;">
+
+                    <el-col :span="24">
+                      <el-form-item label="计费方式" prop="calcFeeType" label-width="70px">
                         <!-- <el-input v-model="form.calcFeeType" placeholder="请输入计费方式" /> -->
                         <el-radio-group v-model="form.calcFeeType" >
                           <el-radio
@@ -475,26 +470,146 @@
                     </el-col>
 
                     <el-col :span="24">
-                      <el-divider content-position="left">收费明细</el-divider>
-                      <el-form-item label="总运费" prop="freight">
+                        <el-form-item label="" prop="goodsType" label-width="0px">
+                            <el-table
+                            class="cargoList"
+                            :cell-style="{
+                              'padding': '0px!important',
+                              'padding-left': '0px!important',
+                              'padding-right': '0px!important',
+                              'font-size':'11px'
+                            }"
+                            :header-cell-style="{
+                              'font-size':'11px'
+                            }"
+                            border
+                            stripe
+                            :data="form.feeItems"
+                            size="mini"
+                            max-height="300px"
+                            style="width: 100%"
+                          >
+
+
+                            <el-table-column prop="feeName" label="收费项" align="center" width="70">
+                              <template slot-scope="scope">
+                                <span style="font-weight:600;color:red">{{ scope.row.feeName }}</span>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="fee" label="应收" align="center" width="50">
+                              <template slot-scope="scope">
+                                <span>{{ scope.row.fee }}</span>
+                              </template>
+                            </el-table-column>
+
+                            <el-table-column prop="initialWeightFee" label="首重费" align="center" width="60">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column prop="remark" label="描述" align="center" min-width="50">
+                              <template slot-scope="scope">
+                                <el-input  v-model="scope.row.remark" size="mini" placeholder=""></el-input>
+                              </template>
+                            </el-table-column>
+                            <el-table-column label="操作" align="center" width="50">
+                                  <template slot-scope="scope">
+                                    <span class="icon iconfont"
+                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
+                                    v-if="scope.row.blAutoGen==0"
+                                    @click="()=>deleteFeeItem(scope.row)">&#xe7ae;</span>
+                                  </template>
+                            </el-table-column>
+
+                          </el-table>
+                          <div>
+                            <el-popover
+                                trigger="click"
+                                ref="popoverFeeRef"
+                                placement="top"
+                                :width="400"
+                                effect="light"
+                                :show-arrow="false"
+                              >
+                                <feeItemForm :triggerCount="triggerCount" :feeList="this.form.feeItems" @on-changed="onFeeItemChange" @on-cancel="onFeeItemChange"></feeItemForm>
+                                <el-button
+                                     slot="reference"
+                                      style="padding: 0px;font-size: 12px;"
+                                      size="mini"
+                                      type="text"
+                                      icon="el-icon-plus"
+                                      @click="handleAddFee"
+                                    >增加自定义费用</el-button>
+                              </el-popover>
+                          </div>
+
+                        </el-form-item>
+                    </el-col>
+                    <el-col :span="24">
+                      <el-form-item label="总运费" prop="freight" label-width="70px">
                             <el-input v-model="form.freight" placeholder="" >
                         </el-input>
                       </el-form-item>
-                      <el-form-item label="费用备注" prop="feeRemaker">
+                      <el-form-item label="费用备注" prop="feeRemaker" label-width="70px">
                             <el-input v-model="form.feeRemaker" type="textarea" placeholder="" >
                         </el-input>
                       </el-form-item>
                     </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="付款方式" prop="paymentType" label-width="70px">
+                        <el-select v-model="form.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 :span="12">
+                    </el-col>
+                    <el-col :span="24" v-show="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5">
+                      <el-form-item label="月结账号" prop="thirdCustomerCode" label-width="70px">
+                        <EmisMonthpayAccountPicker v-model="form.custNo"></EmisMonthpayAccountPicker>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="回款联系人" prop="payee" label-width="80px">
+                        <EmisUserSimplePicker2 :placeholder="$t('回款联系人')" v-model="form.payee"  ></EmisUserSimplePicker2>
 
-                </el-row>
-              </el-col>
-            </div>
-          </el-col>
-        </el-row>
+                      </el-form-item>
+                    </el-col>
+                    <el-col :span="12">
+                      <el-form-item label="销售联系人" prop="salesmen" label-width="80px">
+                        <EmisUserSimplePicker3 :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></EmisUserSimplePicker3>
+                      </el-form-item>
+                    </el-col>
 
-      </el-form>
-    <!-- </el-row> -->
-    <div style="text-align: center;margin-bottom: 10px;">
+
+
+
+
+                  </el-row>
+
+               </el-col>
+            </el-row>
+          </el-collapse-item>
+
+      </el-collapse>
+
+    </el-form>
+    <div style="text-align: center;margin-top: 10px;margin-bottom: 10px;">
       <el-button type="primary" @click="submitForm">确 定</el-button>
       <el-button @click="initData">重置</el-button>
     </div>
@@ -503,14 +618,12 @@
         <AddressSelectPicker0 :addressType="addressType"   @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
     </el-dialog>
 
-
-
 </div>
 </template>
 
 <script>
 import { realMatchWaybill } from "@/api/emis/emisElectronicPag";
-import { listEmisWaybill, getEmisWaybill, delEmisWaybill,getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight} from "@/api/emis/emisWaybill";
+import { getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
 import { parseTime } from "@/utils/custom";
 import { getDestSite } from "@/api/emis/emisDestination";
 
@@ -518,13 +631,15 @@ import DestinationPicker from '@/views/emis/EmisBaseTools/DestinationPicker.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 EmisUserSimplePicker3 from '@/views/emis/EmisBaseTools/EmisUserSimplePicker.vue';
 
 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';
@@ -540,7 +655,7 @@ import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
 // import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
 // import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
 
-import GoodsPicker from '@/views/emis/EmisBaseTools/GoodsPicker.vue';
+import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
 import CustomerAddressSimplePicker0 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
 import CustomerAddressSimplePicker1 from '@/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue';
 import AddressSelectPicker0 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
@@ -548,23 +663,32 @@ import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker
 import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
 import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
 
+import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
+import feeItemForm from './feeItemForm.vue';
+
+
+
 export default {
-name: "emisWaybillForm",
-// props:{
-//   billCode:{
-//     type:String
-//   }
-// },
+  name: "WaybillEntry",
+  // props:{
+  //   billCode:{
+  //     type:String
+  //   }
+  // },
 components: {
+  feeItemForm,
+  TransProductCasPicker,
   WarehouseInNoPicker,
   EmisMonthpayAccountPicker,
   AddressSelectPicker0,
   AddressSelectPicker1,
   CustomerAddressSimplePicker0,
   CustomerAddressSimplePicker1,
-  GoodsPicker,
+  GoodsSimplePicker,
   EmisUserSimplePicker0,
   EmisUserSimplePicker1,
+  EmisUserSimplePicker2,
+  EmisUserSimplePicker3,
   // CustomerPicker0,
   // CustomerPicker1,
   // CustomerPicker2,
@@ -589,12 +713,15 @@ dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
         'emis_calc_fee_type','emis_print_type'],
 data() {
   return {
+    activeNames:['1','2','3','4'],
     billCode:null,
     emisWaybillOptions: [],
     addressType:null,
     // 遮罩层
     loading: true,
-
+    isNeedSave:false,
+    triggerCount:0,
+    printTypeCheckList:['1','2','5'],
     // 表单参数
     form: {},
     timer:null,
@@ -604,7 +731,7 @@ data() {
     // 表单校验
     rules: {
       billCode: [
-        { required: true, message: "运单号不能为空", trigger: "blur" }
+        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  }
       ],
       reciever:{
         name: [
@@ -725,102 +852,173 @@ data() {
   };
 },
  watch: {
-    "billCode": {
-      handler (newValue, oldValue) {
-        // this.id = newValue;
-        // this.initData();
-      },
-      deep: true
-    },
-    "form.transLine":{
-      handler (newValue, oldValue) {
-        this.calcDestSite();
-      },
-      deep: true
-    },
     "form.reciever.province":{
       handler (newValue, oldValue) {
-        console.log("==>"+newValue)
+        // this.isNeedSave=true;
         this.calcDestSite();
       },
-      deep: true
-    },
-    "form.length":{
-      handler (newValue, oldValue) {
-        this.calcVolume();
-      },
-      deep: true
-    },
-    "form.width":{
-      handler (newValue, oldValue) {
-        this.calcVolume();
-      },
-      deep: true
-    },
-    "form.height":{
-      handler (newValue, oldValue) {
-        this.calcVolume();
-      },
-      deep: true
+      immediate: false,
+      deep: true,
     },
     "form.totalVolume":{
       handler (newValue, oldValue) {
-        if(newValue!= oldValue){
-          this.calcWeight();
-        }
-
+        this.reCalcVolumeWeight();
       },
       deep: true
     },
+    "form.volumeWeight":{
+      handler (newValue, oldValue) {
+        this.reCalcSettlementWeight();
+      },
+      immediate: false,
+      deep: true
+    },
     "form.billWeight":{
       handler (newValue, oldValue) {
-        if(newValue!= oldValue){
-          this.calcWeight();
-
-        }
+        this.reCalcSettlementWeight();
       },
+      immediate: false,
       deep: true
     },
     "form.calcFeeType":{
       handler (newValue, oldValue) {
           this.calcBillFee();
       },
+      immediate: false,
       deep: true
     },
     "form.settlementWeight":{
       handler (newValue, oldValue) {
           this.calcBillFee();
       },
+      immediate: false,
+      deep: true
+    },
+    "form.parcelQty":{
+      handler (newValue, oldValue) {
+          this.handleGenSubbill();
+      },
+      immediate: false,
       deep: true
     },
 
+},
+activated(){
 },
 mouted(){
-
+},
+updated(){
 },
 created() {
   this.billCode=this.$route.query.billCode;
   this.initData();
+
 },
 methods: {
+  handleAddFee(){
+    this.triggerCount++;
+  },
+  onFeeItemChange(item){
+    this.$refs.popoverFeeRef.doClose();
+    if(item!=null){
+      let newItem=Object.assign({},item)
+      this.form.feeItems.push(newItem);
+      this.handleCalcFeeItem();
+    }
+
+  },
+  deleteFeeItem(row){
+    if(row.blAutoGen==1){
+      this.$message('不允许删除!')
+      return;
+    }
+    this.$confirm('确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+      let newList = this.form.feeItems.filter(item => item.feeCode !== row.feeCode);
+      this.form.feeItems=newList;
+
+    }).catch(() => {
+    })
+
+  },
+  deleteGoodsItem(row){
+    this.$confirm('确定删除?', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+    }).then(() => {
+      let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
+      this.form.cargoList=newList;
+      this.handleCalcQty();
+      this.handleCalcVolume();
+    }).catch(() => {
+    })
+
+  },
+  lpadZero(val,len) {
+    return (new Array(len + 1).join('0') + val).slice(-len);
+  },
+  handleGenSubbill(value){
+    if(this.form.blGenSubbill==1 && this.form.parcelQty > 0 && this.form.billCode){
+        // let billSubCodeStr="";
+        // for(let i=1;i<this.form.parcelQty;i++){
+        //   let subBillCode = this.form.billCode+""+this.lpadZero(i,3);
+        //   billSubCodeStr=billSubCodeStr+subBillCode+";"
+        //   console.log(billSubCodeStr);
+        // }
+        let billSubCodeStr = this.form.billCode+"["+this.lpadZero(1,3)+"-"+this.lpadZero(this.form.parcelQty,3)+"]";
+        console.log(billSubCodeStr);
+        this.form.billCodeSub=billSubCodeStr;
+    }else{
+      this.form.billCodeSub=null;
+    }
+
+  },
+  openCollapse(index){
+
+  },
   initData() {
       this.reset();
-      // this.timer=setInterval(this.showLocalTime, 1000);
-
       this.form.sendDate =  parseTime(new Date());
       this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
       this.form.sendSiteName=this.$store.getters.ownerSiteName;
-
-      // console.log(this.form.sendSiteCode);
+      console.log(this.form.sendSiteName)
 
       if(this.billCode !=null) {
         this.loading = true;
         getWaybillDetail(this.billCode).then(response => {
           this.form = response.data;
+          this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
           this.loading = false;
+
+          this.isNeedSave=true;
+
         });
+      }else{
+        // console.log(this.dict.type.emis_declare_mode[0]);
+
+        // this.form.customsEclaration = this.dict.type.emis_declare_mode[0].value;
+        this.form.customsEclaration='1';
+        this.form.customsClear='1';
+        this.form.pickupMethod='2';
+        this.form.dispatchMethod='1';
+        // this.form.billWeight=1.0;
+        // this.form.totalVolume=0.0;
+        this.form.parcelQty=1;
+        this.form.packType='2';
+        this.form.blOverWeight='0';
+        this.form.blGenSubbill=0;
+        this.form.paymentType='1';
+        this.form.calcFeeType='1';
+        this.form.blMessage='1'
+
+        this.isNeedSave=true;
       }
 
+
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -830,6 +1028,7 @@ methods: {
     this.reset();
     this.$emit("on-cancel");
   },
+
   // 表单重置
   reset() {
     this.form = {
@@ -871,6 +1070,7 @@ methods: {
       paymentType: null,
       calcFeeType: '1',
       custNo:  null,
+      productTypeSelArr: null,
       transLine:  null,
       productType: null,
       customsClear: null,
@@ -917,18 +1117,20 @@ methods: {
       operateEmployeeCode: null,
       blMessage: null,
       blAcceptMessage: null,
-      meterType:null
+      meterType:null,
+      blGenSubbill:null,
+      billCodeSub:null,
   };
     this.resetForm("form");
   },
-  onTransLineChange(item){
-    this.form.meterType = item.meterRate;
+  onProductChange(item){
+    this.form.transLine=item[0];
+    this.form.productType=item[1];
   },
   /** 提交按钮 */
   submitForm() {
     this.$refs["form"].validate(valid => {
       if (valid) {
-        console.log(this.form);
         realSubmitOrder(this.form).then(response => {
             this.$modal.msgSuccess("下单成功");
             this.$emit("on-changed");
@@ -977,12 +1179,16 @@ methods: {
   },
   // 计算目的站点
   calcDestSite(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
     let queryParams = {
-            lineCode:this.form.transLine,
             province:this.form.reciever.province
     };
 
-    if(this.form.transLine && this.form.reciever.province){
+    if(this.form.reciever.province){
         getDestSite(queryParams).then(response => {
           console.log(response);
           this.form.destinationCode = response.data.destCode+'';
@@ -995,44 +1201,100 @@ methods: {
         });
     }
   },
-  calcVolume(){
-      // 计算体积
-    if(this.form.length && this.form.width && this.form.height){
-        let totalVolume=parseFloat(this.form.length)*parseFloat(this.form.width)*parseFloat(this.form.height);
-        this.form.totalVolume = totalVolume/1000000;
+  handleCalcVolume(val,row){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
     }
-  },
-  calcWeight(){
 
-      if(this.form.billWeight
-        && this.form.totalVolume
+    let totalVolume=0.0;
+    if(row!=null){
+      let volume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height);
+      row.volume=parseFloat((volume/1000000).toFixed(5));
+    }
+
+    this.form.cargoList.forEach(item=>{
+        totalVolume=totalVolume+item.volume;
+    });
+    this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
+
+  },
+  handleCalcQty(val,row){
+    let totalCargoQty=0;
+    let goodsInfo='';
+
+    this.form.cargoList.forEach(item=>{
+        totalCargoQty=totalCargoQty+parseInt(item.cargoQty);
+        goodsInfo=goodsInfo+item.goodsName+"x"+item.cargoQty+",";
+
+    });
+
+    this.form.goodsInfo = goodsInfo;
+    this.form.parcelQty = totalCargoQty;
+
+    this.handleGenSubbill();
+  },
+  handleCalcFeeItem(val,row){
+    let totalFee=0;
+    this.form.feeItems.forEach(item=>{
+      totalFee=totalFee+parseInt(item.realFee);
+    });
+    this.form.freight = totalFee;
+  },
+  // 计算体积重量
+  reCalcVolumeWeight(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+    if( this.form.totalVolume
         && this.form.productType
       ){
         let postData={
-          productType: this.form.productType,
-          totalVolume: this.form.totalVolume,
-          billWeight: this.form.billWeight,
+            productType: this.form.productType,
+            totalVolume: this.form.totalVolume,
         }
-        // console.log(postData);
-        calcSetteldWeight(postData).then(response => {
-              console.log(response);
+
+        calcVolumeWeight(postData).then(response => {
               this.form.volumeWeight = response.data.volumeWeight;
-              this.form.settlementWeight = response.data.settlementWeight;
-              this.form.feeWeight = this.form.settlementWeight ;
         });
       }
 
+  },
+   // 计算计算重量
+  reCalcSettlementWeight(){
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
+
+      if(this.form.billWeight
+        && this.form.volumeWeight
+        && this.form.productType
+      ){
+        setTimeout(()=>{
+            let postData={
+              productType: this.form.productType,
+              volumeWeight: this.form.volumeWeight,
+              billWeight: this.form.billWeight,
+            }
+
+            calcSetteldWeight(postData).then(response => {
+                  this.form.settlementWeight = response.data.settlementWeight;
+                  this.form.feeWeight = this.form.settlementWeight ;
+            });
+        },1000);
+      }
+
   },
   calcBillFee(){
-    console.log("hello=>"+this.form.settlementWeight);
-    console.log("hello=>"+this.form.totalVolume);
-    console.log("hello=>"+this.form.productType);
-    console.log("hello=>"+this.form.sendSiteCode);
-    console.log("hello=>"+this.form.dispatchUnderlingSiteCode);
-    console.log("hello=>"+this.form.calcFeeType);
+    // 初始化不计算
+    if(!this.isNeedSave){
+      return;
+    }
 
     if(this.form.settlementWeight
-        && this.form.totalVolume
         && this.form.productType
         && this.form.sendSiteCode
         && this.form.dispatchUnderlingSiteCode
@@ -1044,17 +1306,27 @@ methods: {
           custNo: this.form.custNo,
           calcFeeType: this.form.calcFeeType,
           settlementWeight: this.form.settlementWeight,
-          totalVolume: this.form.totalVolume,
           sendSiteCode: this.form.sendSiteCode,
           dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
         }
 
-        console.log(postData);
         calcWaybillFee(postData).then(response => {
-              console.log(response);
-              this.form.freight = response.data.totalFee;
-              this.form.feeItems = response.data.feeList ;
+              let newFeeList=response.data.feeList;
+              let newFeeMap = new Map();
+              newFeeList.forEach(item=>{
+                  newFeeMap[item.feeCode]=item;
+              });
 
+
+              let custFeeList = [];
+              this.form.feeItems.forEach(item=>{
+                  if(item.blAutoGen!='1' && !(item.feeCode in newFeeMap)){
+                    custFeeList.push(item);
+                  }
+              });
+
+              this.form.feeItems = newFeeList.concat(custFeeList);
+              this.handleCalcFeeItem();
         });
       }
   },
@@ -1066,22 +1338,43 @@ methods: {
     this.form.dispatchUnderlingSite= item.siteName;
     this.form.dispatchSite= item.siteName;
   },
-  onGoodsChange(goodsList,goodsInfo){
-      this.form.goodsInfo = goodsInfo;
-      this.form.cargoList = [];
-      if(goodsList!=null && goodsList.length>0) {
-        goodsList.forEach(item=>{
-          let cargo={
-            "goodsCode": item.goodsCode,
-            "goodsName": item.goodsName,
-            "cargoQty": 1,
-          }
-          this.form.cargoList.push(cargo)
-        });
+  onGoodsChange(goodsName){
+      if(goodsName&& goodsName!='') {
+        // 旧map
+        let nameOldMap = new Map();
+        if(this.form.cargoList!=null&& this.form.cargoList.length>0){
+          this.form.cargoList.forEach(item=>{
+            nameOldMap[item.goodsName]=item;
+          });
+        }
+
+        if(!(goodsName in nameOldMap)){
+            let cargo={
+              "goodsCode": goodsName,
+              "goodsName": goodsName,
+              "cargoQty": 1,
+              "length": 0,
+              "width": 0,
+              "height": 0,
+              "volume": 0,
+            }
+            this.form.cargoList.push(cargo);
+        }
+
+        this.handleCalcQty();
+        this.handleCalcVolume();
       }
   },
   showLocalTime(){
 
+  },
+  /** 鼠标移入cell */
+  handleGoodsCellEnter (row, column, cell, event) {
+    row.isEdit = true
+  },
+  /** 鼠标移出cell */
+  handleGoodsCellLeave (row, column, cell, event) {
+    row.isEdit = false
   },
   // 实时获取运单号
   handleBillCodeChange(checked,item){
@@ -1117,16 +1410,6 @@ methods: {
   font-size: 12px!important;
 }
 
-// .el-form-item{
-//   margin-bottom: 8px !important;
-// }
-
- .form-row-group-panel{
-    margin-right: 5px;
-    padding: 8px;
-    border-right: 1px solid #ededed;
- }
-
 
  .platform-auto-complete {
   .el-autocomplete-suggestion__wrap {
@@ -1144,5 +1427,41 @@ methods: {
   }
 }
 
+.el-collapse {
+    border-top: none!important;
+    border-bottom: none!important;
+}
+
+.el-table .el-table__cell:first-child .cell {
+  padding: 0px;
+}
+
+.el-table .cell {
+    padding: 0px;
+}
+
+.cargoList{
+  .el-input__inner {
+      height: 28px;
+      line-height: 28px;
+      border: none;
+      background: #ffffcd;
+      font-size: 10px;
+      padding: 0px;
+      text-align: center;
+  }
+}
+
+  .el-collapse-item__content {
+      padding-bottom: 0px;
+  }
+  .el-collapse-item__header{
+    pointer-events: none;
+  }
+
+  .el-collapse-item__arrow {
+    pointer-events: auto;
+  }
+
 </style>
 
diff --git a/src/views/emis/emisWaybill/waybillList.vue b/src/views/emis/emisWaybill/waybillList.vue
index 781da75f..744b144b 100644
--- a/src/views/emis/emisWaybill/waybillList.vue
+++ b/src/views/emis/emisWaybill/waybillList.vue
@@ -1,6 +1,7 @@
 <template>
   <div class="app-container">
-    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="50"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+    <SearchForm  :model="queryParams" ref="queryForm"   size="mini" :maxShow="8"  label-width="100px" v-show="showSearch" @search="handleQuery" @reset="resetQuery">
+
       <el-form-item label="" prop="billCode">
               <div slot="label">
                 <el-radio-group class="query-label" v-model="queryParams.params.queryOrderType">
@@ -17,8 +18,15 @@
                 @keyup.enter.native="handleQuery"
               />
             </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>
 
             <el-form-item label="收件人" prop="receiveName">
               <el-input
@@ -122,15 +130,7 @@
                 </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>
+
 
 
 
@@ -139,7 +139,7 @@
 
     <XdTable v-loading="loading"
            border stripe
-           size="small"
+           size="mini"
            :data="emisWaybillList"
            :showSearch.sync="showSearch"
            :queryParams="queryParams"
@@ -147,6 +147,8 @@
            @queryTable="getList"
            @selection-change="handleSelectionChange"
            @sort-change="handleSortChange"
+           v-if="tableHeight" :max-height="tableHeight + 'px'"
+
            >
 
       <div slot="toolbar">
@@ -183,7 +185,7 @@
                   @click="handleView"
                 >查看</el-button>
               </el-col> -->
-              <el-col :span="1.5">
+              <!-- <el-col :span="1.5">
                 <el-button
                   type="primary"
                   plain
@@ -191,6 +193,15 @@
                   :disabled="single"
                   @click="handleView"
                 >预览面单</el-button>
+              </el-col> -->
+              <el-col :span="1.5">
+                <el-button
+                  type="primary"
+                  plain
+                  size="mini"
+                  :disabled="single"
+                  @click="handleView"
+                >下载进仓单</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -199,7 +210,7 @@
                   size="mini"
                   :disabled="single"
                   @click="handleView"
-                >下载pdf</el-button>
+                >下载打印pdf</el-button>
               </el-col>
               <el-col :span="1.5">
                 <el-button
@@ -212,17 +223,6 @@
                 >打印</el-button>
               </el-col>
 
-              <!-- <el-col :span="1.5">
-                <el-button
-                  type="danger"
-                  plain
-                  icon="el-icon-delete"
-                  size="mini"
-                  :disabled="multiple"
-                  @click="handleDelete"
-                  v-hasPermi="['emis:emisWaybill:remove']"
-                >删除</el-button>
-              </el-col> -->
               <!-- <el-col :span="1.5">
                 <el-button
                   type="warning"
@@ -250,192 +250,155 @@
          </template>
       </el-table-column>
 
-      <el-table-column label="结算状态" align="center" prop="settleStatus" :sort-orders="['descending','ascending']" sortable="custom"  min-width="80">
-            <template slot-scope="scope">
-              <div v-if="scope.row.settleStatus == 0" style="color:red;">
-                    <span class="el-tag el-tag--info">未结算</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 10" style="color:red;">
-                <span class="el-tag">待确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 11" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已确认</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 20" >
-                  <span class="el-tag el-tag--warning el-tag--light">待打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 21" style="color:green;">
-                  <span class="el-tag el-tag--success el-tag--light">已打款</span>
-              </div>
-              <div v-if="scope.row.settleStatus == 40" style="color:red;">
-                <span class="el-tag el-tag--danger">已拒绝</span>
-              </div>
-            </template>
-          </el-table-column>
       -->
 
       <!-- <el-table-column :label="$t('订单号')" align="center" prop="orderSn" min-width="100" /> -->
-      <el-table-column :label="$t('运单号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
-        <template slot-scope="scope">
-            <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
-              <span>{{ scope.row.billCode }}</span>
-            </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="warehouseInNo" 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" /> -->
-      <el-table-column :label="$t('运单状态')" align="center" prop="waybillStatus" width="100" >
+       <!-- <el-table-column :label="$t('物流信息')" align="center" prop="lastTraceInfo" width="100" /> -->
+
+      <el-table-column label="发货信息"  align="center" >
+        <el-table-column :label="$t('运单编号')" align="center" prop="billCode" width="120" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <router-link :to="'/d24/waybillManagement/waybillEntry?billCode=' + scope.row.billCode" class="link-type">
+                <span>{{ scope.row.billCode }}</span>
+              </router-link>
+          </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="salesmen" min-width="100" :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="lastTraceInfo" width="100" />
+       </el-table-column> -->
+        <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="transLineTypeName" min-width="80" :show-overflow-tooltip="true"/>
+        <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="meterType" min-width="100" /> -->
+        <!-- <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="170" /> -->
+      </el-table-column>
 
-       <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" />
-      <el-table-column :label="$t('计泡比例')" align="center" prop="meterType" min-width="100" />
-      <!-- <el-table-column :label="$t('订单类型')" align="center" prop="orderType" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('下单时间')" align="center" prop="orderDate" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('客户编号2502021')" align="center" prop="customerCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('客户名称')" align="center" prop="customerName" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收件客户编号2502021')" align="center" prop="receiveCustomerCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收件客户客户名称')" align="center" prop="receiveCustomerName" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('第三方客户客户编号')" align="center" prop="thirdCustomerCode" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('第三方客户客户名称')" align="center" prop="thirdCustomerName" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收货人名')" align="center" prop="receiveName" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收货公司')" align="center" prop="receiveCompany" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收货人手机号')" align="center" prop="receiveMobile" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收货人电话')" align="center" prop="receiveTel" min-width="100" /> -->
 
-      <!-- <el-table-column :label="$t('省')" align="center" prop="receiveProvince" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('市')" align="center" prop="receiveCity" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('区')" align="center" prop="receiveCounty" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('县')" align="center" prop="receiveTown" min-width="100" /> -->
-      <!-- <el-table-column :label="$t('收货地址')" align="center" prop="receiveAddress" min-width="100" />
-      <el-table-column :label="$t('邮编')" align="center" prop="receivePostcode" min-width="100" />
-      <el-table-column :label="$t('寄件人省市区名称，逗号分隔')" align="center" prop="receivePcd" min-width="100" />
-      <el-table-column :label="$t('寄件人名')" align="center" prop="sendName" min-width="100" />
-      <el-table-column :label="$t('寄件公司')" align="center" prop="sendCompany" min-width="100" />
-      <el-table-column :label="$t('寄件人手机号')" align="center" prop="sendMobile" min-width="100" />
-      <el-table-column :label="$t('寄件人电话')" align="center" prop="sendTel" min-width="100" />
-      <el-table-column :label="$t('寄件人国家')" align="center" prop="sendCountry" min-width="100" />
-      <el-table-column :label="$t('寄件省')" align="center" prop="sendProvince" min-width="100" />
-      <el-table-column :label="$t('寄件市')" align="center" prop="sendCity" min-width="100" />
-      <el-table-column :label="$t('寄件区')" align="center" prop="sendCounty" min-width="100" />
-      <el-table-column :label="$t('寄件县')" align="center" prop="sendTown" min-width="100" />
-      <el-table-column :label="$t('寄件地址')" align="center" prop="sendAddress" min-width="100" />
-      <el-table-column :label="$t('寄件邮编')" align="center" prop="sendPostcode" min-width="100" />
-      <el-table-column :label="$t('发件人省市区名称，逗号分隔')" align="center" prop="sendPcd" min-width="100" />
-      <el-table-column :label="$t('支付方式')" align="center" prop="paymentType" min-width="100" />
-      <el-table-column :label="$t('计费方式')" align="center" prop="calcFeeType" min-width="100" />
-      <el-table-column :label="$t('支付月结编号')" align="center" prop="custNo" min-width="100" /> -->
+      <el-table-column label="寄件信息" align="center" >
+        <el-table-column :label="$t('寄件客户')" align="center" prop="sendCompany" min-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="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="80" :show-overflow-tooltip="true">
+          <template slot-scope="scope">
+              <el-tag v-if="scope.row.blMessage==1" type="success">发送</el-tag>
+              <el-tag v-else type="danger">不发送</el-tag>
+          </template>
+        </el-table-column>
+      </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="customsClear" min-width="100" />
-      <el-table-column :label="$t('报关方式')" align="center" prop="customsEclaration" min-width="100" />
-      <el-table-column :label="$t('预计到达时间')" align="center" prop="estimateDate" min-width="100" />
-      <el-table-column :label="$t('包装类型')" align="center" prop="packType" min-width="100" />
-      <el-table-column :label="$t('派件方式:1-送货上门')" align="center" prop="dispatchMethod" min-width="100" />
-      <el-table-column :label="$t('取件方式:1-上门取件')" align="center" prop="pickupMethod" min-width="100" />
-      <el-table-column :label="$t('预计上门取件开始时间')" align="center" prop="pickStartDate" min-width="100" />
-      <el-table-column :label="$t('预计上门取件结束时间')" align="center" prop="pickFinishDate" min-width="100" />
-      <el-table-column :label="$t('取货失败原因')" align="center" prop="pickFailReason" min-width="100" />
-      <el-table-column :label="$t('入仓代码')" align="center" prop="intoWarehouseCode" min-width="100" />
-      <el-table-column :label="$t('入仓名称')" align="center" prop="intoWarehouseName" min-width="100" />
-      <el-table-column :label="$t('入仓地址')" align="center" prop="intoWarehouseAddress" min-width="100" />
-      <el-table-column :label="$t('入仓联系人')" align="center" prop="intoWarehouseContact" min-width="100" />
-      <el-table-column :label="$t('入仓联系人电话')" align="center" prop="intoWarehousePhone" min-width="100" />
-      <el-table-column :label="$t('入仓单号')" align="center" prop="intoWarehouseBillCode" min-width="100" /> -->
 
-      <!-- <el-table-column :label="$t('客户发货开始时间')" align="center" prop="customerDeliveryBeginTime" min-width="100" />
-      <el-table-column :label="$t('客户发货截止时间')" align="center" prop="customerDeliveryEndTime" min-width="100" />
-      <el-table-column :label="$t('货物大类')" align="center" prop="goodsType" min-width="100" />
-      <el-table-column :label="$t('货物描述')" align="center" prop="goodsInfo" min-width="100" />
-      <el-table-column :label="$t('货物图片，逗号隔开')" align="center" prop="goodsPics" min-width="100" />
-      <el-table-column :label="$t('预入仓代垫运费')" align="center" prop="blPrepareInFreight" min-width="100" />
-      <el-table-column :label="$t('预入仓代垫运费')" align="center" prop="prepareInEstFee" min-width="100" />
-      <el-table-column :label="$t('预入仓实际运费')" align="center" prop="prepareInRealFee" min-width="100" />
-      <el-table-column :label="$t('预入仓快递公司')" align="center" prop="prepareInExpress" min-width="100" />
-      <el-table-column :label="$t('预入仓快递单号')" align="center" prop="prepareInBillCode" min-width="100" />
-      <el-table-column :label="$t('预入仓自定义标识')" align="center" prop="prepareInRemark" min-width="100" />
-      <el-table-column :label="$t('预入仓供应商')" align="center" prop="prepareInSupplier" min-width="100" />
-      <el-table-column :label="$t('总重量')" align="center" prop="totalWeight" min-width="100" />
-      <el-table-column :label="$t('总体积')" align="center" prop="totalVolume" min-width="100" />
-      <el-table-column :label="$t('件数')" align="center" prop="parcelQty" min-width="100" />
-      <el-table-column :label="$t('实际重量')" align="center" prop="billWeight" min-width="100" />
-      <el-table-column :label="$t('体积重量')" align="center" prop="volumeWeight" min-width="100" />
-      <el-table-column :label="$t('费用币种')" align="center" prop="currency" min-width="100" />
-      <el-table-column :label="$t('结算重量')" align="center" prop="settlementWeight" min-width="100" />
-      <el-table-column :label="$t('计费重量')" align="center" prop="feeWeight" min-width="100" />
-      <el-table-column :label="$t('运费')" align="center" prop="freight" min-width="100" />
-      <el-table-column :label="$t('是否超长')" align="center" prop="blOverLong" min-width="100" />
-      <el-table-column :label="$t('是否出账')" align="center" prop="blBill" min-width="100" />
-      <el-table-column :label="$t('是否超重')" align="center" prop="blOverWeight" min-width="100" />
-      <el-table-column :label="$t('超重重量')" align="center" prop="overWeightNumber" min-width="100" />
-      <el-table-column :label="$t('费用备注')" align="center" prop="feeRemaker" min-width="100" />
-      <el-table-column :label="$t('三段码')" align="center" prop="thirdCode" min-width="100" />
-      <el-table-column :label="$t('实际货值')" align="center" prop="realValue" min-width="100" />
-      <el-table-column :label="$t('是否投保')" align="center" prop="blInsure" min-width="100" />
-      <el-table-column :label="$t('投保货值')" align="center" prop="insureValue" min-width="100" />
-      <el-table-column :label="$t('投保货值币种')" align="center" prop="insureValueCurrency" min-width="100" />
-      <el-table-column :label="$t('保费币种')" align="center" prop="insureFeeCurrency" min-width="100" />
-      <el-table-column :label="$t('保费')" align="center" prop="insureFee" min-width="100" />
-      <el-table-column :label="$t('保险备注')" align="center" prop="insureRemark" min-width="100" />
-      <el-table-column :label="$t('保险站点代码')" align="center" prop="insureSiteCode" min-width="100" />
-      <el-table-column :label="$t('投保日期')" align="center" prop="insureDate" min-width="100" />
-      <el-table-column :label="$t('是否打印')" align="center" prop="blPrint" min-width="100" />
-      <el-table-column :label="$t('打印人编号')" align="center" prop="printManCode" min-width="100" />
-      <el-table-column :label="$t('打印站点')" align="center" prop="printSite" min-width="100" />
-      <el-table-column :label="$t('打印时间')" align="center" prop="printDate" min-width="100" />
-      <el-table-column :label="$t('打印次数')" align="center" prop="printCount" min-width="100" />
-      <el-table-column :label="$t('是否同行转单')" align="center" prop="blDispFd" min-width="100" />
-      <el-table-column :label="$t('转单代码')" align="center" prop="transferCode" min-width="100" />
-      <el-table-column :label="$t('转单单号')" align="center" prop="transferBillcode" min-width="100" />
-      <el-table-column :label="$t('转单时间')" align="center" prop="dispFdDate" min-width="100" />
-      <el-table-column :label="$t('转单原因')" align="center" prop="dispFdReason" min-width="100" />
-      <el-table-column :label="$t('当前网点编号')" align="center" prop="currentSiteCode" min-width="100" />
-      <el-table-column :label="$t('上一网点点号')" align="center" prop="lastSiteCode" min-width="100" />
-      <el-table-column :label="$t('寄件站点代码')" align="center" prop="registerSiteCode" min-width="100" />
-      <el-table-column :label="$t('寄件日期')" align="center" prop="registerDate" min-width="100" />
-      <el-table-column :label="$t('寄件人编号')" align="center" prop="registerManCode" min-width="100" />
-      <el-table-column :label="$t('取件员代码')" align="center" prop="takePieceEmployeeCode" min-width="100" />
-      <el-table-column :label="$t('发件网点代码')" align="center" prop="sendSiteCode" min-width="100" />
-      <el-table-column :label="$t('发货时间')" align="center" prop="sendDate" min-width="100" />
-      <el-table-column :label="$t('派件人代码')" align="center" prop="dispatchManCode" min-width="100" />
-      <el-table-column :label="$t('派件时间')" align="center" prop="dispatchDate" min-width="100" />
-      <el-table-column :label="$t('派件网点代码')" align="center" prop="dispatchSiteCode" min-width="100" />
-      <el-table-column :label="$t('生成账单时间')" align="center" prop="produceBillDate" min-width="100" />
-      <el-table-column :label="$t('生成账单站点代码')" align="center" prop="produceBillSiteCode" min-width="100" />
-      <el-table-column :label="$t('生成账单人代码')" align="center" prop="produceBillManCode" min-width="100" />
-      <el-table-column :label="$t('目的地编号')" align="center" prop="destinationCode" min-width="100" />
-      <el-table-column :label="$t('目的省')" align="center" prop="destinationProvince" min-width="100" />
-      <el-table-column :label="$t('目的城市')" align="center" prop="destinationCity" min-width="100" />
-      <el-table-column :label="$t('目的国家')" align="center" prop="destinationCounty" min-width="100" />
-      <el-table-column :label="$t('目的地网点代码')" align="center" prop="dispatchUnderlingSiteCode" min-width="100" />
-      <el-table-column :label="$t('目的地财务中心代码')" align="center" prop="destinationCenterCode" min-width="100" />
-      <el-table-column :label="$t('业务人代码')" align="center" prop="marketManCode" min-width="100" />
-      <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="operateEmployeeCode" min-width="100" />
-      <el-table-column :label="$t('是否问题件')" align="center" prop="blIsQuestion" min-width="100" />
-      <el-table-column :label="$t('问题件类型')" align="center" prop="problemType" min-width="100" />
-      <el-table-column :label="$t('问题件原因')" align="center" prop="problemCause" min-width="100" />
-      <el-table-column :label="$t('问题件延期天数')" align="center" prop="problemDelayDays" min-width="100" />
-      <el-table-column :label="$t('是否备注消息')" align="center" prop="blMessage" min-width="100" />
-      <el-table-column :label="$t('是否发送收件人短信')" align="center" prop="blAcceptMessage" min-width="100" />
-      <el-table-column :label="$t('是否生成子单')" align="center" prop="blGenSubbill" min-width="100" />
-      <el-table-column :label="$t('签收人')" align="center" prop="signMan" min-width="100" />
-      <el-table-column :label="$t('签收人代码')" align="center" prop="signManCode" min-width="100" />
-      <el-table-column :label="$t('签收站点代码')" align="center" prop="signSiteCode" min-width="100" />
-      <el-table-column :label="$t('签收时间')" align="center" prop="signDate" min-width="100" />
-      <el-table-column :label="$t('揽收图片备注')" align="center" prop="billPicSendRmk" min-width="100" />
-      <el-table-column :label="$t('签收底单图片')" align="center" prop="billPicDispatchRmk" min-width="100" />
-      <el-table-column :label="$t('时区偏差')" align="center" prop="timezoneOffset" min-width="100" />
-      <el-table-column :label="$t('删除标志（0代表存在')" align="center" prop="delFlag" min-width="100" />
-      <el-table-column :label="$t('备注')" align="center" prop="remark" min-width="100" /> -->
+      <el-table-column label="收件信息" align="center">
+        <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="receiveCustomerName" min-width="100" /> -->
+        <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">
+                <el-tag v-if="scope.row.blAcceptMessage==1" type="success">发送</el-tag>
+                <el-tag v-else type="danger">不发送</el-tag>
+            </template>
+        </el-table-column>
+
+      </el-table-column>
+
+      <el-table-column label="货物信息" align="center">
+
+        <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">
+              <el-tag v-if="scope.row.dispatchMethod==1" type="info">派送</el-tag>
+              <el-tag v-else type="info">自提</el-tag>
+          </template>
+        </el-table-column>
+
+      </el-table-column>
+
+      <el-table-column label="收费信息" align="center">
+
+        <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" />
+        <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>
+
+      <el-table-column label="签收信息" align="center">
+
+        <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>
+
+      <el-table-column label="打印信息" align="center">
+        <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>
+      <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" />
+
     </XdTable>
 
     <!--
@@ -464,6 +427,8 @@ export default {
   ],
   data() {
     return {
+      tableHeight: 200,
+
       // 遮罩层
       loading: true,
       // 选中数组
@@ -668,6 +633,13 @@ export default {
   },
   created() {
     this.getList();
+
+    // 调整表格的高度，不允许滚动
+    this.$nextTick(function() {
+      let queryFormEl = this.$refs.queryForm.$el;
+      let tableH = queryFormEl.offsetHeight+190;
+      this.tableHeight = window.innerHeight - tableH;
+    });
   },
   methods: {
     /** 查询运单列表列表 */
diff --git a/vue.config.js b/vue.config.js
index 483d3537..8d3c3ae6 100644
--- a/vue.config.js
+++ b/vue.config.js
@@ -6,6 +6,9 @@ function resolve(dir) {
 }
 
 
+const HardSourceWebpackPlugin = require('hard-source-webpack-plugin');
+const SpeedMeasurePlugin = require('speed-measure-webpack-plugin');
+
 // const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 const CompressionPlugin = require('compression-webpack-plugin');
 // const LodashModuleReplacementPlugin = require("lodash-webpack-plugin");
@@ -13,6 +16,9 @@ const CompressionPlugin = require('compression-webpack-plugin');
 
 const name = process.env.VUE_APP_TITLE || '管理系统' // 网页标题
 
+// 判断开发环境
+const isProduction = process.env.NODE_ENV === 'production';
+
 const port = process.env.port || process.env.npm_config_port || 80 // 端口
 const webpack = require("webpack");
 const Timestamp = new Date().getTime();
@@ -87,13 +93,14 @@ module.exports = {
         filename: '[path].gz[query]',   // 压缩后的文件名
         algorithm: 'gzip',              // 使用gzip压缩
         minRatio: 0.8                   // 压缩率小于1才会压缩
-      })
+      }),
+      // new HardSourceWebpackPlugin(),
+      // new SpeedMeasurePlugin()
     ],
   },
   chainWebpack(config) {
     config.plugins.delete('preload') // TODO: need test
     config.plugins.delete('prefetch') // TODO: need test
-
     // config.optimization.minimize(true);
     // config.optimization.splitChunks({
     //      chunks: 'all'
@@ -125,8 +132,6 @@ module.exports = {
       })
       .end()
 
-
-
     config
       .when(process.env.NODE_ENV !== 'development',
         config => {