From 7b6505c09867930c448b1cef231ab02723ff5685 Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 7 Aug 2024 08:27:23 +0800
Subject: [PATCH] md

---
 src/components/XdPageContainer/index.vue      |  2 +-
 src/components/XdTable/index.vue              | 58 ++++++++++++++-----
 .../ProblemTypeMultiplePicker.vue             |  1 -
 .../EmisBaseTools/TransProductCasPicker.vue   |  1 -
 .../TransProductMultiplePicker.vue            |  1 -
 .../SubBillConfirmByMonthList.vue             |  3 +-
 .../SubBillConfirmBySiteList.vue              |  3 +-
 .../emisWaybillTransfer/waybillTransfer.vue   | 11 +---
 8 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/src/components/XdPageContainer/index.vue b/src/components/XdPageContainer/index.vue
index fcdb2e35..e899a745 100644
--- a/src/components/XdPageContainer/index.vue
+++ b/src/components/XdPageContainer/index.vue
@@ -43,7 +43,7 @@ export default {
       let h2 = this.$refs.pageHeader.offsetHeight;
       let contentHeight = h1 - h2-190;
       this.contentHeight = contentHeight;
-      console.log("====this.contentHeight==>",this.contentHeight);
+      // console.log("====this.contentHeight==>",this.contentHeight);
     }, 500),
   },
 };
diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index b2113992..3f335bc1 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="xd-table" :id="tableId">
+  <div class="xd-table" :id="tableId"  >
 
     <div class="table-operate-btn-content" v-show="showOperateButton">
       <slot name="operateBtnContent">
@@ -94,8 +94,8 @@
         </div>
       </slot>
     </div>
-    <div>
-      <orig-table ref="table" :key="refreshKeyId" :config="config" v-dragColumn v-dragSelect class="xd-tb-wrapper" />
+    <div @mouseenter="initKeyDownEvent" @mouseleave="removeKeyDownEvent">
+      <orig-table ref="table" :key="refreshKeyId" tabindex="0" :config="config" v-dragColumn v-dragSelect class="xd-tb-wrapper" />
       <!-- 统计数据 -->
 
       <div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
@@ -563,7 +563,18 @@ export default {
           })
 
         }
-    }
+      },
+      focus:{
+        update: function (el, binding, vnode) {
+          vnode.context.initKeyDownEvent();
+        },
+      },
+      blur:{
+        update: function (el, binding, vnode) {
+          vnode.context.removeKeyDownEvent();
+        },
+      },
+
   },
   data() {
     return {
@@ -622,6 +633,8 @@ export default {
       checkAll: false, //招标阶段 是否全选
       isIndeterminate: false, //全选复选框标识
 
+      copyHanderEvent:null,
+
       // 表格个性化记忆配置
       isNeedDbSaveTpl:false,
       fullUrl:null,
@@ -666,8 +679,22 @@ export default {
     this.initStorage()
     this.updateTable()
     this.initSort();
-    this.initKeyDown();
+    // this.initKeyDown();
     this.tableDom=this.getTableDom();
+
+     // 监听 ctrl+c键盘事件
+     let that=this;
+     this.copyHanderEvent = (e) => {
+      // console.log('键盘监听中')
+      e = e||window.event;
+      if(e.ctrlKey&&e.code=="KeyC"){
+        that.handleCopySelect(e);
+        return false;
+      }
+     }
+  },
+  beforeDestroy () {
+    document.removeEventListener('keydown', this.copyHanderEvent)
   },
   methods: {
       getInstance() {
@@ -684,15 +711,14 @@ export default {
           this.$refs.table.$refs.elTable.clearSelection();
         });
       },
-      initKeyDown(){
-        let that=this;
-        document.addEventListener('keydown', function(e) {
-          e = e||window.event;
-          if(e.ctrlKey&&e.code=="KeyC"){
-            that.handleCopySelect(e);
-            return false;
-          }
-        });
+
+      initKeyDownEvent(){
+        // console.log('===initKeyDownEvent===>')
+        document.addEventListener('keydown', this.copyHanderEvent );
+      },
+      removeKeyDownEvent(){
+        // console.log('===removeKeyDownEvent===>')
+        document.removeEventListener('keydown', this.copyHanderEvent );
       },
       onTplSelectInputBlur(e) {
         if (e.target.value.trim()!== '') {
@@ -1213,7 +1239,7 @@ export default {
         }
       }
       list=list2;
-      console.log("===>list=1111=>",list);
+      // console.log("===>list=1111=>",list);
 
       this.storageList = list
     },
@@ -1357,7 +1383,7 @@ export default {
 }
 
 .xd-tb-wrapper :deep .el-table__body tr:hover > td {
-     background-color: #ffa5a55e !important;
+     background-color: #ffa5a55e;
  }
 
 .xd-tb-wrapper{
diff --git a/src/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue b/src/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue
index e6b5c985..5b3a9a43 100644
--- a/src/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue
+++ b/src/views/emis/EmisBaseTools/ProblemTypeMultiplePicker.vue
@@ -121,7 +121,6 @@
       },
       queryData() {
 
-        console.log("=====>this.value===",this.value);
 
         let queryParams = {
           pageNum: 1,
diff --git a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
index 1aee5fff..210813f0 100644
--- a/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductCasPicker.vue
@@ -119,7 +119,6 @@ watch: {
     }
 },
 created() {
-  console.log("=======created=>"+this.svalue)
   if(this.svalue!=null && this.svalue.length==2 && this.isInit) {
     this.lineCode=this.svalue[0];
     this.prodCode=this.svalue[1];
diff --git a/src/views/emis/EmisBaseTools/TransProductMultiplePicker.vue b/src/views/emis/EmisBaseTools/TransProductMultiplePicker.vue
index 4eab282d..e5651b30 100644
--- a/src/views/emis/EmisBaseTools/TransProductMultiplePicker.vue
+++ b/src/views/emis/EmisBaseTools/TransProductMultiplePicker.vue
@@ -124,7 +124,6 @@
       },
       queryData() {
 
-        console.log("=====>this.value===",this.value);
 
         if(!this.transLineCode ){
 
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
index 208e0055..b6bc20c2 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmByMonthList.vue
@@ -434,8 +434,7 @@ import { parseTime,genJsSeqNo } from "@/utils/custom";
 
 
 export default {
- name: "SubBillConfirmByMoneyList",
- // name: "SubBillConfirmByMonthList",
+ name: "SettleSubBillConfirmMonthList",
  components: {
   BillFeeListPanel,
    elDateSimplePicker,emisSettleSubBillForm,
diff --git a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
index b834cfc2..ac691560 100644
--- a/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
+++ b/src/views/emis/emisSettleSubBill/SubBillConfirmBySiteList.vue
@@ -395,8 +395,7 @@ import BillFeeListPanel from '@/views/emis/emisSettleSubBill/panel/BillFeeListPa
 import { parseTime,genJsSeqNo } from "@/utils/custom";
 
 export default {
- name: "SubBillConfirmByMoneyList",
- // name: "SubBillConfirmByMonthList",
+ name: "SubBillConfirmBySiteList",
  components: {
    elDateSimplePicker,emisSettleSubBillForm,BillFeeListPanel,
    EmisMonthpayAccountPicker,
diff --git a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
index f2f92809..b8517355 100644
--- a/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
+++ b/src/views/emis/emisWaybillTransfer/waybillTransfer.vue
@@ -94,19 +94,12 @@
               @click="handleDelete"
             >删除</el-button>
           </el-col>
-          <el-col :span="1.5">
-            <!-- <el-button
-              type="primary"
-              plain
-              size="mini"
-              @click="handleImport"
-            >导入</el-button> -->
+          <!-- <el-col :span="1.5">
             <el-button plain class="filter-item" size="mini"  type="primary" icon="el-icon-upload2" @click="handleBatchImport">导入</el-button>
           </el-col>
           <el-col :span="1.5">
             <a href="/static/tpl/转件管理导出模板.xlsx"  style="color: blue;font-weight: 600;font-size:13px;text-decoration: underline">下载导入模版</a>
-
-          </el-col>
+          </el-col> -->
         </el-row>
       </div>