diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index a98db207..1afab844 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -547,16 +547,7 @@ export default {
 
         }
       },
-      focus:{
-        update: function (el, binding, vnode) {
-          vnode.context.initKeyDownEvent();
-        },
-      },
-      blur:{
-        update: function (el, binding, vnode) {
-          vnode.context.removeKeyDownEvent();
-        },
-      },
+
 
   },
   data() {
@@ -1234,10 +1225,10 @@ export default {
         if (item.show) {
           const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.prop === item.prop)
           if (node) {
-            let nodeItem=node.componentOptions.propsData;
-            if(item.label != nodeItem.label){
-              item.label=nodeItem.label;
-            }
+            // let nodeItem=node.componentOptions.propsData;
+            // if(item.label != nodeItem.label){
+            //   item.label=nodeItem.label;
+            // }
             node.componentOptions.propsData.fixed = item.fixed
             childrenNodes.push(node)
           }
diff --git a/src/utils/TanexPrinterSdk.js b/src/utils/TanexPrinterSdk.js
index 526fda0b..a0bae961 100644
--- a/src/utils/TanexPrinterSdk.js
+++ b/src/utils/TanexPrinterSdk.js
@@ -448,7 +448,7 @@ class TanexPrinterSdk {
           };
 
           this.ws.onmessage = e => {
-            // console.log('ws onmessage:' + e.data)
+            console.log('ws onmessage:' + e.data)
             if (e.data.charAt(0) === "{") {
                 var msg = this.jsonToObj(e.data);
                 if(msg["CMD"]=='printerIsRead'){
@@ -627,7 +627,7 @@ class TanexPrinterSdk {
 
     // 发送数据的方法
     send(data) {
-        // console.log("send:"+data)
+        console.log("send:"+data)
         if (this.getWSReadyState()  === this.WS_OPEN ) {
             this.sendRetryCount = 0
             this.ws.send(data)
diff --git a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
index 0b8bf0ff..c2d9b9b3 100644
--- a/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
+++ b/src/views/emis/EmisBaseTools/TanexPrinterPanel.vue
@@ -239,6 +239,9 @@
       getDefaultPrinter(){
           return this.tanexPrinter.getDefaultPrinter();
       },
+      getSelectPrinter(){
+          return this.selPrinterName;
+      },
       refreshPrintTpl(){
         this.printTplList=[];
         this.selTplCode=null;
@@ -344,7 +347,7 @@
         })
 
         let orderSeqMap = new Map();
-        // console.log("printPreviewAdv===>",printDataList);
+        console.log("printPreviewAdv===>",printDataList);
 
 
         let j=0;
@@ -392,7 +395,7 @@
               }
               else if(code == 800){
                 // 全部获取完成
-                // console.log("===全部获取完成ADV====>");
+                console.log("===全部获取完成ADV====>");
                 that.pdfList.sort((one, two) => {
                       let v=one.seqNo-two.seqNo;
                       if(one.seqNo==two.seqNo){
diff --git a/src/views/emis/emisSite/index.vue b/src/views/emis/emisSite/index.vue
index 6f5eb5bd..b0cd0d0f 100644
--- a/src/views/emis/emisSite/index.vue
+++ b/src/views/emis/emisSite/index.vue
@@ -269,7 +269,7 @@ import EmisBrandPicker from '@/views/emis/EmisBaseTools/EmisBrandPicker.vue';
 
 // EmisSiteTreePicker
 export default {
-  name: "emisSite",
+  name: "EmisSite",
   components: {
     emisSiteForm,CountryTreePicker,CountryPicker,EmisBrandPicker,
     EmisSiteSimplePicker,ProvincePicker,CityPicker,DistrictPicker
diff --git a/src/views/emis/emisUser/index.vue b/src/views/emis/emisUser/index.vue
index b88add15..c407d962 100644
--- a/src/views/emis/emisUser/index.vue
+++ b/src/views/emis/emisUser/index.vue
@@ -315,7 +315,7 @@ import CountryTreePicker from '@/views/emis/EmisBaseTools/CountryTreePicker.vue'
 
 
 export default {
-  name: "User",
+  name: "EmisUser",
   dicts: ['sys_normal_disable', 'sys_user_sex','emis_site_type','sys_biz_enable_status'],
   components: { DeptmentTreePicker,CountryTreePicker,Treeselect,SysUserForm,EmisSiteSimplePicker,EmisSiteLeftTreePicker,CountryPicker },
   data() {
diff --git a/src/views/emis/emisWaybill/waybillIsPrinted.vue b/src/views/emis/emisWaybill/waybillIsPrinted.vue
index 45c76648..57a77634 100644
--- a/src/views/emis/emisWaybill/waybillIsPrinted.vue
+++ b/src/views/emis/emisWaybill/waybillIsPrinted.vue
@@ -350,7 +350,7 @@ export default {
       // 查询参数
       queryParams: {
         pageNum: 1,
-        pageSize: 20,
+        pageSize: 100,
         orderSn: null,
         billCode: null,
         billCodeSub: null,
diff --git a/src/views/emis/emisWaybill/waybillRecord.vue b/src/views/emis/emisWaybill/waybillRecord.vue
index e99655d8..e71480f5 100644
--- a/src/views/emis/emisWaybill/waybillRecord.vue
+++ b/src/views/emis/emisWaybill/waybillRecord.vue
@@ -1125,7 +1125,7 @@ methods: {
                 // // 客户联
                 //   let customerItem ={
                 //   "tplCode":"TAN-CM-130",
-                //   "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+                //   "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
                 //   "orderList":orderList.toString()
                 // }
                 // printDataList.push(customerItem);
@@ -1133,7 +1133,7 @@ methods: {
                 // 主单
                 let mainBillItem ={
                   "tplCode":"TAN-GM-130",
-                  "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+                  "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
                   "orderList":orderList.toString()
                 }
                 printDataList.push(mainBillItem);
@@ -1156,7 +1156,7 @@ methods: {
 
                 let subBillItem ={
                   "tplCode":"TAN-GC-130",
-                  "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+                  "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
                   "orderList":childOrderList.toString()
                 }
                 printDataList.push(subBillItem);
@@ -1199,7 +1199,7 @@ methods: {
            // 客户联
            let customerItem ={
               "tplCode":"TAN-CM-130",
-              "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+              "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
               "orderList":orderList.toString()
             }
             printDataList.push(customerItem);
@@ -1207,7 +1207,7 @@ methods: {
             // 主单
             let mainBillItem ={
               "tplCode":"TAN-GM-130",
-              "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+              "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
               "orderList":orderList.toString()
             }
             printDataList.push(mainBillItem);
@@ -1234,7 +1234,7 @@ methods: {
             if(childOrderList&&childOrderList.length>0){
               let subBillItem ={
                 "tplCode":"TAN-GC-130",
-                "printerName":this.$refs.tanexPrinter.getDefaultPrinter(),
+                "printerName":this.$refs.tanexPrinter.getSelectPrinter(),
                 "orderList":childOrderList.toString()
               }
               printDataList.push(subBillItem);