diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 074b86c8..257ed8b7 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -41,15 +41,16 @@
                       <div style="text-align: right;width: 50%;"><el-button type="text" size="mini" plain  @click="delAllStorage" >重置</el-button></div>
                     </div>
                     <draggable v-model="storageList"
-                    ghostClass="drag-ghost"
-                    chosenClass="drag-chosen"
-                    :animation="500"
-                    handle=".el-icon-s-operation"
-                    @end="updateTable">
-                      <div v-for="clo in storageList" :key="clo.label" class="setting-row">
+                        ghostClass="drag-ghost"
+                        chosenClass="drag-chosen"
+                        :animation="500"
+                        handle=".el-icon-s-operation"
+                        @end="updateTable"
+                      >
+                      <div v-for="col in storageList" :key="col.label" class="setting-row">
                         <!-- <i class="el-icon-s-operation" /> -->
                         <i class="el-icon-s-operation icon iconfont icon-ui_drag_horizontally" />
-                        <el-checkbox v-model="clo.show" class="label" @change="showOrHidden($event,clo)">{{ clo.label }}</el-checkbox>
+                        <el-checkbox v-model="col.show" class="label" @change="showOrHidden($event,col)">{{ col.label }}</el-checkbox>
                         <!-- <el-button
                           class="btn"
                           size="mini"
@@ -68,16 +69,16 @@
                   <el-button style="margin-left: 10px;" slot="reference" size="mini" circle icon="el-icon-menu" />
                 </el-popover>
               </el-tooltip>
-              <!-- <el-tooltip class="item" effect="dark" content="导出" placement="top" v-if="download!=null">
+              <el-tooltip style="margin-left: 10px;"  class="item" effect="dark" content="导出" placement="top" v-if="download!=null">
                 <el-button size="mini" circle icon="el-icon-download" @click="download()" />
-              </el-tooltip> -->
+              </el-tooltip>
             </el-row>
           </div>
         </div>
       </slot>
     </div>
     <div>
-      <orig-table ref="table" :config="config" />
+      <orig-table ref="table" :config="config"  />
       <pagination
             v-show="total>0"
             :total="total"
diff --git a/src/directive/index.js b/src/directive/index.js
index f126ab97..5ddedd46 100644
--- a/src/directive/index.js
+++ b/src/directive/index.js
@@ -6,6 +6,7 @@ import dialogDragHeight from './dialog/dragHeight'
 import dialogFullScreen from './dialog/fullScreen'
 import clipboard from './module/clipboard'
 import elSelectLoadmore from './ext/elSelectLoadmore'
+import elTableResizeHeight from './table/resizeHeight'
 
 const install = function(Vue) {
   Vue.directive('hasRole', hasRole)
@@ -15,6 +16,8 @@ const install = function(Vue) {
   Vue.directive('dialogDragWidth', dialogDragWidth)
   Vue.directive('dialogDragHeight', dialogDragHeight)
   Vue.directive('dialogFullScreen', dialogFullScreen)
+  Vue.directive('elTableResizeHeight', elTableResizeHeight)
+  //  v-elTableResizeHeight="{bottomOffset: 85}"
 
   Vue.directive('el-select-loadmore', elSelectLoadmore);
 }
diff --git a/src/main.js b/src/main.js
index 0606d9f7..17c219ab 100644
--- a/src/main.js
+++ b/src/main.js
@@ -21,6 +21,8 @@ import { download } from '@/utils/request'
 import { triggerTrans } from '@/utils/custom'
 import  TanexPrinterSdk  from '@/utils/TanexPrinterSdk'
 
+// import _ from 'lodash'
+
 import './assets/icons' // icon
 import './permission' // permission control
 import { getDicts } from "@/api/system/dict/data";
@@ -95,6 +97,8 @@ const tanexPrinter = TanexPrinterSdk.getInstance();
 Vue.prototype.$tanexPrinter = tanexPrinter;
 Vue.prototype.$t = (key, value) => i18n.t(triggerTrans(key,i18n.locale), value)
 
+// Vue.prototype._ = _
+
 // vue 页面捕获
 // const __patch__ = Vue.prototype.__patch__;
 // Vue.prototype.__patch__ = function() {
diff --git a/src/views/emis/EmisBaseTools/CityPicker.vue b/src/views/emis/EmisBaseTools/CityPicker.vue
index b14d8e97..6a6aeaac 100644
--- a/src/views/emis/EmisBaseTools/CityPicker.vue
+++ b/src/views/emis/EmisBaseTools/CityPicker.vue
@@ -5,7 +5,9 @@
       clearable
       v-model="svalue"
       :placeholder="placeholder"
-      @change="onChange">
+      @change="onChange"
+      @click.native="onClick"
+      >
       <el-option v-for="item in optionItems" :key="item.regionCode" :label="item.regionName" :value="item.regionCode" />
     </el-select>
 </template>
@@ -16,7 +18,7 @@
     name: "CityPicker",
     props: {
       value: {
-        type: [String, Number],
+        type: String,
         required: false
       },
       parentCode: {
@@ -27,50 +29,66 @@
         type: String,
         required: false
       },
-      isInitiated:{
-        type: [Boolean,String],
-        required: false,
-        default:false
-      }
     },
     data() {
       return {
-        optionItems: [],
         svalue: this.value,
+        optionItems: [],
+        // 缺省值
+        defaultItems: null,
       };
     },
     watch: {
-      value(newVal) {
-        this.svalue = newVal;
+      value(newVal,oldVal) {
+        if(this.value!=null){
+          this.svalue=this.value;
+          // 判断默认值中是否存在，若存在则不继续查询
+          if(this.optionItems){
+              let selItem = this.optionItems.find(item => item.regionCode == this.svalue);
+              if(selItem){
+                return;
+              }
+          }
+          this.queryData(null,this.svalue);
+        }
       },
-      svalue(newVal, oldVal) {
-        // this.$emit("input", this.svalue);
-      },
-      parentCode(newVal) {
-        this.queryData();
+      parentCode(newVal,oldVal) {
+        if(newVal!=oldVal){
+            this.defaultItems=null;
+        }
       }
     },
     created() {
-      if(this.isInitiated || this.svalue!=null){
-        this.queryData();
+      if(this.svalue!=null){
+          this.queryData(null,this.svalue);
       }
     },
     methods: {
+      onClick(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryData(null,null);
+        }else{
+          this.optionItems = [...this.defaultItems];
+        }
+      },
       onChange() {
         this.$emit("input", this.svalue);
         this.$emit("onChange");
       },
-      queryData() {
-
+      queryData(val,key) {
         this.optionItems =[];
-
-        if(this.parentCode==null){
-          return;
-        }
-
-        let queryParams = {parentCode:this.parentCode,regionType:2};
+        let queryParams = {
+          parentCode:this.parentCode,
+          regionCode:key,
+          regionType:2
+        };
         listSimpleEmisRegion(queryParams).then(response => {
           this.optionItems = response.rows;
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultItems=[...this.optionItems]
+          }
         });
       },
 
diff --git a/src/views/emis/EmisBaseTools/CountryPicker.vue b/src/views/emis/EmisBaseTools/CountryPicker.vue
index 8d41e706..d1630659 100644
--- a/src/views/emis/EmisBaseTools/CountryPicker.vue
+++ b/src/views/emis/EmisBaseTools/CountryPicker.vue
@@ -8,9 +8,12 @@
       :remote-method="queryData"
       v-model="svalue"
       :placeholder="placeholder"
+
+      no-data-text=""
+
       @blur="onBlur"
       @change="onChange"
-      @focus="onFocus"
+      @click.native="onClick"
       @visible-change="reverseArrow"
       >
         <el-option v-for="item in optionItems" :key="item.code" :label="item.name+'('+item.nameEn+')'" :value="item.code" ></el-option>
@@ -35,57 +38,66 @@
     },
     data() {
       return {
-        optionItems: [],
         svalue: this.value,
-        countryCode:null,
-        countryMap:new Map(),
+        optionItems: [],
+
+        // 缺省值
+        defaultItems: null,
+        countryMap:new Map()
       };
     },
     watch: {
-      value(newVal) {
-        this.svalue = newVal;
-        if(this.svalue!=null) {
-          this.countryCode=this.svalue;
+      value(newVal,oldVal) {
+        // 逻辑 有初始值先查询初值
+        if(this.value!=null){
+          this.svalue=this.value;
+          this.queryData(null,this.svalue);
         }
       },
     },
     created() {
-      this.queryData();
+      if(this.svalue!=null){
+          this.queryData(null,this.svalue);
+      }
     },
     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();
+      onClick(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryData(null,null);
+        }else{
+          this.optionItems = [...this.defaultItems];
+        }
       },
       onBlur(val){
         this.$emit("input", this.svalue);
         this.dispatch('ElFormItem', 'el.form.blur');
       },
       onChange() {
-        if(this.svalue!=null){
           this.$emit("input", this.svalue);
-          let itemData ={};
-          this.optionItems.forEach(item=>{
-            if(item.code === this.svalue){
-              itemData = item;
-            }
-          });
+          let itemData = this.optionItems.find(item => item.code == this.svalue);
           this.$emit("change",itemData);
           this.$emit("onChange",itemData);
           this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
-        }
       },
-      queryData(val) {
+      queryData(val,key) {
+        this.optionItems=[];
         let queryParams = {
-          code:this.countryCode,
+          pageNum:1,
+          pageSize:10,
+          code:key,
           name:val
         };
         listSimpleEmisCountry(queryParams).then(response => {
           this.optionItems =response.rows;
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultItems=[...this.optionItems]
+          }
         });
       },
       reverseArrow(flag) {
diff --git a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
index 10ab5f85..64a2df06 100644
--- a/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/CustomerAddressSimplePicker.vue
@@ -6,23 +6,17 @@
           effect="light"
           :show-arrow="false"
         >
-      <span  slot="reference">
-         <el-input ref="inputValue" :value="slable" :placeholder="splaceholder" @input="changeValue" @focus="onfocus" @blur="onblur" @clear="onclear" clearable  >
-            <template slot="suffix">
-              <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i>
-            </template>
-         </el-input>
-      </span>
-      <div >
+        <div >
           <el-table
-             v-loading="loading"
-             style="width: 100%;"
-             :data="dataList"
-             @row-click="onRowClick"
-             stripe size="mini"
-             element-loading-text="Loading"
+              v-loading="loading"
              ref="comboGridTable"
-             fit highlight-current-row
+             style="width: 100%;"
+             :data="optionItems"
+              @row-click="onRowClick"
+              :row-key="row => row.empCode"
+              stripe
+              :row-style="isRed"
+              element-loading-text="Loading"
           >
             <el-table-column :label="$t('名称')" align="left" prop="name" width="100" />
             <el-table-column :label="$t('电话')" align="left" prop="phone" width="100" />
@@ -43,6 +37,24 @@
           />
       </div>
 
+      <el-input
+        slot="reference"
+        ref="inputValue"
+        :value="svalue"
+        :placeholder="placeholder"
+        @input="handleInput"
+        @focus="onFocus"
+        @blur="onBlur"
+        @clear="onClear"
+        clearable
+       >
+            <template slot="suffix">
+              <!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
+              <i slot="suffix" class="el-icon-search"></i>
+            </template>
+      </el-input>
+
+
     </el-popover>
 
   </div>
@@ -86,30 +98,41 @@ export default {
      return {
        createdId: '0',
        loading:false,
-       visible:false,
-       dataList: [],
+
        total:0,
+       optionItems: [],
+
+       // 缺省值
+       defaultTotal:0,
+       defaultItems:null,
+
+       sId: null,
        svalue: this.value,
-       slable: null,
-       isEdit:false,
-       splaceholder:this.placeholder,
-       firstFlag:true,
+
+       isInputing: false,
+
        queryParams:{
          pageNum:1,
          pageSize:5,
+         searchValue:null,
          addressType: this.addressType,
          country:this.countryCode,
-         searchValue:null,
        }
      };
    },
    watch: {
-     value(newVal) {
-       this.svalue = newVal;
-       this.slable = this.svalue;
+    value(newVal,oldVal) {
+        if(this.value!=null){
+          this.svalue=this.value;
+        }
      },
-     countryCode(){
-        this.getList();
+     countryCode(newVal){
+      this.queryParams.country=newVal;
+      this.defaultItems=null;
+     },
+     addressType(newVal){
+      this.queryParams.addressType=newVal;
+      this.defaultItems=null;
      }
 
    },
@@ -117,92 +140,79 @@ export default {
     this.createdId = String(new Date().getTime()) // 给个随机id 判断是否clickoutside
    },
    created() {
+    if(this.svalue!=null){
+      this.svalue = this.value;
+    }
    },
    methods: {
-    showItem(item){
-      this.svalue=item.name;
-      this.slable=item.name;
+    onFocus(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryParams.pageNum=1;
+          this.queryData(null,null);
+        }else{
+          this.total = this.defaultTotal;
+          this.optionItems = [...this.defaultItems];
+        }
+        // this.$refs.popoverRef.doShow();
     },
-    changeValue(val) {
-      if(this.queryParams.searchValue === val ) return;
-      this.slable = val;
-      this.isEdit = true;
-
-      this.queryParams.searchValue = val
+    handleInput(val) {
+      if(val == null ) return;
+      this.isInputing = true;
+      this.svalue = val;
       this.queryParams.pageNum = 1
+      this.queryData(val,null)
 
-      this.getList()
     },
     onRowClick(row, column, event) {
-        this.showItem(row)
-        this.queryParams.searchValue=row.name;
+        this.svalue=row.name;
+
+        this.isInputing = false;
+
+        this.sId=row.id;
 
         this.$emit("input", this.svalue);
-        this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
-        this.dispatch('ElFormItem', 'el.form.change', [this.svalue]);
-
         this.$emit("onChange",row);
         this.$refs.popoverRef.doClose();
      },
+    isRed({ row }) {
+     if (row.id == this.sId) {
+        return {
+          "color": "red",
+          "font-weight": "bold",
+        };
+      }
+    },
     changePage(cur) {
       this.queryParams.pageNum = cur
-      this.getList()
-
-      this.visible = true
-      this.$refs.popoverRef.doShow();
+      this.queryData()
     },
-    onfocus(el) {
-      if(this.slable) {
-        this.splaceholder= this.slable
-      }
-      this.visible = true
-      this.slable = null;
-
-      this.queryParams.searchValue = null;
-      this.queryParams.pageNum = 1
-      this.getList();
-    },
-    onclear(el){
-
-      this.splaceholder = this.placeholder;
-      // this.slable = null;
-      // this.svalue = null;
-
-      // this.queryParams.searchValue = null;
-      this.queryParams.pageNum = 1;
+    onClear(el){
+      this.svalue = null;
 
       this.$emit("input", this.svalue);
       this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
-      this.dispatch('ElFormItem', 'el.form.change', [this.svalue])
-
-      if(this.visible){
-        this.getList();
-      }
     },
-    onblur(el) {
-      if(this.slable=='' || this.slable=='' || !this.isEdit) {
-        this.slable = this.splaceholder;
-      }
+    onBlur(el) {
+      this.$emit("input", this.svalue);
+      this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
     },
-    getList() {
+    queryData(val,key) {
        this.loading = true;
-
-       // 首次执行
-      //  this.queryParams.empCode = this.firstFlag?this.value:null;
-      console.log(this.queryParams);
+      this.loading = true;
+      this.queryParams.searchValue = val;
 
       listSimpleEmisCustomerAddress(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.optionItems =  response.rows;
+
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultTotal = this.total+0;
+            this.defaultItems=[...this.optionItems]
+          }
+
        });
      },
 
diff --git a/src/views/emis/EmisBaseTools/DistrictPicker.vue b/src/views/emis/EmisBaseTools/DistrictPicker.vue
index d40cba38..b2d0d293 100644
--- a/src/views/emis/EmisBaseTools/DistrictPicker.vue
+++ b/src/views/emis/EmisBaseTools/DistrictPicker.vue
@@ -5,7 +5,9 @@
       clearable
       v-model="svalue"
       :placeholder="placeholder"
-      @change="onChange">
+      @change="onChange"
+      @click.native="onClick"
+      >
       <el-option v-for="item in optionItems" :key="item.regionCode" :label="item.regionName" :value="item.regionCode" />
     </el-select>
 </template>
@@ -16,7 +18,7 @@
     name: "DistrictPicker",
     props: {
       value: {
-        type: [String, Number],
+        type: String,
         required: false
       },
       parentCode: {
@@ -26,51 +28,68 @@
       placeholder: {
         type: String,
         required: false
-      },
-      isInitiated:{
-        type: [Boolean,String],
-        required: false,
-        default:false
       }
     },
     data() {
       return {
-        optionItems: [],
         svalue: this.value,
+        optionItems: [],
+        // 缺省值
+        defaultItems: null,
       };
     },
     watch: {
-      value(newVal) {
-        this.svalue = newVal;
+      value(newVal,oldVal) {
+        if(this.value!=null){
+          this.svalue=this.value;
+          // 判断默认值中是否存在，若存在则不继续查询
+          if(this.optionItems){
+              let selItem = this.optionItems.find(item => item.regionCode == this.svalue);
+              if(selItem){
+                return;
+              }
+          }
+          this.queryData(null,this.svalue);
+        }
       },
-      svalue(newVal, oldVal) {
-        this.$emit("input", this.svalue);
-      },
-      parentCode(newVal) {
-        this.queryData();
+      parentCode(newVal,oldVal) {
+        if(newVal!=oldVal){
+            this.defaultItems=null;
+        }
       }
     },
     created() {
-      if(this.isInitiated || this.svalue!=null){
-        this.queryData();
+      if(this.svalue!=null){
+          this.queryData(null,this.svalue);
       }
     },
     methods: {
+      onClick(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryData(null,null);
+        }else{
+          this.optionItems = [...this.defaultItems];
+        }
+      },
       onChange() {
         this.$emit("input", this.svalue);
         this.$emit("onChange");
       },
-      queryData() {
-
+      queryData(val,key) {
         this.optionItems =[];
 
-        if(this.parentCode==null){
-          return;
-        }
-
-        let queryParams = {parentCode:this.parentCode,regionType:3};
+        let queryParams = {
+          parentCode:this.parentCode,
+          regionCode:key,
+          regionType:3
+        };
         listSimpleEmisRegion(queryParams).then(response => {
           this.optionItems = response.rows;
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultItems=[...this.optionItems]
+          }
         });
       },
 
diff --git a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
index fa899501..a6f009a5 100644
--- a/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisSiteSimplePicker.vue
@@ -1,6 +1,25 @@
 <template>
    <el-select
+      style="width:100%"
+      ref="selectRef"
       filterable
+      clearable
+      remote
+      :remote-method="queryData"
+      v-model="svalue"
+      :placeholder="placeholder"
+
+      no-data-text=""
+
+      @blur="onBlur"
+      @change="onChange"
+      @click.native="onClick"
+      @visible-change="reverseArrow"
+      >
+        <el-option v-for="item in optionItems" :key="item.siteCode" :label="item.siteName" :value="item.siteCode" ></el-option>
+    </el-select>
+
+    <!-- filterable
       clearable
       autocomplete="false"
       ref="selectRef"
@@ -13,23 +32,21 @@
       class="remote-select"
       @change="onChange"
       @clear="onClear"
-      @visible-change="reverseArrow"
-      @mouseleave.native="onMouseleave"
-      >
-        <el-option v-for="item in optionItems" :key="item.siteCode" :label="item.siteName" :value="item.siteCode" ></el-option>
-    </el-select>
 
+      no-data-text=""
+
+
+      @visible-change="reverseArrow"
+      @mouseleave.native="onMouseleave" -->
 
 </template>
 <script>
+  import emitter from 'element-ui/src/mixins/emitter';
   import { listSimpleEmisSite } from "@/api/emis/emisSite";
 
   export default {
     name: "EmisSiteSimplePicker",
-    components: {
-
-    },
-    dicts: [],
+    mixins: [emitter],
     props: {
       value: {
         type: String,
@@ -47,11 +64,6 @@
         type: [String,Number],
         required: false
       },
-      isInitiated:{
-        type: [Boolean,String],
-        required: false,
-        default:false
-      },
       disabled:{
         type: [Boolean,String],
         required: false
@@ -60,30 +72,42 @@
     data() {
       return {
         loading:false,
-        visible:false,
-        optionItems: [],
+
         svalue: this.value,
-        firstFlag:true,
-        filterMap:new Map(),
+        optionItems: [],
+        // 缺省值
+        defaultItems: null,
+        itemMap:new Map(),
+
         queryParams:{
           pageNum:1,
           pageSize:10,
           siteType:this.siteType,
           countryCode:this.countryCode,
-          siteCode:this.value
+          siteCode:null,
+          siteName:null
         }
       };
     },
     watch: {
-      value(newVal) {
-        this.svalue = newVal;
-        this.queryData();
+      value(newVal,oldVal) {
+        // 逻辑 有初始值先查询初值
+        if(this.value!=null){
+          this.svalue=this.value;
+          this.queryData(null,this.svalue);
+        }
       },
       siteType(newVal, oldVal) {
-        this.queryData();
+        if(newVal!=oldVal){
+          this.queryParams.siteType=newVal
+          this.defaultItems=null;
+        }
       },
       countryCode(newVal, oldVal) {
-        this.queryData();
+        if(newVal!=oldVal){
+          this.queryParams.countryCode=newVal
+          this.defaultItems=null;
+        }
       }
     },
     mounted(){
@@ -91,58 +115,46 @@
       rulesDom.classList.add("el-icon-arrow-up"); // 对dom新增class
     },
     created() {
-      this.queryData();
+      if(this.svalue!=null){
+          this.queryData(null,this.svalue);
+      }
     },
     methods: {
+      onClick(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryData(null,null);
+        }else{
+          this.optionItems = [...this.defaultItems];
+        }
+      },
       onChange() {
         this.$emit("input", this.svalue);
-        let itemData=this.filterMap[this.svalue];
+        let itemData = this.optionItems.find(item => item.siteCode == this.svalue);
         this.$emit("onChange",itemData);
       },
       onClear(){
         this.$emit("input", this.svalue);
-        this.$emit("onClear");
-        this.queryParams.siteName=null;
-        this.queryData();
+        this.$emit("onChange",null);
       },
-      onFocus(){
-        this.firstFlag = false;
-        this.queryParams.siteCode=null;
-        this.queryData();
+      onBlur(val){
+        this.$emit("input", this.svalue);
+        this.dispatch('ElFormItem', 'el.form.blur');
       },
-      queryData(val){
+      queryData(val,key) {
         this.optionItems=[];
 
+        this.queryParams.siteCode=key;
         this.queryParams.siteName=val;
+
         listSimpleEmisSite(this.queryParams).then(response => {
             this.optionItems=response.rows;
-            response.rows.forEach(item => {
-              if(!this.filterMap.hasOwnProperty(item.siteCode)){
-                this.filterMap[item.siteCode]=item;
-              }
-            });
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultItems=[...this.optionItems]
+          }
         });
       },
-      onMouseleave(e, i) {
-        setTimeout(() => {
-          var currTargetEl = e.relatedTarget || e.toElement
-          if (currTargetEl) {
-            const elTagName = currTargetEl.tagName
-            const targetClassName = currTargetEl.className
-            // ul 同时包含className==el-select-dropdown__list
-            if (elTagName === 'UL' && targetClassName.indexOf('el-select-dropdown__list') !== -1) {
-              return false
-            } else if (elTagName === 'LI' && targetClassName.indexOf('el-select-dropdown__item') !== -1) {
-              return false
-            } else if (!e.target.children[1]) {
-              return false
-            } else {
-              e.target.children[1].style.display = 'none'
-            }
-          }
-        }, 0)
-      },
-
       reverseArrow(flag) {
         let rulesDom = this.$refs["selectRef"].$el.querySelector(
           ".el-input .el-input__suffix .el-input__suffix-inner .el-input__icon"
diff --git a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
index 1f51356d..1092b271 100644
--- a/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
+++ b/src/views/emis/EmisBaseTools/EmisUserSimplePicker.vue
@@ -4,43 +4,49 @@
           placement="bottom"
           trigger="click"
           ref="popoverRef"
-          effect="light"
-          :show-arrow="false"
+          :popper-options="{ boundariesElement: '.el-form', removeOnDestroy: true }"
         >
-      <span  slot="reference">
-         <el-input ref="inputValue" :value="slable" :placeholder="splaceholder" @input="changeValue" @focus="onfocus" @blur="onblur" @clear="onclear" clearable  >
-            <template slot="suffix">
-              <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i>
-            </template>
-         </el-input>
-      </span>
-      <div >
-        <!-- class="el-table--scrollable-y" border max-height="300px" -->
-          <el-table
-             v-loading="loading"
-             style="width: 100%;"
-             :data="dataList"
-             @row-click="onRowClick"
-             stripe
-             size="mini"
-            element-loading-text="Loading" ref="comboGridTable" fit highlight-current-row>
-            <!-- <el-table-column label="序号" align="center" min-width="50">
-                  <template slot-scope="scope">
-                      <span v-text="getIndex(scope.$index)"> </span>
-                  </template>
-            </el-table-column> -->
-            <el-table-column label="员工编号" align="left" prop="empCode" width="100" />
-            <el-table-column label="员工名称" align="center" prop="empName" width="100" :show-overflow-tooltip="true" />
-            <el-table-column label="所属网点" align="center" prop="ownerSiteName" width="100" :show-overflow-tooltip="true" />
+        <div >
+            <el-table
+              ref="comboGridTable"
+              v-loading="loading"
+              style="width: 100%;"
+              :data="optionItems"
+              @row-click="onRowClick"
+              :row-key="row => row.empCode"
+              stripe
+              :row-style="isRed"
+              element-loading-text="Loading"
+              >
+              <el-table-column label="员工编号" align="left" prop="empCode" width="100" />
+              <el-table-column label="员工名称" align="center" prop="empName" width="100" :show-overflow-tooltip="true" />
+              <el-table-column label="所属网点" align="center" prop="ownerSiteName" width="100" :show-overflow-tooltip="true" />
 
-          </el-table>
-          <el-pagination v-show="pagination" small
-          :total="total"
-          :page-size="5"
-          layout="prev, pager, next, total"
-          @current-change="changePage"
-          />
-      </div>
+            </el-table>
+            <el-pagination v-show="pagination" small
+            :total="total"
+            :page-size="5"
+            layout="prev, pager, next, total"
+            @current-change="changePage"
+            />
+        </div>
+
+      <el-input
+       slot="reference"
+       ref="inputValue"
+       :value="slable"
+       :placeholder="placeholder"
+       @input="handleInput"
+       @focus="onFocus"
+       @blur="onBlur"
+       @clear="onClear"
+       clearable
+        >
+            <template slot="suffix">
+              <!-- <i class="el-icon-arrow-down select-down" :class="visible&&'rotate180'"></i> -->
+              <i slot="suffix" class="el-icon-search"></i>
+            </template>
+      </el-input>
 
     </el-popover>
 
@@ -56,7 +62,7 @@ import { getStaffList } from "@/api/emis/emisStaff";
    mixins: [emitter],
    props: {
       value: {
-        type: [String, Number],
+        type: String,
         required: false
       },
       sideCode: {
@@ -67,65 +73,59 @@ import { getStaffList } from "@/api/emis/emisStaff";
         type: String,
         required: false
       },
-     isInitiated:{
-       type: [Boolean,String],
-       required: false,
-       default:false
-     },
-     placeholder:{
+      placeholder:{
         type: String,
         required: false
       },
-     disabled:{
+      disabled:{
        type: [Boolean,String],
        required: false
-     },
-     pagination: {
-      type: Boolean, default: true
-     },
+      },
+      pagination: {
+        type: Boolean, default: true
+      },
    },
    data() {
      return {
        createdId: '0',
        loading:false,
-       visible:false,
-       dataList: [],
+
        total:0,
+       optionItems: [],
+
+       // 缺省值
+       defaultTotal:0,
+       defaultItems:null,
+
        svalue: this.value,
        slable: null,
-       isEdit:false,
-       splaceholder:this.placeholder,
-       firstFlag:true,
+
+       isInputing: false,
+
        queryParams:{
          pageNum:1,
          pageSize:5,
-         empCode:this.value,
+         empCode:null,
          searchValue:null,
-         ownerSiteCode:null,
-         postCode:null
+         ownerSiteCode:this.sideCode,
+         postCode:this.postCode
        }
      };
    },
    watch: {
      value(newVal,oldVal) {
-        this.svalue = newVal;
-        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();
+        if(this.value!=null){
+          this.svalue=this.value;
+          this.queryData(null,this.svalue);
         }
      },
      siteCode(newVal){
-      console.log("siteCode==>"+newVal);
       this.queryParams.ownerSiteCode=newVal;
-      this.queryData();
+      this.defaultItems=null;
      },
      postCode(newVal){
-      console.log("postCode==>"+newVal);
       this.queryParams.postCode=newVal;
-      this.queryData();
+      this.defaultItems=null;
      }
    },
    mounted() {
@@ -133,107 +133,95 @@ import { getStaffList } from "@/api/emis/emisStaff";
     this.createdId = String(new Date().getTime())
    },
    created() {
-    this.queryData();
+    if(this.svalue!=null){
+        this.queryData(null,this.svalue);
+    }
    },
    methods: {
-    changeValue(val) {
-      if(this.queryParams.searchValue === val ) return;
+    onFocus(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryParams.pageNum=1;
+          this.queryData(null,null);
+        }else{
+          this.total = this.defaultTotal;
+          this.optionItems = [...this.defaultItems];
+        }
+        // this.$refs.popoverRef.doShow();
+    },
+    handleInput(val) {
+      if(val == null ) return;
 
+      this.isInputing = true;
       this.slable = val;
-      this.isEdit = true;
-      this.queryParams.searchValue = val
       this.queryParams.pageNum = 1
+      this.queryData(val,null)
 
-      this.queryData()
     },
     onRowClick(row, column, event) {
         this.svalue=row.empCode;
-        this.showItem(row)
+        this.slable=row.empName;
 
-        this.queryParams.searchValue=row.empName;
+        this.isInputing = false;
 
         this.$emit("input", this.svalue);
         this.$emit("onChange",row);
         this.$refs.popoverRef.doClose();
      },
+    isRed({ row }) {
+     if (row.empCode == this.svalue) {
+        return {
+          "color": "red",
+          "font-weight": "bold",
+        };
+      }
+    },
     changePage(cur) {
       this.queryParams.pageNum = cur
       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
-      }
-      this.visible = true
-      this.slable = null;
-      this.queryParams.searchValue = null;
-      this.queryParams.pageNum = 1
-      this.queryData();
-    },
-    onclear(el){
-      this.firstFlag = false;
-      this.queryParams.empCode=null;
-
-      this.splaceholder = this.placeholder;
+    onClear(el){
       this.slable = null;
       this.svalue = null;
 
-      this.queryParams.searchValue = null;
-      this.queryParams.pageNum = 1;
-
       this.$emit("input", this.svalue);
       this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
-
-      if(this.visible){
-        this.queryData();
-      }
     },
-    onblur(el) {
-      if(this.slable=='' || this.slable=='' || !this.isEdit) {
-        this.slable = this.splaceholder;
+    onBlur(el) {
+      // 如果编辑没有选择则清关历史记录
+      if( this.isInputing ){
+        this.svalue = null;
+        this.slable = null;
       }
       this.$emit("input", this.svalue);
       this.dispatch('ElFormItem', 'el.form.blur', [this.svalue]);
     },
-    queryData() {
-
+    queryData(val,key) {
        this.loading = true;
 
+       this.queryParams.searchValue = val;
+       this.queryParams.empCode = key;
+
        getStaffList(this.queryParams).then(response => {
          this.loading = false;
          this.total = response.total;
-         this.dataList =  response.rows;
-         this.firstFlag = false;
+         this.optionItems = response.rows;
 
-         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);
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultTotal = this.total+0;
+            this.defaultItems=[...this.optionItems]
           }
 
-       });
-     },
-     showItem(item){
-      console.log(item);
+          if(!this.isInputing ){
+            let selectItem = response.rows.find(item => item.empCode == this.svalue);
+            if(selectItem){
+              this.slable = selectItem.empName;
+            }
+          }
 
-      // this.slable=item.empCode+'-'+item.empName;
-      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/ProvincePicker.vue b/src/views/emis/EmisBaseTools/ProvincePicker.vue
index 931f3294..f68fa678 100644
--- a/src/views/emis/EmisBaseTools/ProvincePicker.vue
+++ b/src/views/emis/EmisBaseTools/ProvincePicker.vue
@@ -4,8 +4,13 @@
       filterable
       clearable
       v-model="svalue"
+
+      no-data-text=""
+
       :placeholder="placeholder"
-      @change="onChange">
+      @change="onChange"
+      @click.native="onClick"
+      >
       <el-option v-for="item in optionItems" :key="item.regionCode" :label="item.regionName" :value="item.regionCode" />
       </el-select>
 
@@ -18,7 +23,7 @@
     name: "ProvincePicker",
     props: {
       value: {
-        type: [String, Number],
+        type: String,
         required: false
       },
       countryCode: {
@@ -29,42 +34,71 @@
         type: String,
         required: false
       },
-
     },
     data() {
       return {
-        optionItems: [],
         svalue: this.value,
+        optionItems: [],
+        // 缺省值
+        defaultItems: null,
       };
     },
     watch: {
+      value(newVal,oldVal) {
+        if(this.value!=null ){
+          this.svalue=this.value;
+          // 判断默认值中是否存在，若存在则不继续查询
+          if(this.optionItems){
+              let selItem = this.optionItems.find(item => item.regionCode == this.svalue);
+              if(selItem){
+                return;
+              }
+          }
+          this.queryData(null,this.svalue);
+        }
+      },
       countryCode(newVal, oldVal) {
-        this.queryData();
+        if(newVal!=oldVal){
+            this.defaultItems=null;
+        }
       }
     },
     created() {
-      this.queryData();
+      if(this.svalue!=null){
+          this.queryData(null,this.svalue);
+      }
     },
     methods: {
+      onClick(){
+        // 第一次点击时需要初始化
+        if(!this.defaultItems){
+          this.queryData(null,null);
+        }else{
+          this.optionItems = [...this.defaultItems];
+        }
+
+      },
       onChange() {
         this.$emit("input", this.svalue);
-        this.$emit("onChange",this.svalue);
+        this.$emit("onChange");
       },
-
-      queryData() {
+      queryData(val,key) {
         this.optionItems =[];
 
         let queryParams = {
           pageNum:1,
           pageSize:50,
           countryCode:this.countryCode,
-          regionCode:this.svalue,
+          regionCode:key,
           regionType:1
         };
-        console.log(queryParams);
+
         listSimpleEmisRegion(queryParams).then(response => {
           this.optionItems = response.rows;
-          console.log(response);
+          // 初始值存储
+          if(key==null && val==null){
+            this.defaultItems=[...this.optionItems]
+          }
         });
       },
 
diff --git a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
index c1523e45..f0a68864 100644
--- a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
@@ -97,15 +97,15 @@ export default {
           this.prodCode=this.svalue[1];
         }
       },
-      svalue(newVal, oldVal) {
-      },
       countryCode(newVal) {
         this.queryData(0,0);
         this.resetCascader++
       }
   },
   created() {
-    this.queryData(0,0);
+    if(this.lineCode == null || this.prodCode != null || this.countryCode!= null){
+      this.queryData(0,0);
+    }
   },
   methods: {
     onFocus(){
@@ -114,7 +114,6 @@ export default {
         this.queryData(0,0);
     },
     async queryData(level,parentCode) {
-
       // 第1级是线路
       if(level == 0){
         let queryParams={
diff --git a/src/views/emis/emisDestination/index.vue b/src/views/emis/emisDestination/index.vue
index 74f5915e..82159e1a 100644
--- a/src/views/emis/emisDestination/index.vue
+++ b/src/views/emis/emisDestination/index.vue
@@ -58,7 +58,6 @@
         border
         stripe
         size="mini"
-        :header-cell-style="{background:'#f7f7f7',color:'#606266'}"
         :data="emisDestinationList"
         :showSearch.sync="showSearch"
         :total="total"
diff --git a/src/views/emis/emisWaybill/emisWaybillModify.vue b/src/views/emis/emisWaybill/emisWaybillModify.vue
deleted file mode 100644
index da8b78a5..00000000
--- a/src/views/emis/emisWaybill/emisWaybillModify.vue
+++ /dev/null
@@ -1,1820 +0,0 @@
-<template>
-  <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="8">
-                    <el-form-item label="运单号" prop="billCode"  >
-                      <div style="display:inline-flex">
-                          <div>
-                            <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" style="font-weight:600;color:black" >
-                              <i slot="suffix" class="iconfont">&#xe656;</i>
-                            </el-input>
-                          </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="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="10">
-                </el-col>
-
-                  <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 :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>
-
-                  <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-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="sendSiteCode">
-                        <!-- <el-input v-model="form.sendSiteCode" placeholder=""  /> -->
-                        <EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode"  @onChange="onSendSiteSelect"  ></EmisSiteSimplePicker>
-                        <el-input v-else  v-model="form.sendSiteName" placeholder="" disabled />
-
-                      </el-form-item>
-                  </el-col>
-
-                  <el-col :span="18">
-                    <el-form-item label="打印选项:" prop="printTypeCheckList">
-                      <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  >{{dict.label}}</span>
-                        </el-checkbox> -->
-
-                        <el-checkbox :key="1" :label="1" >
-                          <span  >寄件网点存根联</span>
-                        </el-checkbox>
-                        <el-checkbox :key="5" :label="5" >
-                          <span  >子单</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-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-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="24">
-                      <el-form-item label="寄件公司" prop="sender.company"
-                      :rules="form.paymentType != 2 ? rules.sender.company : []"
-                      >
-                        <el-input
-                        v-model="form.sender.company" 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="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.company"
-                        :rules="form.paymentType != 4 ? rules.reciever.company : []"
-                        >
-                          <el-input v-model="form.reciever.company" 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="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="70px">
-                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="货物名称" prop="goodsType" label-width="70px">
-                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" />
-                        </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;" @blur="handleInitGenGoods" @keyup.enter.native="handleInitGenGoods" placeholder=""  />
-                        </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="24">
-                        <el-form-item label="" prop="goodsType" label-width="0px">
-                          <!-- <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker> -->
-                          <!-- <div style="width:50%">
-                            <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
-                          </div> -->
-                          <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 label="序号" align="center" width="60">
-                                  <template slot-scope="scope">
-                                      <span > {{scope.$index+1}}</span>
-                                  </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" @blur="(val)=>handleCargoQtyChange(val,scope.row)" @keyup.enter.native="(val)=>handleCargoQtyChange(val,scope.row)"  size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column>
-
-                            <!-- @input="(val)=>handleCalcQty(val,scope.row)" -->
-                            <!-- <el-table-column prop="goodsName" label="描述" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column> -->
-
-                            <el-table-column label="操作" align="left" min-width="50">
-                                  <template slot-scope="scope">
-
-                                    <!-- <span style="cursor: pointer;font-size: 21px;color: #6e6e6e;" title="删除"
-                                    @click="()=>{deleteGoodsItem(scope.row);event.stopPropagation()}"
-                                    >
-                                    <i class="el-icon-delete" />
-                                    </span>
-
-
-                                    <span style="cursor: pointer;font-size: 21px;color: #6e6e6e;" title="复制"
-                                    @click="()=>{copyGoodsItem(scope.row);event.stopPropagation()}"
-                                    >
-                                      <i class="el-icon-copy-document" />
-                                    </span> -->
-
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>deleteGoodsItem(scope.row,scope.$index)">&#xe7ae;</span>
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>copyGoodsItem(scope.row,scope.$index)">&#xe620;</span>
-                                  </template>
-                            </el-table-column>
-
-                          </el-table>
-
-                        </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="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
-                            v-for="dict in dict.type.emis_calc_fee_type"
-                            :key="dict.value"
-                            :label="dict.value"
-                            >{{dict.label}}</el-radio>
-                        </el-radio-group>
-
-                      </el-form-item>
-                    </el-col>
-
-                    <el-form-item label="特殊报价" prop="ext" label-width="70px">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0">特殊报价</el-checkbox>
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0">敏感物</el-checkbox>
-
-                    </el-form-item>
-
-                    <el-col :span="24">
-                        <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-if="form.blSpecialQuote==1" v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.initialWeightFee}} </div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
-                              <template slot-scope="scope">
-                                <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.addWeightPrice}} </div>
-
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
-                              <template slot-scope="scope">
-                                <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(val,scope.row)" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.realFee}} </div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column  prop="remark" label="描述" align="center" min-width="50">
-                              <template slot-scope="scope">
-                                <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.remark" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.remark}} </div>
-                              </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" 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="custNo" label-width="70px">
-                        <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="回款联系人" prop="payee" label-width="85px">
-                        <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
-                        <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
-
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
-                        <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
-                        <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
-
-                      </el-form-item>
-                    </el-col>
-
-                  </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>
-
-    <el-dialog :title="titleSelectAddress" :visible.sync="openSelectAddress" width="60%" :destroy-on-close="true"  v-dialogDrag append-to-body>
-        <AddressSelectPicker0 :addressType="addressType"   @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
-    </el-dialog>
-
-    <el-dialog class="previe_dialog" title="打印预览" :visible.sync="openPdfView" width="80%"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <PdfViewer :pdfUrl="pdfUrl"  width="100%"  @onPrint="handleBatchPrint" ></PdfViewer>
-    </el-dialog>
-
-     <!-- 打印机状态 -->
-     <div style="padding:5px 0px;text-align: right;position: fixed;top: 150px;right: 10px;    z-index: 9999;">
-        <el-tag type="danger" v-if="printerStatus==0">{{ printerStatusMessage }}</el-tag>
-        <el-tag type="success" v-if="printerStatus==1">{{ printerStatusMessage }}</el-tag>
-
-    </div>
-
-</div>
-</template>
-
-<script>
-import { realMatchWaybill } from "@/api/emis/emisElectronicPag";
-import { getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
-import { parseTime } from "@/utils/custom";
-import { getDestSite } from "@/api/emis/emisDestination";
-
-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 EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.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';
-// import TownPicker1 from '@/views/emis/EmisBaseTools/TownPicker.vue';
-
-import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
-import CityPicker2 from '@/views/emis/EmisBaseTools/CityPicker.vue';
-import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
-// import TownPicker2 from '@/views/emis/EmisBaseTools/TownPicker.vue';
-
-// import CustomerPicker0 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-// import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-// import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-
-import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
-import GoodsMultiplePicker from '@/views/emis/EmisBaseTools/GoodsMultiplePicker.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';
-import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
-import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
-import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
-
-import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
-import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
-
-import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
-import feeItemForm from './feeItemForm.vue';
-
-import PdfViewer from '@/components/PdfViewer/index.vue';
-import PdfUtils from '@/utils/pdfUtils'
-
-
-export default {
-  name: "WaybillEntry",
-  // props:{
-  //   billCode:{
-  //     type:String
-  //   }
-  // },
-components: {
-  SalemanPicker,
-  PayeePicker,
-  PdfViewer,
-  feeItemForm,
-  TransProductCasPicker,
-  WarehouseInNoPicker,
-  EmisMonthpayAccountPicker,
-  AddressSelectPicker0,
-  AddressSelectPicker1,
-  CustomerAddressSimplePicker0,
-  CustomerAddressSimplePicker1,
-  GoodsSimplePicker,
-  GoodsMultiplePicker,
-  EmisUserSimplePicker0,
-  EmisUserSimplePicker1,
-  EmisUserSimplePicker2,
-  EmisUserSimplePicker3,
-  EmisSiteSimplePicker,
-  DestinationPicker,
-  TransLinePicker,
-  TransProductPicker,
-  CountryPicker0,
-  CountryPicker1,
-  ProvincePicker1,
-  CityPicker1,
-  DistrictPicker1,
-  CountryPicker2,
-  ProvincePicker2,
-  CityPicker2,
-  DistrictPicker2,
-},
-dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
-        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
-        'emis_calc_fee_type','emis_print_type'],
-data() {
-  return {
-    activeNames:['1','2','3','4'],
-    billCode:null,
-    emisWaybillOptions: [],
-    addressType:null,
-    // 遮罩层
-    loading: true,
-    isNeedSave:false,
-    triggerCount:0,
-    // 表单参数
-    form: {},
-    timer:null,
-    isNeedCalc:false,
-    titleSelectAddress:'',
-    openSelectAddress:false,
-
-    tanexPrinter:null,
-    printerDownUrl:null,
-    printerStatus:0,
-    printerStatusMessage:'打印组件未连接',
-    printerList:[],
-    printTplList:[],
-    selTplName:null,
-    selPrinterName:null,
-
-    openPdfView:false,
-    pdfUrl:null,
-
-    // 表单校验
-    rules: {
-      billCode: [
-        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  }
-      ],
-      reciever:{
-        name: [
-          { required: true, message: "收货人名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "收货人手机号不能为空", trigger: "blur" }
-        ],
-        country: [
-          { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
-        ],
-        province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
-        ],
-        company: [
-          { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
-        ],
-        // city: [
-        //   { required: true, message: "市不能为空", trigger: "blur" }
-        // ],
-        // county: [
-        //   { required: true, message: "区不能为空", trigger: "blur" }
-        // ],
-        address: [
-          { required: true, message: "收货地址不能为空", trigger: "blur" }
-        ],
-      },
-      sender:{
-        name: [
-          { required: true, message: "寄件人名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "寄件人手机号不能为空", trigger: "blur" }
-        ],
-        country: [
-          { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change']  }
-        ],
-        province: [
-          { required: true, message: "寄件省不能为空", trigger: ["blur",'change']  }
-        ],
-        company: [
-          { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
-        ],
-
-        // city: [
-        //   { required: true, message: "寄件市不能为空", trigger: "blur" }
-        // ],
-        // county: [
-        //   { required: true, message: "寄件区不能为空", trigger: "blur" }
-        // ],
-        address: [
-          { required: true, message: "寄件地址不能为空", trigger: "blur" }
-        ],
-      },
-      paymentType: [
-        { required: true, message: "支付方式不能为空", trigger: ["blur",'change']  }
-      ],
-      calcFeeType: [
-        { required: true, message: "计费方式不能为空", trigger: ["blur",'change']  }
-      ],
-      transLine: [
-        { required: true, message: "快递线路不能为空", trigger: ["blur",'change']  }
-      ],
-      productType: [
-        { required: true, message: "快递产品类型不能为空", trigger: ["blur",'change']  }
-      ],
-      customsClear: [
-        { required: true, message: "清关方式不能为空", trigger: ["blur",'change']  }
-      ],
-      customsEclaration: [
-        { required: true, message: "报关方式不能为空", trigger: ["blur",'change']  }
-      ],
-      packType: [
-        { required: true, message: "包装类型不能为空",trigger: ["blur",'change']  }
-      ],
-      dispatchMethod: [
-        { required: true, message: "派件方式不能为空", trigger: ["blur",'change']  }
-      ],
-      pickupMethod: [
-        { required: true, message: "取件方式为空", trigger: ["blur",'change']  }
-      ],
-      goodsInfo: [
-        { required: true, message: "货物描述不能为空", trigger: ["blur",'change']  }
-      ],
-      totalVolume: [
-        { required: true, message: "总体积不能为空", trigger: "blur" }
-      ],
-      parcelQty: [
-        { required: true, message: "件数不能为空", trigger: "blur" }
-      ],
-      billWeight: [
-        { required: true, message: "实际重量不能为空", trigger: "blur" }
-      ],
-      volumeWeight: [
-        { required: true, message: "体积重量不能为空", trigger: "blur" }
-      ],
-      settlementWeight: [
-        { required: true, message: "结算重量不能为空", trigger: "blur" }
-      ],
-      freight: [
-        { required: true, message: "运费不能为空", trigger: "blur" }
-      ],
-      sendSiteCode: [
-        { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
-      ],
-      sendDate: [
-        { required: true, message: "发货时间不能为空", trigger: "blur" }
-      ],
-      dispatchUnderlingSiteCode: [
-        { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
-      ],
-      custNo: [
-        { required: true, message: "月结卡号不能为空", trigger: "blur" }
-      ],
-      payee: [
-        { required: true, message: "销售回款人不能为空", trigger: "blur" }
-      ],
-      salesmen: [
-        { required: true, message: "销售联系人不能为空", trigger: "blur" }
-      ],
-      takePieceEmployeeCode: [
-        { required: true, message: "取件员代码不能为空", trigger: ["blur",'change']  }
-      ],
-      operateEmployeeCode: [
-        { required: true, message: "操作员代码不能为空", trigger: ["blur",'change']  }
-      ],
-    }
-  };
-},
- watch: {
-    "form.reciever.province":{
-      handler (newValue, oldValue) {
-        // this.isNeedSave=true;
-        this.calcDestSite();
-      },
-      immediate: false,
-      deep: true,
-    },
-    "form.totalVolume":{
-      handler (newValue, oldValue) {
-        this.reCalcVolumeWeight();
-      },
-      deep: true
-    },
-    "form.volumeWeight":{
-      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
-    },
-    "form.billCode":{
-      handler (newValue, oldValue) {
-          this.handleGenSubbill();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.blGenSubbill":{
-      handler (newValue, oldValue) {
-          this.handleGenSubbill();
-      },
-      immediate: false,
-      deep: true
-    },
-
-},
-activated(){
-},
-mouted(){
-},
-updated(){
-},
-created() {
-  this.billCode=this.$route.query.billCode;
-  this.initData();
-  this.initTanexPrinterSdk();
-
-},
-methods: {
-  handleScanInput(){
-    if(this.form.billCode==null || this.form.billCode==''){
-      this.$message.error("输入单号后回车");
-      return;
-    }
-    this.billCode=this.form.billCode;
-    this.initData();
-  },
-  initTanexPrinterSdk(){
-      this.tanexPrinter = this.$tanexPrinter;
-
-      this.getConfigKey("sys.printer.downurl").then(response => {
-        this.printerDownUrl = response.msg;
-      });
-      this.tanexPrinter.init();
-      this.tanexPrinter.setOnOpen(this.onPrinterOpen);
-      this.tanexPrinter.setOnClose(this.onPrinterClose);
-      this.tanexPrinter.setOnError(this.onPrinterError);
-      // this.tanexPrinter.setOnGetPrinter(this.onGetPrinter);
-      // this.tanexPrinter.setOnGetPrintTpl(this.onGetPrintTpl);
-    },
-    onPrinterOpen(evt){
-      console.log("onPrinterOpen")
-      this.printerStatus = 1;
-      this.printerStatusMessage="打印组件已连接,可以打印.";
-
-    },
-    onPrinterClose(evt){
-      console.log("onPrinterClose")
-      this.printerStatus = 0;
-      this.printerStatusMessage="打印组件已断开！";
-    },
-    onPrinterError(evt){
-      console.log("onPrinterError")
-      this.printerStatus = 0;
-      this.printerStatusMessage="打印组件已断开！";
-    },
-    handleBatchPrint(){
-      if(this.printerStatus == 1){
-        if(this.form.billCode){
-            // 重要，设置为true才会把右上角X和取消区分开来
-            this.$confirm("确定打印?", "提示", {
-                cancelButtonText: "不打印",
-                confirmButtonText: "确定打印",
-                type: "warning",
-                distinguishCancelAndClose: true,
-                closeOnClickModal: false
-            }).then(() => {
-                // 打印主单，子单
-                let orderList=[];
-                // this.currentSelection.forEach(item=>{
-                //   orderList.push(item.billCode);
-                // });
-                // 打印主单
-                orderList.push(this.form.billCode);
-                let selPrinterName=this.tanexPrinter.getDefaultPrinter();
-                let selTplName="探路速运-主单联（通用）";
-                this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList)
-
-
-                // 打印子单
-                selTplName="探路速运-子单联（通用）";
-
-                let childOrderList=[]
-                orderList=this.form.billCodeSub.split(',');
-                orderList.forEach(item=>{
-                  if(item!=null && item!=''){
-                    childOrderList.push(item);
-                  }
-                });
-                this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList)
-
-
-            }).catch(() => {});
-        }
-      }
-      else{
-        this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", {
-                cancelButtonText: "返回操作",
-                confirmButtonText: "操作下一单",
-                type: "warning",
-                distinguishCancelAndClose: true,
-                closeOnClickModal: false
-            }).then(() => {
-                this.reset();
-            });
-      }
-
-    },
-    async handlePrintPreview(){
-
-      if(this.printerStatus == 1){
-        if(this.form.billCode){
-            let pdfUrlList=[];
-            let selPrinterName=this.tanexPrinter.getDefaultPrinter();
-            let selTplName="探路速运-主单联（通用）";
-            let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName);
-            pdfUrlList.push(url)
-            // 子单url
-            if(this.form.billCodeSub){
-              selTplName="探路速运-子单联（通用）";
-              let orderList=this.form.billCodeSub.split(',');
-              orderList.forEach(item=>{
-                  if(item!=null && item!=''){
-                    let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName);
-                    pdfUrlList.push(url)
-                  }
-              });
-            }
-            let pdfUtils=new PdfUtils({});
-            const loadingInstance = this.$loading({
-                  text: '正在生成预览...'
-            })
-            pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" )
-            .then(url=>{
-              loadingInstance.close();
-              this.pdfUrl=url;
-              this.openPdfView = true;
-            })
-            .catch(error => {
-            });
-        }
-      }
-      else{
-        this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", {
-                cancelButtonText: "返回操作",
-                confirmButtonText: "操作下一单",
-                type: "warning",
-                distinguishCancelAndClose: true,
-                closeOnClickModal: false
-            }).then(() => {
-                this.reset();
-            });
-      }
-
-  },
-  onSelectMonthUser(item){
-    console.log(item);
-    this.form.payee=item.payee;
-    this.form.salesmen=item.salesmen;
-  },
-  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(() => {
-    })
-
-  },
-
-  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,4);
-          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();
-
-      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;
-          this.form.printTypeCheckList=[1,5]
-
-        });
-      }else{
-
-        this.form.sendDate =  parseTime(new Date());
-        this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
-        this.form.sendSiteName=this.$store.getters.ownerSiteName;
-        console.log(this.form.sendSiteName)
-
-        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=1;
-        this.form.paymentType='1';
-        this.form.calcFeeType='1';
-        this.form.blMessage='1'
-        this.form.blAcceptMessage='1'
-        this.isNeedSave=true;
-        this.form.printTypeCheckList=[1,5],
-
-        this.handleInitGenGoods();
-      }
-
-
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-  },
-  // 取消按钮
-  cancel() {
-    this.reset();
-    this.$emit("on-cancel");
-  },
-
-  // 表单重置
-  reset() {
-    this.form = {
-      id:null,
-      reciever: {
-          country: null,
-          name: null,
-          phone:null,
-          province: null,
-          city: null,
-          district: null,
-          town: null,
-          address: null,
-          postCode: null,
-          email: null,
-          company: null,
-      },
-      sender: {
-          country: null,
-          name: null,
-          phone:null,
-          province: null,
-          city: null,
-          district: null,
-          town: null,
-          address: null,
-          postCode: null,
-          email: null,
-          company: null,
-      },
-      feeItems: [],
-      cargoList: [],
-      attachmentList: [],
-      printTypeCheckList:[],
-      billCode: null,
-      orderDate:  null,
-      openId: null,
-      customerCode: null,
-      paymentType: null,
-      calcFeeType: '1',
-      custNo:  null,
-      productTypeSelArr: null,
-      transLine:  null,
-      productType: null,
-      customsClear: null,
-      customsEclaration: null,
-      packType: null,
-      dispatchMethod: "1",
-      pickupMethod: null,
-      pickStartDate: null,
-      pickFinishDate: null,
-      intoWarehouseCode: null,
-      intoWarehouseName: null,
-      intoWarehouseAddress: null,
-      intoWarehouseContact: null,
-      intoWarehousePhone:  null,
-      intoWarehouseBillCode: null,
-      customerDeliveryBeginTime: null,
-      goodsType:null,
-      goodsInfo: null,
-      length:null,
-      width:null,
-      height:null,
-      totalWeight: null,
-      totalVolume: null,
-      parcelQty: null,
-      billWeight: null,
-      volumeWeight: null,
-      settlementWeight: null,
-      feeWeight: null,
-      freight: null,
-      blOverLong: null,
-      blOverWeight: null,
-      overWeightNumber: null,
-      feeRemaker: null,
-      realValue: null,
-      takePieceEmployeeCode: null,
-      sendSiteCode: null,
-      sendSiteName: null,
-      destinationCode:  null,
-      dispatchUnderlingSiteCode: null,
-      destinationCenterCode: null,
-      marketManCode: null,
-      payee: null,
-      salesmen: null,
-      operateEmployeeCode: null,
-      blMessage: null,
-      blAcceptMessage: null,
-      meterType:null,
-      blGenSubbill:null,
-      billCodeSub:null,
-      blSpecialQuote:null,
-      blSensitive:null,
-  };
-    this.resetForm("form");
-  },
-  onProductChange(item){
-    this.form.transLine=item[0];
-    this.form.productType=item[1];
-  },
-  onSendSiteSelect(item){
-    if(!item){
-      this.form.sendSiteCode = null;
-      this.form.sendSiteName = null;
-      return;
-    }
-    this.form.sendSiteCode=item.siteCode;
-    this.form.sendSiteName=item.siteName;
-  },
-  /** 提交按钮 */
-  submitForm() {
-    this.$refs["form"].validate(valid => {
-      if (valid) {
-        realSubmitOrder(this.form).then(response => {
-            this.$modal.msgSuccess("下单成功");
-
-            // 弹出打印预览界面
-            this.handlePrintPreview();
-
-            // this.$emit("on-changed");
-        });
-      }
-    });
-  },
-   // 弹出地址簿选择
-   handleSelectCustomerAddress(addressType){
-       this.addressType = addressType;
-       this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人');
-       this.openSelectAddress = true;
-  },
-  // 地址薄选择后返回
-  onAddressChangeSelect(item){
-    if(this.addressType == 1){
-      this.onChangeSelectSender(item);
-    }else{
-      this.onChangeSelectReceiver(item);
-    }
-    this.openSelectAddress = false;
-
-  },
-  onChangeSelectSender(value){
-    this.form.sender.name=value.name;
-    this.form.sender.phone=value.phone;
-    this.form.sender.country=value.country;
-    this.form.sender.province=value.province;
-    this.form.sender.city=value.city;
-    this.form.sender.county=value.district;
-    // this.form.receiveTown=value.town;
-    this.form.sender.address=value.address;
-    this.form.sender.company=value.company;
-  },
-  onChangeSelectReceiver(value){
-    this.form.reciever.name=value.name;
-    this.form.reciever.phone=value.phone;
-    this.form.reciever.country=value.country;
-    this.form.reciever.province=value.province;
-    this.form.reciever.city=value.city;
-    this.form.reciever.county=value.district;
-    // this.form.receiveTown=value.town;
-    this.form.reciever.address=value.address;
-    this.form.reciever.company=value.company;
-
-  },
-  // 计算目的站点
-  calcDestSite(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    let queryParams = {
-            province:this.form.reciever.province
-    };
-
-    if(this.form.reciever.province){
-        getDestSite(queryParams).then(response => {
-          console.log(response);
-          this.form.destinationCode = response.data.destCode+'';
-          this.form.dispatchUnderlingSiteCode= response.data.siteCode;
-          this.form.dispatchSiteCode= response.data.siteCode;
-
-          this.form.dispatchUnderlingSite= response.data.siteName;
-          this.form.dispatchSite= response.data.siteName;
-
-        });
-    }
-  },
-  handleCalcVolume(val,row){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    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))*parseFloat(row.cargoQty);
-    }
-
-    this.form.cargoList.forEach(item=>{
-        totalVolume=totalVolume+item.volume;
-    });
-    this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
-
-  },
-
-  handleCalcFeeItem(val,row){
-
-    if(row!=null){
-
-      if(row.calcExp){
-        let expr="s+w*d";
-        expr=expr.replace("s",row.initialWeightFee);
-        expr=expr.replace("d",row.addWeightPrice);
-        expr=expr.replace("w",this.form.settlementWeight);
-        row.realFee=parseFloat(eval(expr)).toFixed(2);
-      }
-    }
-
-    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,
-        }
-
-        calcVolumeWeight(postData).then(response => {
-              this.form.volumeWeight = response.data.volumeWeight;
-        });
-      }
-
-  },
-   // 计算计算重量
-  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(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    if(this.form.settlementWeight
-        && this.form.productType
-        && this.form.sendSiteCode
-        && this.form.dispatchUnderlingSiteCode
-        && this.form.calcFeeType
-      ){
-        let postData={
-          productType: this.form.productType,
-          customerCode: this.form.customerCode,
-          custNo: this.form.custNo,
-          calcFeeType: this.form.calcFeeType,
-          settlementWeight: this.form.settlementWeight,
-          sendSiteCode: this.form.sendSiteCode,
-          dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
-        }
-
-        calcWaybillFee(postData).then(response => {
-              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();
-        });
-      }
-  },
-  onDestinationChange(item){
-    // this.form.destinationCode = item.destCode;
-    this.form.dispatchUnderlingSiteCode= item.siteCode;
-    this.form.dispatchSiteCode= item.siteCode;
-
-    this.form.dispatchUnderlingSite= item.siteName;
-    this.form.dispatchSite= item.siteName;
-  },
-  onGoodsChange(goodsList,selNameStr){
-    this.form.goodsInfo = selNameStr;
-  },
-
-  handleInitGenGoods(){
-    if(this.form.parcelQty>0){
-
-      let currentParcelQty = 0;
-      if(this.form.cargoList){
-        this.form.cargoList=[];
-      }
-
-      this.form.cargoList.forEach(item=>{
-        currentParcelQty = currentParcelQty+parseInt(item.cargoQty);
-      });
-
-      // 新件数大于
-      if(this.form.parcelQty>currentParcelQty){
-        let len=this.form.parcelQty-currentParcelQty;
-        if(this.form.parcelQty>20){
-          let cargo={
-              "goodsCode": "",
-              "goodsName": "",
-              "cargoQty": len,
-              "length": 0,
-              "width": 0,
-              "height": 0,
-              "volume": 0,
-            }
-            this.form.cargoList.push(cargo);
-        }
-        else{
-          for(let i=0;i<len;i++){
-            let cargo={
-              "goodsCode": "",
-              "goodsName": "",
-              "cargoQty": 1,
-              "length": 0,
-              "width": 0,
-              "height": 0,
-              "volume": 0,
-            }
-            this.form.cargoList.push(cargo);
-          }
-       }
-      }
-      else{
-        let newList=[];
-        let incQty=0;
-        let zeroItem=null;
-        for(let i=0;i<this.form.cargoList.length;i++){
-            let item=this.form.cargoList[i];
-            // 忽略未填写体积的数据
-            if(item.length==0&&item.width==0&&item.height==0){
-                zeroItem=item;
-                zeroItem.cargoQty=1;
-                continue;
-            }
-
-            if((incQty+parseInt(item.cargoQty))<this.form.parcelQty){
-                incQty = incQty+parseInt(item.cargoQty);
-                newList.push(item)
-            }else{
-                item.cargoQty=this.form.parcelQty-incQty;
-                newList.push(item)
-                incQty = incQty+parseInt(item.cargoQty);
-                break;
-            }
-        }
-        // 补足数量
-        let bzLen=this.form.parcelQty-incQty;
-        for(let i=0;i<bzLen;i++){
-          let newItem=Object.assign({},zeroItem);
-          newList.push(newItem);
-        }
-
-        this.form.cargoList=newList;
-      }
-    }else{
-      this.form.cargoList=[];
-    }
-  },
-  handleCargoQtyChange(){
-    this.handleInitGenGoods();
-    this.handleCalcVolume();
-  },
-  deleteGoodsItem(row,index){
-    this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-      // let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
-      // this.form.cargoList=newList;
-      console.log(index);
-      this.form.cargoList.splice(index,1)
-      this.handleCalcVolume();
-    }).catch(() => {
-    })
-  },
-  copyGoodsItem(row,index){
-      let newItem = Object.assign({},row);
-      newItem.cargoQty=1;
-      this.form.cargoList.splice(index+1, 0, newItem);
-      // this.form.cargoList.push(newItem);
-      handleCargoQtyChange();
-  },
-  showLocalTime(){
-
-  },
-  /** 鼠标移入cell */
-  handleGoodsCellEnter (row, column, cell, event) {
-    row.isEdit = true
-  },
-  /** 鼠标移出cell */
-  handleGoodsCellLeave (row, column, cell, event) {
-    row.isEdit = false
-  },
-  // 实时获取运单号
-  handleBillCodeChange(checked,item){
-    if(checked){
-      realMatchWaybill().then(response => {
-          this.form.billCode=response.data;
-      });
-    }else{
-      this.form.billCode=""
-    }
-  },
-}
-};
-</script>
-
-<style lang="scss">
-
-.el-form-item__label {
-    color: #000;
-}
-
-.el-input-group__append {
-    padding: 0 4px;
-}
-
-.el-row{
-      display:flex;
-      flex-wrap: wrap;
-      // padding-right: 10px;
- }
-
-.el-form-item__label {
-  font-size: 12px!important;
-}
-
-
- .platform-auto-complete {
-  .el-autocomplete-suggestion__wrap {
-    padding: 5px 0;
-    ul li {
-      pointer-events: none; // 阻止可点击事件
-      .default {
-        text-align: center;
-        color: #999;
-      }
-      &:hover {
-        background-color: #fff;
-      }
-    }
-  }
-}
-
-.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/emisWaybillRecord.vue b/src/views/emis/emisWaybill/emisWaybillRecord.vue
deleted file mode 100644
index 15e54a82..00000000
--- a/src/views/emis/emisWaybill/emisWaybillRecord.vue
+++ /dev/null
@@ -1,1830 +0,0 @@
-<template>
-  <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" v-if="action=='add'">
-                    <el-form-item :label="$t('发货时间')" prop="sendDate">
-                      <el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
-                    </el-form-item>
-                </el-col>
-
-                <el-col :span="18" v-if="action=='add'">
-                    <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" />
-                            <!-- <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" style="font-weight:600;color:black" >
-                              <i slot="suffix" class="iconfont">&#xe656;</i>
-                            </el-input> -->
-                          </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>
-                <!-- 运单录入 end -->
-
-                <!-- 运单修改 -->
-                <el-col :span="8" v-if="action=='modify'">
-                    <el-form-item label="运单号" prop="billCode"  >
-                      <div style="display:inline-flex">
-                          <div>
-                            <el-input v-model="form.billCode" placeholder="单号输入后按回车" @keyup.enter.native="handleScanInput" style="font-weight:600;color:black" >
-                              <i slot="suffix" class="iconfont">&#xe656;</i>
-                            </el-input>
-                          </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="6" v-if="action=='modify'">
-                    <el-form-item :label="$t('发货时间')" prop="sendDate">
-                      <el-input v-model="form.sendDate" placeholder="" readonly="" disabled />
-                    </el-form-item>
-                </el-col>
-
-                <el-col :span="10" v-if="action=='modify'">
-                </el-col>
-                <!-- 运单修改 end -->
-
-
-
-                  <el-col :span="6">
-                    <el-form-item label="目的国" prop="destinationCountry">
-                        <CountryPicker0 v-model="form.destinationCountry" @onChange="onDestCountryChange"></CountryPicker0>
-                    </el-form-item>
-                  </el-col>
-
-                  <el-col :span="8">
-                    <el-form-item label="产品类型" prop="productType">
-                      <TransProductCasPicker v-model="form.productTypeSelArr" :countryCode="form.destinationCountry" @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>
-
-                  <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-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="sendSiteCode">
-                        <!-- <el-input v-model="form.sendSiteCode" placeholder=""  /> -->
-                        <EmisSiteSimplePicker v-if="$store.getters.ownerSiteCode== '88888'" v-model="form.sendSiteCode"  @onChange="onSendSiteSelect"  ></EmisSiteSimplePicker>
-                        <el-input v-else  v-model="form.sendSiteName" placeholder="" disabled />
-
-                      </el-form-item>
-                  </el-col>
-
-                  <el-col :span="18" v-if="action=='add'">
-                    <el-form-item label="打印选项:" prop="printTypeCheckList">
-                      <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  >{{dict.label}}</span>
-                        </el-checkbox> -->
-
-                        <el-checkbox :key="1" :label="1" >
-                          <span  >寄件网点存根联</span>
-                        </el-checkbox>
-                        <el-checkbox :key="5" :label="5" >
-                          <span  >子单</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-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-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="24">
-                      <el-form-item label="寄件公司" prop="sender.company"
-                      :rules="form.paymentType != 2 ? rules.sender.company : []"
-                      >
-                        <el-input
-                        v-model="form.sender.company" 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="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.company"
-                        :rules="form.paymentType != 4 ? rules.reciever.company : []"
-                        >
-                          <el-input v-model="form.reciever.company" 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" @onChange="handleCalcDestSite" ></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="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="70px">
-                          <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="货物名称" prop="goodsType" label-width="70px">
-                          <el-input v-model="form.goodsInfo" type="textarea"  placeholder="" />
-                        </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;" @blur="handleInitGenGoods" @keyup.enter.native="handleInitGenGoods" placeholder=""  />
-                        </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="handleCalcSettlementWeight"  style="text-align: right;min-width: 80px" placeholder="请输入实际重量" >
-                            <span slot="suffix">(kg)</span>
-                          </el-input>
-                        </el-form-item>
-                    </el-col>
-                    <el-col :span="24">
-                        <el-form-item label="" prop="goodsType" label-width="0px">
-                          <!-- <GoodsSimplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsSimplePicker> -->
-                          <!-- <div style="width:50%">
-                            <GoodsMultiplePicker v-model="form.goodsType" @onChange="onGoodsChange" placeholder="选择货物信息"></GoodsMultiplePicker>
-                          </div> -->
-                          <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 label="序号" align="center" width="60">
-                                  <template slot-scope="scope">
-                                      <span > {{scope.$index+1}}</span>
-                                  </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" @blur="(val)=>handleCalcVolume(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" @blur="(val)=>handleCalcVolume(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" @blur="(val)=>handleCalcVolume(scope.row)" size="mini" placeholder=""></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" @blur="(val)=>handleCargoQtyChange(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>
-
-                            <!-- @input="(val)=>handleCalcQty(val,scope.row)" -->
-                            <!-- <el-table-column prop="goodsName" label="描述" align="center" width="60">
-                              <template slot-scope="scope">
-                                <el-input  v-model="scope.row.goodsName" size="mini" placeholder=""></el-input>
-                              </template>
-                            </el-table-column> -->
-
-                            <el-table-column label="操作" align="left" min-width="50">
-                                  <template slot-scope="scope">
-
-                                    <!-- <span style="cursor: pointer;font-size: 21px;color: #6e6e6e;" title="删除"
-                                    @click="()=>{deleteGoodsItem(scope.row);event.stopPropagation()}"
-                                    >
-                                    <i class="el-icon-delete" />
-                                    </span>
-
-
-                                    <span style="cursor: pointer;font-size: 21px;color: #6e6e6e;" title="复制"
-                                    @click="()=>{copyGoodsItem(scope.row);event.stopPropagation()}"
-                                    >
-                                      <i class="el-icon-copy-document" />
-                                    </span> -->
-
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>deleteGoodsItem(scope.row,scope.$index)">&#xe7ae;</span>
-                                    <span class="icon iconfont"
-                                    style="cursor: pointer;font-size: 21px;color: #6e6e6e;"
-                                    @click="()=>copyGoodsItem(scope.row,scope.$index)">&#xe620;</span>
-                                  </template>
-                            </el-table-column>
-
-                          </el-table>
-
-                        </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" @input="handleCalcVolumeWeight" 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" label-width="70px">
-                          <el-input v-model="form.volumeWeight" @input="calcBillFee"  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" @input="calcBillFee" 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
-                            v-for="dict in dict.type.emis_calc_fee_type"
-                            :key="dict.value"
-                            :label="dict.value"
-                            >{{dict.label}}</el-radio>
-                        </el-radio-group>
-
-                      </el-form-item>
-                    </el-col>
-
-                    <el-form-item label="特殊报价" prop="ext" label-width="70px">
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSpecialQuote" :true-label="1" :false-label="0">特殊报价</el-checkbox>
-                        <el-checkbox style="font-size:400;margin-right:10px;font-size:10px" v-model="form.blSensitive" :true-label="1" :false-label="0">敏感物</el-checkbox>
-
-                    </el-form-item>
-
-                    <el-col :span="24">
-                        <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-if="form.blSpecialQuote==1" v-model="scope.row.initialWeightFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.initialWeightFee}} </div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="addWeightPrice" label="续重单价" align="center" width="70">
-                              <template slot-scope="scope">
-                                <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.addWeightPrice" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.addWeightPrice}} </div>
-
-                              </template>
-                            </el-table-column>
-                            <el-table-column prop="realFee" label="实收"  align="center" width="50">
-                              <template slot-scope="scope">
-                                <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.realFee" @input="(val)=>handleCalcFeeItem(scope.row)" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.realFee}} </div>
-                              </template>
-                            </el-table-column>
-                            <el-table-column  prop="remark" label="描述" align="center" min-width="50">
-                              <template slot-scope="scope">
-                                <el-input v-if="form.blSpecialQuote==1" v-model="scope.row.remark" size="mini" placeholder=""></el-input>
-                                <div v-else> {{scope.row.remark}} </div>
-                              </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" 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="custNo" :rules="(form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5)?rules.custNo:[]" label-width="70px">
-                        <EmisMonthpayAccountPicker v-model="form.custNo" @onChange="onSelectMonthUser"></EmisMonthpayAccountPicker>
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="回款联系人" prop="payee" label-width="85px">
-                        <PayeePicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5" :placeholder="$t('回款联系人')" v-model="form.payee" :disabled="true" ></PayeePicker>
-                        <PayeePicker v-else :placeholder="$t('回款联系人')" v-model="form.payee"  ></PayeePicker>
-
-                      </el-form-item>
-                    </el-col>
-                    <el-col :span="12">
-                      <el-form-item label="销售联系人" prop="salesmen" label-width="85px">
-                        <SalemanPicker v-if="form.paymentType == 2 || form.paymentType == 4 || form.paymentType == 5"  :placeholder="$t('销售联系人')" v-model="form.salesmen" :disabled="true" ></SalemanPicker>
-                        <SalemanPicker v-else  :placeholder="$t('销售联系人')" v-model="form.salesmen"  ></SalemanPicker>
-
-                      </el-form-item>
-                    </el-col>
-
-                  </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>
-
-    <el-dialog :title="titleSelectAddress" :visible.sync="openSelectAddress" width="60%" :destroy-on-close="true"  v-dialogDrag append-to-body>
-        <AddressSelectPicker0 :addressType="addressType"   @onSelected="onAddressChangeSelect"></AddressSelectPicker0>
-    </el-dialog>
-
-    <el-dialog class="previe_dialog" title="打印预览" :visible.sync="openPdfView" width="80%"  :close-on-click-modal="false"  v-dialogDrag append-to-body>
-      <PdfViewer :pdfUrl="pdfUrl"  width="100%"  @onPrint="handleBatchPrint" ></PdfViewer>
-    </el-dialog>
-
-     <!-- 打印机状态 -->
-     <div style="padding:5px 0px;text-align: right;position: fixed;top: 150px;right: 10px;    z-index: 9999;">
-        <el-tag type="danger" v-if="printerStatus==0">{{ printerStatusMessage }}</el-tag>
-        <el-tag type="success" v-if="printerStatus==1">{{ printerStatusMessage }}</el-tag>
-
-    </div>
-
-</div>
-</template>
-
-<script>
-import { realMatchWaybill } from "@/api/emis/emisElectronicPag";
-import { getWaybillDetail,realSubmitOrder,calcWaybillFee,calcSetteldWeight,calcVolumeWeight} from "@/api/emis/emisWaybill";
-import { parseTime } from "@/utils/custom";
-import { getDestSite } from "@/api/emis/emisDestination";
-
-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 EmisSiteSimplePicker from '@/views/emis/EmisBaseTools/EmisSiteSimplePicker.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';
-// import TownPicker1 from '@/views/emis/EmisBaseTools/TownPicker.vue';
-
-import CountryPicker2 from '@/views/emis/EmisBaseTools/CountryPicker.vue';
-import ProvincePicker2 from '@/views/emis/EmisBaseTools/ProvincePicker.vue';
-import CityPicker2 from '@/views/emis/EmisBaseTools/CityPicker.vue';
-import DistrictPicker2 from '@/views/emis/EmisBaseTools/DistrictPicker.vue';
-// import TownPicker2 from '@/views/emis/EmisBaseTools/TownPicker.vue';
-
-// import CustomerPicker0 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-// import CustomerPicker1 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-// import CustomerPicker2 from '@/views/emis/EmisBaseTools/CustomerPicker.vue';
-
-import GoodsSimplePicker from '@/views/emis/EmisBaseTools/GoodsSimplePicker.vue';
-import GoodsMultiplePicker from '@/views/emis/EmisBaseTools/GoodsMultiplePicker.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';
-import AddressSelectPicker1 from '@/views/emis/EmisBaseTools/AddressSelectPicker.vue';
-import EmisMonthpayAccountPicker from '@/views/emis/EmisBaseTools/EmisMonthpayAccountPicker.vue';
-import WarehouseInNoPicker from '@/views/emis/EmisBaseTools/WarehouseInNoPicker.vue';
-
-import PayeePicker from '@/views/emis/EmisBaseTools/PayeePicker.vue';
-import SalemanPicker from '@/views/emis/EmisBaseTools/SalemanPicker.vue';
-
-import TransProductCasPicker from '@/views/emis/EmisBaseTools/TransProductCasPicker.vue';
-import feeItemForm from './feeItemForm.vue';
-
-import PdfViewer from '@/components/PdfViewer/index.vue';
-import PdfUtils from '@/utils/pdfUtils'
-
-
-export default {
-  name: "WaybillEntry",
-  // props:{
-  //   billCode:{
-  //     type:String
-  //   }
-  // },
-components: {
-  SalemanPicker,
-  PayeePicker,
-  PdfViewer,
-  feeItemForm,
-  TransProductCasPicker,
-  WarehouseInNoPicker,
-  EmisMonthpayAccountPicker,
-  AddressSelectPicker0,
-  AddressSelectPicker1,
-  CustomerAddressSimplePicker0,
-  CustomerAddressSimplePicker1,
-  GoodsSimplePicker,
-  GoodsMultiplePicker,
-  EmisUserSimplePicker0,
-  EmisUserSimplePicker1,
-  EmisUserSimplePicker2,
-  EmisUserSimplePicker3,
-  EmisSiteSimplePicker,
-  DestinationPicker,
-  TransLinePicker,
-  TransProductPicker,
-  CountryPicker0,
-  CountryPicker1,
-  ProvincePicker1,
-  CityPicker1,
-  DistrictPicker1,
-  CountryPicker2,
-  ProvincePicker2,
-  CityPicker2,
-  DistrictPicker2,
-},
-dicts: ['emis_qujian_fangshi','emis_declare_mode','emis_customs_clear',
-        'emis_tab_packing_type','emis_tab_dispatch_mode','emis_payment_type',
-        'emis_calc_fee_type','emis_print_type'],
-data() {
-  return {
-    activeNames:['1','2','3','4'],
-    billCode:null,
-    emisWaybillOptions: [],
-    addressType:null,
-    // 遮罩层
-    loading: true,
-    isNeedSave:false,
-    triggerCount:0,
-    action:null,
-    // 表单参数
-    form: {},
-    timer:null,
-    isNeedCalc:false,
-    titleSelectAddress:'',
-    openSelectAddress:false,
-
-    tanexPrinter:null,
-    printerDownUrl:null,
-    printerStatus:0,
-    printerStatusMessage:'打印组件未连接',
-    printerList:[],
-    printTplList:[],
-    selTplName:null,
-    selPrinterName:null,
-
-    openPdfView:false,
-    pdfUrl:null,
-
-    // 表单校验
-    rules: {
-      billCode: [
-        { required: true, message: "运单号不能为空", trigger: ["blur",'change']  }
-      ],
-      destinationCountry: [
-          { required: true, message: "目的国不能为空",  trigger: ["blur",'change'] }
-      ],
-      reciever:{
-        name: [
-          { required: true, message: "收货人名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "收货人手机号不能为空", trigger: "blur" }
-        ],
-        country: [
-          { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
-        ],
-        province: [
-          { required: true, message: "省不能为空", trigger: ["blur",'change']  }
-        ],
-        company: [
-          { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
-        ],
-        // city: [
-        //   { required: true, message: "市不能为空", trigger: "blur" }
-        // ],
-        // county: [
-        //   { required: true, message: "区不能为空", trigger: "blur" }
-        // ],
-        address: [
-          { required: true, message: "收货地址不能为空", trigger: "blur" }
-        ],
-      },
-      sender:{
-        name: [
-          { required: true, message: "寄件人名不能为空", trigger: "blur" }
-        ],
-        phone: [
-          { required: true, message: "寄件人手机号不能为空", trigger: "blur" }
-        ],
-        country: [
-          { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change']  }
-        ],
-        province: [
-          { required: true, message: "寄件省不能为空", trigger: ["blur",'change']  }
-        ],
-        company: [
-          { required: true, message: "发件公司不能为空", trigger: ["blur",'change']  }
-        ],
-
-        // city: [
-        //   { required: true, message: "寄件市不能为空", trigger: "blur" }
-        // ],
-        // county: [
-        //   { required: true, message: "寄件区不能为空", trigger: "blur" }
-        // ],
-        address: [
-          { required: true, message: "寄件地址不能为空", trigger: "blur" }
-        ],
-      },
-      paymentType: [
-        { required: true, message: "支付方式不能为空", trigger: ["blur",'change']  }
-      ],
-      calcFeeType: [
-        { required: true, message: "计费方式不能为空", trigger: ["blur",'change']  }
-      ],
-      transLine: [
-        { required: true, message: "快递线路不能为空", trigger: ["blur",'change']  }
-      ],
-      productType: [
-        { required: true, message: "快递产品类型不能为空", trigger: ["blur",'change']  }
-      ],
-      customsClear: [
-        { required: true, message: "清关方式不能为空", trigger: ["blur",'change']  }
-      ],
-      customsEclaration: [
-        { required: true, message: "报关方式不能为空", trigger: ["blur",'change']  }
-      ],
-      packType: [
-        { required: true, message: "包装类型不能为空",trigger: ["blur",'change']  }
-      ],
-      dispatchMethod: [
-        { required: true, message: "派件方式不能为空", trigger: ["blur",'change']  }
-      ],
-      pickupMethod: [
-        { required: true, message: "取件方式为空", trigger: ["blur",'change']  }
-      ],
-      goodsInfo: [
-        { required: true, message: "货物描述不能为空", trigger: ["blur",'change']  }
-      ],
-      totalVolume: [
-        { required: true, message: "总体积不能为空", trigger: "blur" }
-      ],
-      parcelQty: [
-        { required: true, message: "件数不能为空", trigger: "blur" }
-      ],
-      billWeight: [
-        { required: true, message: "实际重量不能为空", trigger: "blur" }
-      ],
-      volumeWeight: [
-        { required: true, message: "体积重量不能为空", trigger: "blur" }
-      ],
-      settlementWeight: [
-        { required: true, message: "结算重量不能为空", trigger: "blur" }
-      ],
-      freight: [
-        { required: true, message: "运费不能为空", trigger: "blur" }
-      ],
-      sendSiteCode: [
-        { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
-      ],
-      sendDate: [
-        { required: true, message: "发货时间不能为空", trigger: "blur" }
-      ],
-      dispatchUnderlingSiteCode: [
-        { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
-      ],
-      custNo: [
-        { required: true, message: "月结卡号不能为空", trigger: "blur" }
-      ],
-      payee: [
-        { required: true, message: "销售回款人不能为空", trigger: "blur" }
-      ],
-      salesmen: [
-        { required: true, message: "销售联系人不能为空", trigger: "blur" }
-      ],
-      takePieceEmployeeCode: [
-        { required: true, message: "取件员代码不能为空", trigger: ["blur",'change']  }
-      ],
-      operateEmployeeCode: [
-        { required: true, message: "操作员代码不能为空", trigger: ["blur",'change']  }
-      ],
-    }
-  };
-},
-computed: {
-},
- watch: {
-    "form.parcelQty":{
-      handler (newValue, oldValue) {
-          this.handleGenSubbill();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.billCode":{
-      handler (newValue, oldValue) {
-          this.handleGenSubbill();
-      },
-      immediate: false,
-      deep: true
-    },
-    "form.blGenSubbill":{
-      handler (newValue, oldValue) {
-          this.handleGenSubbill();
-      },
-      immediate: false,
-      deep: true
-    },
-
-},
-
-created() {
-  this.billCode=this.$route.query.billCode;
-  this.action=this.$route.query.action;
-  this.initData();
-  this.initTanexPrinterSdk();
-
-},
-methods: {
-  handleScanInput(){
-    if(this.form.billCode==null || this.form.billCode==''){
-      this.$message.error("输入单号后回车");
-      return;
-    }
-    this.billCode=this.form.billCode;
-    this.initData();
-  },
-  initTanexPrinterSdk(){
-      this.tanexPrinter = this.$tanexPrinter;
-
-      this.getConfigKey("sys.printer.downurl").then(response => {
-        this.printerDownUrl = response.msg;
-      });
-      this.tanexPrinter.init();
-      this.tanexPrinter.setOnOpen(this.onPrinterOpen);
-      this.tanexPrinter.setOnClose(this.onPrinterClose);
-      this.tanexPrinter.setOnError(this.onPrinterError);
-      // this.tanexPrinter.setOnGetPrinter(this.onGetPrinter);
-      // this.tanexPrinter.setOnGetPrintTpl(this.onGetPrintTpl);
-    },
-
-    onPrinterOpen(evt){
-      console.log("onPrinterOpen")
-      this.printerStatus = 1;
-      this.printerStatusMessage="打印组件已连接,可以打印.";
-
-    },
-    onPrinterClose(evt){
-      console.log("onPrinterClose")
-      this.printerStatus = 0;
-      this.printerStatusMessage="打印组件已断开！";
-    },
-    onPrinterError(evt){
-      console.log("onPrinterError")
-      this.printerStatus = 0;
-      this.printerStatusMessage="打印组件已断开！";
-    },
-    handleBatchPrint(){
-      if(this.printerStatus == 1){
-        if(this.form.billCode){
-            // 重要，设置为true才会把右上角X和取消区分开来
-            this.$confirm("确定打印?", "提示", {
-                cancelButtonText: "不打印",
-                confirmButtonText: "确定打印",
-                type: "warning",
-                distinguishCancelAndClose: true,
-                closeOnClickModal: false
-            }).then(() => {
-                // 打印主单，子单
-                let orderList=[];
-                // this.currentSelection.forEach(item=>{
-                //   orderList.push(item.billCode);
-                // });
-                // 打印主单
-                orderList.push(this.form.billCode);
-                let selPrinterName=this.tanexPrinter.getDefaultPrinter();
-                let selTplName="探路速运-主单联（通用）";
-                this.tanexPrinter.batchPrint(selTplName,selPrinterName,orderList)
-
-
-                // 打印子单
-                selTplName="探路速运-子单联（通用）";
-
-                let childOrderList=[]
-                orderList=this.form.billCodeSub.split(',');
-                orderList.forEach(item=>{
-                  if(item!=null && item!=''){
-                    childOrderList.push(item);
-                  }
-                });
-                this.tanexPrinter.batchPrint(selTplName,selPrinterName,childOrderList)
-
-
-            }).catch(() => {});
-        }
-      }
-      else{
-        this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", {
-                cancelButtonText: "返回操作",
-                confirmButtonText: "操作下一单",
-                type: "warning",
-                distinguishCancelAndClose: true,
-                closeOnClickModal: false
-            }).then(() => {
-                this.initData();
-            });
-      }
-
-    },
-    async handlePrintPreview(){
-
-      if(this.printerStatus == 1){
-        if(this.form.billCode){
-            let pdfUrlList=[];
-            let selPrinterName=this.tanexPrinter.getDefaultPrinter();
-            let selTplName="探路速运-主单联（通用）";
-            let url=this.tanexPrinter.getPdfUrl(this.form.billCode,selTplName,selPrinterName);
-            pdfUrlList.push(url)
-            // 子单url
-            if(this.form.billCodeSub){
-              selTplName="探路速运-子单联（通用）";
-              let orderList=this.form.billCodeSub.split(',');
-              orderList.forEach(item=>{
-                  if(item!=null && item!=''){
-                    let url=this.tanexPrinter.getPdfUrl(item,selTplName,selPrinterName);
-                    pdfUrlList.push(url)
-                  }
-              });
-            }
-            let pdfUtils=new PdfUtils({});
-            const loadingInstance = this.$loading({
-                  text: '正在生成预览...'
-            })
-            pdfUtils.mergePdf2(pdfUrlList, (new Date()).getTime()+".pdf" )
-            .then(url=>{
-              loadingInstance.close();
-              this.pdfUrl=url;
-              this.openPdfView = true;
-            })
-            .catch(error => {
-            });
-        }
-      }
-      else{
-        this.$confirm("打印组件未连接，可【返回操作】稍后打印，或【操作下一单】", "提示", {
-                cancelButtonText: "返回操作",
-                confirmButtonText: "操作下一单",
-                type: "warning",
-                distinguishCancelAndClose: true,
-                closeOnClickModal: false
-            }).then(() => {
-               this.initData();
-            });
-      }
-
-  },
-  onDestCountryChange(item){
-    this.form.reciever.country=item.code;
-  },
-  onSelectMonthUser(item){
-    console.log(item);
-    this.form.payee=item.payee;
-    this.form.salesmen=item.salesmen;
-  },
-  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(() => {
-    })
-
-  },
-
-  lpadZero(val,len) {
-    return (new Array(len + 1).join('0') + val).slice(-len);
-  },
-  handleGenSubbill(){
-    if(this.form.blGenSubbill==1 && this.form.parcelQty > 0 && this.form.billCode){
-        let billSubCodeStr="";
-        for(let i=1;i<=this.form.parcelQty&&i<50;i++){
-          let subBillCode = this.form.billCode+""+this.lpadZero(i,4);
-          billSubCodeStr=billSubCodeStr+subBillCode+","
-        }
-        this.form.billCodeSub=billSubCodeStr;
-    }else{
-      this.form.billCodeSub=null;
-    }
-
-  },
-  openCollapse(index){
-
-  },
-  initData() {
-      this.reset();
-
-      // 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;
-          this.form.printTypeCheckList=[1,5]
-          this.form.destinationCountry=this.form.reciever.country;
-
-        });
-      }else{
-
-        this.form.sendDate =  parseTime(new Date());
-        this.form.sendSiteCode=this.$store.getters.ownerSiteCode;
-        this.form.sendSiteName=this.$store.getters.ownerSiteName;
-
-
-        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=1;
-        this.form.paymentType='1';
-        this.form.calcFeeType='1';
-        this.form.blMessage='1'
-        this.form.blAcceptMessage='1'
-        this.isNeedSave=true;
-        this.form.printTypeCheckList=[1,5],
-
-        this.handleInitGenGoods();
-      }
-
-
-  },
-  beforeDestroy() {
-    clearInterval(this.timer);
-  },
-  // 取消按钮
-  cancel() {
-    this.reset();
-    this.$emit("on-cancel");
-  },
-
-  // 表单重置
-  reset() {
-    this.form = {
-      id:null,
-      reciever: {
-          country: null,
-          name: null,
-          phone:null,
-          province: null,
-          city: null,
-          district: null,
-          town: null,
-          address: null,
-          postCode: null,
-          email: null,
-          company: null,
-      },
-      sender: {
-          country: null,
-          name: null,
-          phone:null,
-          province: null,
-          city: null,
-          district: null,
-          town: null,
-          address: null,
-          postCode: null,
-          email: null,
-          company: null,
-      },
-      feeItems: [],
-      cargoList: [],
-      attachmentList: [],
-      printTypeCheckList:[],
-      billCode: null,
-      orderDate:  null,
-      openId: null,
-      customerCode: null,
-      paymentType: null,
-      calcFeeType: '1',
-      custNo:  null,
-      productTypeSelArr: null,
-      transLine:  null,
-      productType: null,
-      customsClear: null,
-      customsEclaration: null,
-      packType: null,
-      dispatchMethod: "1",
-      pickupMethod: null,
-      pickStartDate: null,
-      pickFinishDate: null,
-      intoWarehouseCode: null,
-      intoWarehouseName: null,
-      intoWarehouseAddress: null,
-      intoWarehouseContact: null,
-      intoWarehousePhone:  null,
-      intoWarehouseBillCode: null,
-      customerDeliveryBeginTime: null,
-      goodsType:null,
-      goodsInfo: null,
-      length:null,
-      width:null,
-      height:null,
-      totalWeight: null,
-      totalVolume: null,
-      parcelQty: null,
-      billWeight: null,
-      volumeWeight: null,
-      settlementWeight: null,
-      feeWeight: null,
-      freight: null,
-      blOverLong: null,
-      blOverWeight: null,
-      overWeightNumber: null,
-      feeRemaker: null,
-      realValue: null,
-      takePieceEmployeeCode: null,
-      sendSiteCode: null,
-      sendSiteName: null,
-      destinationCountry:  null,
-      destinationCode:  null,
-      dispatchUnderlingSiteCode: null,
-      destinationCenterCode: null,
-      marketManCode: null,
-      payee: null,
-      salesmen: null,
-      operateEmployeeCode: null,
-      blMessage: null,
-      blAcceptMessage: null,
-      meterType:null,
-      blGenSubbill:null,
-      billCodeSub:null,
-      blSpecialQuote:null,
-      blSensitive:null,
-  };
-    this.resetForm("form");
-  },
-  onProductChange(item){
-    this.form.transLine=item[0];
-    this.form.productType=item[1];
-  },
-  onSendSiteSelect(item){
-    if(!item){
-      this.form.sendSiteCode = null;
-      this.form.sendSiteName = null;
-      return;
-    }
-    this.form.sendSiteCode=item.siteCode;
-    this.form.sendSiteName=item.siteName;
-  },
-  /** 提交按钮 */
-  submitForm() {
-    this.$refs["form"].validate(valid => {
-      if (valid) {
-
-        if(this.form.destinationCountry!=this.form.reciever.country){
-          this.$modal.msgError("收件国和目的国不一致");
-          return ;
-        }
-
-        realSubmitOrder(this.form).then(response => {
-            this.$modal.msgSuccess("下单成功");
-
-            // 弹出打印预览界面
-            this.handlePrintPreview();
-
-            // this.$emit("on-changed");
-        });
-      }
-    });
-  },
-   // 弹出地址簿选择
-   handleSelectCustomerAddress(addressType){
-       this.addressType = addressType;
-       this.titleSelectAddress = this.addressType==1? this.$t('选择寄件人'):this.$t('选择收件人');
-       this.openSelectAddress = true;
-  },
-  // 地址薄选择后返回
-  onAddressChangeSelect(item){
-    if(this.addressType == 1){
-      this.onChangeSelectSender(item);
-    }else{
-      this.onChangeSelectReceiver(item);
-    }
-    this.openSelectAddress = false;
-
-  },
-  onChangeSelectSender(value){
-    this.form.sender.name=value.name;
-    this.form.sender.phone=value.phone;
-    this.form.sender.country=value.country;
-    this.form.sender.province=value.province;
-    this.form.sender.city=value.city;
-    this.form.sender.county=value.district;
-    // this.form.receiveTown=value.town;
-    this.form.sender.address=value.address;
-    this.form.sender.company=value.company;
-  },
-  onChangeSelectReceiver(value){
-    this.form.reciever.name=value.name;
-    this.form.reciever.phone=value.phone;
-    this.form.reciever.country=value.country;
-    this.form.reciever.province=value.province;
-    this.form.reciever.city=value.city;
-    this.form.reciever.county=value.district;
-    // this.form.receiveTown=value.town;
-    this.form.reciever.address=value.address;
-    this.form.reciever.company=value.company;
-
-  },
-  // 计算目的站点
-  handleCalcDestSite(){
-    // 初始化不计算
-    // if(!this.isNeedSave){
-    //   return;
-    // }
-    console.log("1111=>"+this.form.reciever.province)
-    let queryParams = {
-            province:this.form.reciever.province
-    };
-
-    if(this.form.reciever.province){
-        getDestSite(queryParams).then(response => {
-          console.log(response);
-          this.form.destinationCode = response.data.destCode+'';
-          this.form.dispatchUnderlingSiteCode= response.data.siteCode;
-          this.form.dispatchSiteCode= response.data.siteCode;
-
-          this.form.dispatchUnderlingSite= response.data.siteName;
-          this.form.dispatchSite= response.data.siteName;
-
-        });
-    }
-  },
-  handleCalcVolume(row){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    if(row!=null){
-      let singleVolume=parseFloat(row.length)*parseFloat(row.width)*parseFloat(row.height);
-      let singleTotalVolume=singleVolume*parseFloat(row.cargoQty);
-      row.volume=parseFloat( (singleTotalVolume/1000000).toFixed(5) );
-    }
-
-    let totalVolume=0.0;
-    this.form.cargoList.forEach(item=>{
-        totalVolume=totalVolume+item.volume;
-    });
-
-    this.form.totalVolume = parseFloat(totalVolume.toFixed(5));
-
-    this.handleCalcVolumeWeight();
-
-  },
-
-  handleCalcFeeItem(row){
-
-    if(row!=null){
-
-      if(row.calcExp){
-        let expr="s+w*d";
-        expr=expr.replace("s",row.initialWeightFee);
-        expr=expr.replace("d",row.addWeightPrice);
-        expr=expr.replace("w",this.form.settlementWeight);
-        row.realFee=parseFloat(eval(expr)).toFixed(2);
-      }
-    }
-
-    let totalFee=0;
-    this.form.feeItems.forEach(item=>{
-      totalFee=totalFee+parseInt(item.realFee);
-    });
-    this.form.freight = totalFee;
-  },
-  // 计算体积重量
-  handleCalcVolumeWeight(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    if( this.form.totalVolume
-        && this.form.productType
-      ){
-        let postData={
-            productType: this.form.productType,
-            totalVolume: this.form.totalVolume,
-        }
-
-        calcVolumeWeight(postData).then(response => {
-              this.form.volumeWeight = response.data.volumeWeight;
-
-              // 计算结算重量
-              this.handleCalcSettlementWeight();
-        });
-      }
-
-  },
-   // 计算结算重量
-  handleCalcSettlementWeight(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-      if(this.form.billWeight
-        && this.form.volumeWeight
-        && this.form.productType
-      ){
-        // setTimeout(()=>{
-        // },1000);
-
-        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 ;
-
-              // 计算费用
-              this.calcBillFee();
-        });
-      }
-
-  },
-  calcBillFee(){
-    // 初始化不计算
-    if(!this.isNeedSave){
-      return;
-    }
-
-    if(this.form.settlementWeight
-        && this.form.productType
-        && this.form.sendSiteCode
-        && this.form.dispatchUnderlingSiteCode
-        && this.form.calcFeeType
-      ){
-        let postData={
-          productType: this.form.productType,
-          customerCode: this.form.customerCode,
-          custNo: this.form.custNo,
-          calcFeeType: this.form.calcFeeType,
-          settlementWeight: this.form.settlementWeight,
-          sendSiteCode: this.form.sendSiteCode,
-          dispatchUnderlingSiteCode: this.form.dispatchUnderlingSiteCode,
-        }
-
-        calcWaybillFee(postData).then(response => {
-              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();
-        });
-      }
-  },
-  onDestinationChange(item){
-    // this.form.destinationCode = item.destCode;
-    this.form.dispatchUnderlingSiteCode= item.siteCode;
-    this.form.dispatchSiteCode= item.siteCode;
-
-    this.form.dispatchUnderlingSite= item.siteName;
-    this.form.dispatchSite= item.siteName;
-  },
-  onGoodsChange(goodsList,selNameStr){
-    this.form.goodsInfo = selNameStr;
-  },
-
-  handleInitGenGoods(){
-    if(this.form.parcelQty>0){
-
-      let currentParcelQty = 0;
-      if(!this.form.cargoList){
-        this.form.cargoList=[];
-      }
-
-      this.form.cargoList.forEach(item=>{
-        currentParcelQty = currentParcelQty+parseInt(item.cargoQty);
-      });
-
-      // 新件数大于
-      if(this.form.parcelQty>currentParcelQty){
-        let len=this.form.parcelQty-currentParcelQty;
-        if(this.form.parcelQty>20){
-          let cargo={
-              "goodsCode": "",
-              "goodsName": "",
-              "cargoQty": len,
-              "length": 0,
-              "width": 0,
-              "height": 0,
-              "volume": 0,
-            }
-            this.form.cargoList.push(cargo);
-        }
-        else{
-          for(let i=0;i<len;i++){
-            let cargo={
-              "goodsCode": "",
-              "goodsName": "",
-              "cargoQty": 1,
-              "length": 0,
-              "width": 0,
-              "height": 0,
-              "volume": 0,
-            }
-            this.form.cargoList.push(cargo);
-          }
-       }
-      }
-      else{
-        let newList=[];
-        let incQty=0;
-        let zeroItem=null;
-        for(let i=0;i<this.form.cargoList.length;i++){
-            let item=this.form.cargoList[i];
-            // 忽略未填写体积的数据
-            if(item.length==0&&item.width==0&&item.height==0){
-                zeroItem=item;
-                zeroItem.cargoQty=1;
-                continue;
-            }
-
-            if((incQty+parseInt(item.cargoQty))<this.form.parcelQty){
-                incQty = incQty+parseInt(item.cargoQty);
-                newList.push(item)
-            }else{
-                item.cargoQty=this.form.parcelQty-incQty;
-                newList.push(item)
-                incQty = incQty+parseInt(item.cargoQty);
-                break;
-            }
-        }
-        // 补足数量
-        let bzLen=this.form.parcelQty-incQty;
-        for(let i=0;i<bzLen;i++){
-          let newItem=Object.assign({},zeroItem);
-          newList.push(newItem);
-        }
-
-        this.form.cargoList=newList;
-      }
-    }else{
-      this.form.cargoList=[];
-    }
-  },
-  handleCargoQtyChange(row){
-
-    this.handleInitGenGoods();
-    this.handleCalcVolume(row);
-  },
-  deleteGoodsItem(row,index){
-    this.$confirm('确定删除?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-    }).then(() => {
-      // let newList = this.form.cargoList.filter(item => item.goodsName !== row.goodsName);
-      // this.form.cargoList=newList;
-      console.log(index);
-      this.form.cargoList.splice(index,1)
-      this.handleCalcVolume(row);
-    }).catch(() => {
-    })
-  },
-  copyGoodsItem(row,index){
-      let newItem = Object.assign({},row);
-      newItem.cargoQty=1;
-      this.form.cargoList.splice(index+1, 0, newItem);
-      // this.form.cargoList.push(newItem);
-      handleCargoQtyChange();
-  },
-  showLocalTime(){
-
-  },
-  /** 鼠标移入cell */
-  handleGoodsCellEnter (row, column, cell, event) {
-    row.isEdit = true
-  },
-  /** 鼠标移出cell */
-  handleGoodsCellLeave (row, column, cell, event) {
-    row.isEdit = false
-  },
-  // 实时获取运单号
-  handleBillCodeChange(checked,item){
-    if(checked){
-      realMatchWaybill().then(response => {
-          this.form.billCode=response.data;
-      });
-    }else{
-      this.form.billCode=""
-    }
-  },
-}
-};
-</script>
-
-<style lang="scss">
-
-.el-form-item__label {
-    color: #000;
-}
-
-.el-input-group__append {
-    padding: 0 4px;
-}
-
-.el-row{
-      display:flex;
-      flex-wrap: wrap;
-      // padding-right: 10px;
- }
-
-.el-form-item__label {
-  font-size: 12px!important;
-}
-
-
- .platform-auto-complete {
-  .el-autocomplete-suggestion__wrap {
-    padding: 5px 0;
-    ul li {
-      pointer-events: none; // 阻止可点击事件
-      .default {
-        text-align: center;
-        color: #999;
-      }
-      &:hover {
-        background-color: #fff;
-      }
-    }
-  }
-}
-
-.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/sendWaybillList.vue b/src/views/emis/emisWaybill/sendWaybillList.vue
index 8323c979..753a2dc1 100644
--- a/src/views/emis/emisWaybill/sendWaybillList.vue
+++ b/src/views/emis/emisWaybill/sendWaybillList.vue
@@ -484,7 +484,7 @@ import ProblemTypePicker from '@/views/emis/EmisBaseTools/ProblemTypePicker.vue'
 import {dateToStr} from '@/utils/custom'
 
 export default {
-  name: "WaybillIsPrinted",
+  name: "SendWaybillList",
   components: {
     elDateAdvPicker,emisWaybillForm,
     CountryPicker1,