From dfa78d680bbb49976ef620ac4315749d9ab7221e Mon Sep 17 00:00:00 2001
From: linfso <linfso@sina.com>
Date: Wed, 6 Nov 2024 16:37:50 +0800
Subject: [PATCH] md

---
 package.json                                  |   1 +
 src/components/XdTable/index.vue              | 757 ++++++++++++------
 src/layout/components/Navbar.vue              |   7 +-
 src/permission.js                             |   2 +-
 src/router/index.js                           |   8 +
 src/store/getters.js                          |   2 +-
 src/store/modules/user.js                     |   7 +
 src/views/oms/emisWaybill/OrderRecord.vue     |  55 +-
 .../oms/emisWaybill/SendOrderbillList.vue     |   7 +-
 src/views/openpage/queryTraceInfo.vue         |   2 +-
 10 files changed, 573 insertions(+), 275 deletions(-)

diff --git a/package.json b/package.json
index fe0ded7..7534c6d 100644
--- a/package.json
+++ b/package.json
@@ -47,6 +47,7 @@
     "dayjs": "^1.11.10",
     "default-passive-events": "^2.0.0",
     "echarts": "4.9.0",
+    "el-table-virtual-scroll": "^2.0.1",
     "element-china-area-data": "^6.1.0",
     "element-ui": "2.15.6",
     "exceljs": "^4.3.0",
diff --git a/src/components/XdTable/index.vue b/src/components/XdTable/index.vue
index 840e4e5..10c99ba 100644
--- a/src/components/XdTable/index.vue
+++ b/src/components/XdTable/index.vue
@@ -1,8 +1,7 @@
 <template>
-  <div class="xd-table" :id="tableId">
+  <div class="xd-table full-block flex-layout" :id="tableId"  >
 
     <div class="table-operate-btn-content" v-show="showOperateButton">
-      <!-- toolbar -->
       <slot name="operateBtnContent">
         <div class="operate-btn-content">
           <slot name="toolbar">
@@ -35,8 +34,7 @@
                 >
                   <div class="setting-row-content">
                     <div style="text-align:right;display: inline-flex;width:240px;border-bottom: 1px solid #d5d4d438;padding: 0px 0px 10px 0px;">
-                      <!-- <el-button @click="delAllStorage">恢复系统表格设置</el-button>
-                      <el-button @click="delStorage">恢复当前表格设置</el-button> -->
+
                       <div style="text-align: left;width: 55%;">
                         <el-select
                             v-model="curentTbShowTpl"
@@ -49,7 +47,7 @@
                             @blur="onTplSelectInputBlur($event)"
                             :style="{width: '100%'}"
                             @change="changeTbShowTpl"
-                            :disabled="!showCustomizeTpl"
+                            :disabled="!isNeedDbSaveTpl"
                          >
                             <el-option
                               v-for="(item, index) in storeTplList"
@@ -58,18 +56,18 @@
                               :value="item.tplCode"
                             />
                          </el-select>
-                        <!-- <el-button type="text" size="mini" plain  @click="changeTbShowTpl" >切换模版</el-button> -->
                       </div>
-                      <!-- <div style="text-align: right;width: 50%;">
-                        <el-button type="text" size="mini" plain  @click="delAllStorage" >重置</el-button>
-                      </div> -->
+
                       <div style="text-align: right;width: 45%;line-height: 30px;display:inline-flex">
-                        <el-button type="text" size="mini" style="padding: 7px 5px;"  @click="savaTbShowTpl" :disabled="!showCustomizeTpl">保存</el-button>
-                        <el-button type="text" size="mini" style="padding: 7px 5px;" icon="el-icon-refresh" @click="delStorage"  ></el-button>
+                        <el-button type="text" size="mini" style="padding: 7px 5px;"  @click="savaTbShowTpl" :disabled="!isNeedDbSaveTpl">保存</el-button>
+                        <!-- <el-button type="text" size="mini" style="padding: 7px 5px;" icon="el-icon-refresh" @click="delStorage"  ></el-button> -->
                         <el-button type="text" size="mini" style="padding: 7px 5px;" icon="el-icon-setting"  @click="setTbShowTpl" :disabled="!isNeedDbSaveTpl"></el-button>
                       </div>
                     </div>
                     <div style="">
+                      <div style="width:50%">
+                            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
+                          </div>
                       <el-scrollbar style="height: calc(100vh - 200px);box-sizing: border-box;" >
                         <draggable v-model="storageList"
                             ghostClass="drag-ghost"
@@ -78,31 +76,17 @@
                             handle=".el-icon-s-operation"
                             @end="updateTable"
                           >
-                          <div style="width:50%">
-                            <el-checkbox :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全选</el-checkbox>
-                          </div>
+
                           <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="col.show" class="label" @change="showOrHidden($event,col)">{{ col.label }}</el-checkbox>
-                            <!-- <el-button
-                              size="mini"
-                              class="btn icon iconfont icon-fixed-left"
-                              :type="col.fixed === 'left' ? 'primary' : 'default'"
-                              @click="setFixed('left',col)"
-                            ></el-button>
-                            <el-button
-                              class="btn icon iconfont icon-fixed-right"
-                              size="mini"
-                              :type="col.fixed === 'right' ? 'primary' : 'default'"
-                              @click="setFixed('right',col)"
-                            ></el-button> -->
+
                           </div>
                         </draggable>
                       </el-scrollbar>
                     </div>
                   </div>
-                  <el-button v-if="showCustomizeTpl" style="margin-left: 10px;" slot="reference" size="mini" circle icon="el-icon-menu" />
+                  <el-button style="margin-left: 10px;" slot="reference" size="mini" circle icon="el-icon-menu" />
                 </el-popover>
               </el-tooltip>
             </el-row>
@@ -110,44 +94,45 @@
         </div>
       </slot>
     </div>
+    <div @mouseenter="initKeyDownEvent" @mouseleave="removeKeyDownEvent">
+      <!-- <div class="flex-auto"> -->
+        <orig-table ref="table" :key="refreshKeyId" tabindex="0" :config="config" v-dragSelect class="xd-tb-wrapper" />
+      <!-- </div> -->
+      <!-- 统计数据 v-dragColumn  v-dragSelect-->
 
-
-    <div>
-      <orig-table v-if="enableSelectCopy==true" ref="table" :key="refreshKeyId" :config="config" v-dragSelect v-dragColumn class="xd-tb-wrapper" />
-      <orig-table v-else ref="table" :config="config" class="xd-tb-wrapper" />
-
-      <!-- 统计数据 -->
-
-      <div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
-        <div  style="width:50%" >
-           <div class="pagination-container"><slot name="statInfo" /></div>
+      <!-- <div class="flex-none"> -->
+        <div v-if="showStatInfo" style="display: inline-flex; width: 100%;">
+          <div style="width:40%" >
+            <div class="pagination-container"><slot name="statInfo" /></div>
+          </div>
+          <div v-if="showPagination" style="width:60%;overflow: hidden;"  >
+            <pagination
+              v-show="total>0 "
+              :total="total"
+              :page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
+              :page.sync="queryParams.pageNum"
+              :limit.sync="queryParams.pageSize"
+              :page-size="queryParams.pageSize"
+              @pagination="queryTable"
+            />
+          </div>
         </div>
-        <div>
-          <!-- :pagerCount="3" -->
-          <pagination
-            v-show="total>0 && showPagination"
-            :total="total"
 
-            :page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            :page-size="queryParams.pageSize"
-            @pagination="queryTable"
-          />
+        <div v-else >
+            <div v-if="showPagination">
+              <pagination
+                v-show="total>0 "
+                :total="total"
+                :page-sizes="[5,10,20,50,100,300,500,1000,2000,5000]"
+                :page.sync="queryParams.pageNum"
+                :limit.sync="queryParams.pageSize"
+                :page-size="queryParams.pageSize"
+                @pagination="queryTable"
+              />
+          </div>
         </div>
-      </div>
-      <div v-else>
-        <pagination
-            v-show="total>0 && showPagination"
-            :total="total"
+      <!-- </div> -->
 
-            :page-sizes="[10,20,50,100,300,500,1000,2000,5000]"
-            :page.sync="queryParams.pageNum"
-            :limit.sync="queryParams.pageSize"
-            :page-size="queryParams.pageSize"
-            @pagination="queryTable"
-          />
-      </div>
     </div>
 
     <!-- 数据框选复制 -->
@@ -156,9 +141,9 @@
        style="transform-origin: center top; z-index: 2009;width: 180px;"
        x-placement="bottom-end">
           <li class="el-dropdown-menu__item" @click.stop="handleCopySelect($event)" > <span >复制</span></li>
-          <!-- <li class="el-dropdown-menu__item"  > <span @click="handleCopySelect(null,$event)">复制选中数据</span></li> -->
-          <!-- <li class="el-dropdown-menu__item"  > <span @click="handleCopySelect(null,$event)">复制行</span></li> -->
-          <!-- <li class="el-dropdown-menu__item"  > <span @click="handleCopySelect(null,$event)">复制列</span></li> -->
+          <li class="el-dropdown-menu__item" @click.stop="handleSelectCurrentColumn($event)" > <span >选中当前列</span></li>
+          <li class="el-dropdown-menu__item"  > <span @click="handleSelectCurrentRow(null,$event)">选中当前行</span></li>
+
        </ul>
     </div>
     <el-dialog title="设置模板" :visible.sync="openTbShowTplDlg" width="50%">
@@ -190,8 +175,8 @@
             <el-col :span="12">
               <el-form-item label="默认此模板" prop="blDefault">
               <el-radio-group v-model="form.blDefault">
-                  <el-radio :label="1" value="1">是</el-radio>
-                  <el-radio :label="0" value="0">否</el-radio>
+                  <el-radio label="1" value="1">是</el-radio>
+                  <el-radio label="0" value="0">否</el-radio>
                 </el-radio-group>
             </el-form-item>
             </el-col>
@@ -213,19 +198,21 @@
   </div>
 </template>
 <script>
-import { listSysCustomizeTpl, getSysCustomizeTpl, delSysCustomizeTpl, addSysCustomizeTpl, updateSysCustomizeTpl } from "@/api/system/sysCustomizeTpl";
-import { parseTime,genJsSeqNo } from "@/utils/custom";
+import { listSysCustomizeTpl,  delSysCustomizeTpl, addSysCustomizeTpl, updateSysCustomizeTpl } from "@/api/system/sysCustomizeTpl";
+import { genJsSeqNo } from "@/utils/custom";
 import clip from '@/utils/clipboard'
 import Sortable from 'sortablejs'
 import draggable from 'vuedraggable'
 import origTable from './table.jsx'
-// import setHeight from '@/mixins/setHeight'
-const components = { origTable, draggable }
+
+import VirtualScroll from "el-table-virtual-scroll";
+import { VirtualColumn } from "el-table-virtual-scroll";
+
+const components = { origTable, draggable,VirtualScroll }
 
 export default {
   name: 'XdTable',
   components,
-  // mixins: [setHeight],
   props: {
     id: {
       type: String,
@@ -234,7 +221,7 @@ export default {
       type: Boolean,
       default: true,
     },
-     showSearch: {
+    showStatInfo: {
       type: Boolean,
       default: true,
     },
@@ -248,7 +235,7 @@ export default {
     },
     queryParams:{
       type: Object,
-      default: {},
+      default: null,
     },
     total:{
       type: Number,
@@ -270,14 +257,6 @@ export default {
       type: Boolean,
       default: true,
     },
-    showStatInfo:{
-      type: Boolean,
-      default: false,
-    },
-    enableSelectCopy:{
-      type: Boolean,
-      default: true,
-    },
 
   },
   // 框选的指令
@@ -287,30 +266,40 @@ export default {
           inserted: function (el, binding, vnode) {
               var oDiv = el;
               var tbBodyDiv=oDiv.getElementsByClassName("el-table__body-wrapper")[0];
-              //监听用户鼠标事件
+
+              // 鼠标按下事件
               tbBodyDiv.onmousedown = function (ev) {
                   var evt = window.event || arguments[0];
                   var flag = true;
-                  // 鼠标右键菜单
-                  // console.log("evt",evt);
+                  // 鼠标右键菜单，并且记录当前位置
                   if(evt.button == 2){
                      flag=false;
-                     showContextMenu(evt);
-                    //  vnode.context.clearEventBubble(evt);
-                     const currentCellInfo=getCellPosition(evt.target);
-                     vnode.context.currentCellInfo=currentCellInfo;
-                    //  console.log("currentCellInfo",currentCellInfo);
+                     if(vnode.context.multipleSelection&&vnode.context.multipleSelection.length>0)
+                     {
+
+                        // 记住当前单元格位置
+                        vnode.context.currentOdiv=oDiv;
+                        vnode.context.currentCell=evt.target;
+
+                        const currentCellInfo=getCellPosition(evt.target);
+                        vnode.context.currentCellInfo=currentCellInfo;
+
+                        // 显示右键菜单
+                        showContextMenu(evt);
+
+                     }
                      return;
                   }
-                   // 只有鼠标左键按下时有效
-                  if(evt.button != 0){
-                      return;
+
+                  let selNodes=document.querySelectorAll(".seled");
+                  console.log("===selNodes==>",selNodes)
+                  if(selNodes!=null&&selNodes.length>0){
+                    for (var i = 0; i < selNodes.length; i++) {
+                      selNodes[i].classList.remove("seled")
+                    }
                   }
 
-                  vnode.context.multipleSelection=[];
-                  //初始化不显示
                   vnode.context.contextVisible=false;
-
                   // 增加图层
                   var xdTableObj = document.getElementById(vnode.context.tableId);
 
@@ -321,21 +310,26 @@ export default {
                   tbBody1.appendChild(selDiv);
 
                   // 表格对象
-                  const  tableDom=vnode.context.$refs.table.$refs.elTable.$el;
+                  const refTableObj=vnode.context.getInstance();
+                  const tableDom=vnode.context.$refs.table.$refs.elTable.$el;
 
-                  //用来存储列表
+                  //用来存储列表 单元格和行
                   var selList = [];
+                  var selRowList = [];
                   //获得指令下的dom对应的表格
                   var fileNodes = oDiv.getElementsByTagName("td");
-                  var countI = 0;
+                  var fileRowNodes = oDiv.getElementsByTagName("tr");
+
                   // 获得鼠标 X,Y
                   var startX = (evt.x || evt.clientX);
                   var startY = (evt.y || evt.clientY);
 
+                  // 优先选中当前单元格
+                  setMouseCellSelect(evt.target);
 
                   var _x = null;
                   var _y = null;
-                  // vnode.context.clearEventBubble(evt);
+                  vnode.context.clearEventBubble(evt);
                   // //打开开关
                   vnode.context.mouseflag = true;
                   // //鼠标拖动时画框
@@ -344,21 +338,34 @@ export default {
                       _x = (evt.x || evt.clientX);
                       _y = (evt.y || evt.clientY);
                       //为了确定是点击事件还是移动事件
-                      // if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){
-                      //     return;
-                      // }
-                      //为了确保只有一次的渲染每次框选都把默认选中为空
+
+                      if(Math.abs(_x - startX)<5 && Math.abs(_y - startY)<5){
+                          // setMouseCellSelect(evt.target);
+                          // setMouseRowSelect(evt.target);
+                          return;
+                      }
                       if(flag){
-                         //重置选中css
+
+                          vnode.context.multipleSelection=[];
+
+                          // console.log("===fileNodes.length==>",fileNodes.length);
+                          // 只选取范围内的数据
                           for (var i = 0; i < fileNodes.length; i++) {
-                            if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
-                                  // fileNodes[i].className = "el-table__cell";
+                              // console.log("===fileNodes==>",i);
+                              if (fileNodes[i].className.indexOf("el-table__cell") != -1) {
                                   fileNodes[i].classList.remove("seled");
                                   selList.push(fileNodes[i]);
                               }
                           }
 
-                          flag = false;
+                          for (var i = 0; i < fileRowNodes.length; i++) {
+                              if (fileRowNodes[i].className.indexOf("el-table__row") != -1) {
+                                fileRowNodes[i].classList.remove("rowSeled");
+                                selRowList.push(fileRowNodes[i]);
+                              }
+                          }
+
+                        flag = false;
                       }
 
                       if (vnode.context.mouseflag) {
@@ -379,66 +386,84 @@ export default {
                           selDiv.style.width = Math.abs(_x - startX) + "px";
                           selDiv.style.height = Math.abs(_y - startY) + "px";
 
+                          // 核心，判断选择的区域
                           var _l = selDiv.offsetLeft, _t = selDiv.offsetTop;
                           var _w = selDiv.offsetWidth, _h = selDiv.offsetHeight;
 
-                          for (var i = 0; i < selList.length; i++) {
+                          if(_y>(tbPosRect2.y+tbPosRect2.height)){
+                            tbBody2.scrollBy(0, 60);
+                          }
+                          // else if(_y<(tbPosRect2.y-tbHeader2.offsetHeight)){
+                          //   tbBody2.scrollBy(0, 0-60);
+                          // }
 
+                          // 单元格
+                          for (var i = 0; i < selList.length; i++) {
                               var sl = selList[i].offsetWidth + selList[i].offsetLeft;
                               var st = selList[i].offsetHeight + selList[i].offsetTop;
 
-                              if (sl > _l && st > _t && selList[i].offsetLeft < _l + _w && selList[i].offsetTop < _t + _h) {
+                              if(sl > _l && st > _t && selList[i].offsetLeft < _l + _w && selList[i].offsetTop < _t + _h) {
+                                  // 选择列不允许选择
+                                  if(selList[i].className.indexOf("--selection") != -1 ){
+                                      continue;
+                                  }
+
                                   if (selList[i].className.indexOf("seled") == -1) {
                                       selList[i].className = selList[i].className + " seled";
                                       const cellInfo=getCellPosition(selList[i]);
                                       vnode.context.multipleSelection.push(cellInfo);
+                                  }
+                              }
+                           }
 
-                                      // vnode.context.$refs.table.$refs.elTable.toggleRowSelection(vnode.context.tableData[i],true)
+                           // 行
+                           for (var i = 0; i < selRowList.length; i++) {
+                              var sl = selRowList[i].offsetWidth + selRowList[i].offsetLeft;
+                              var st = selRowList[i].offsetHeight + selRowList[i].offsetTop;
+                              if (sl > _l && st > _t && selRowList[i].offsetLeft < _l + _w && selRowList[i].offsetTop < _t + _h) {
+                                  if (selRowList[i].className.indexOf("rowSeled") == -1) {
+                                    selRowList[i].className = selRowList[i].className + " rowSeled";
+                                    refTableObj.toggleRowSelection(vnode.context.tableData[i],true)
                                       //把选中的都存入到table标签中的已选中
                                       // if(vnode.context.tableData[i]){
-                                      //     vnode.context.multipleSelection.push(vnode.context.tableData[i]);
+                                      //     vnode.context.multipleRowSelection.push(vnode.context.tableData[i]);
                                       // }
-
-
                                   }
                               } else {
-                                  if (selList[i].className.indexOf("seled") != -1 ) {
-                                      // selList[i].className = "el-table__cell";
-                                      selList[i].classList.remove("seled");
-
+                                  if (selRowList[i].className.indexOf("rowSeled") != -1 ) {
+                                    // selRowList[i].className = "el-table__row";
+                                    refTableObj.toggleRowSelection(vnode.context.tableData[i],false);
+                                    selRowList[i].classList.remove("rowSeled");
                                   }
                               }
                           }
-
-                          // console.log(vnode.context.multipleSelection);
-
-                      }
-                      vnode.context.clearEventBubble(evt);
+                    }
+                    vnode.context.clearEventBubble(evt);
                   };
 
                   function showContextMenu(event){
-                    var xdTableObj = document.getElementById(vnode.context.tableId);
-                    xdTableObj.addEventListener("contextmenu", function(event) {
-                      var menu = document.querySelector("#contextMenu");
-                      let tbPosRect=getTablePosition(xdTableObj);
-                      menu.style.left = (event.clientX-tbPosRect.left+5) + "px";
-                      menu.style.top = (event.clientY-tbPosRect.top-35)  + "px";
-                      menu.style.display = "block";
-                      menu.style.zIndex = 3000;
-                      vnode.context.contextVisible=true;
+                     var xdTableObj = document.getElementById(vnode.context.tableId);
+                      xdTableObj.addEventListener("contextmenu", function(event) {
 
-                      event.preventDefault();
+                        vnode.context.clearEventBubble(event)
+
+                          var menu = xdTableObj.querySelector("#contextMenu");
+                          // console.log("====>xdTableObj====>",xdTableObj);
+                          // console.log("====>menu====>",menu);
+
+                          let tbPosRect=getTablePosition(xdTableObj);
+                          menu.style.left = (event.clientX-tbPosRect.left+5) + "px";
+                          menu.style.top = (event.clientY-tbPosRect.top-35)  + "px";
+                          menu.style.display = "block";
+                          menu.style.zIndex = 3000;
+                          vnode.context.contextVisible=true;
+                          event.preventDefault();
                     });
 
                   }
-
-
                   function cancelContextMenu() {
                     document.oncontextmenu = new Function("event.returnValue=true");
                   }
-
-
-
                   // 获取el-table元素的位置信息
                   function getTablePosition(tbDom) {
                     const tableRect = tbDom.getBoundingClientRect();
@@ -451,7 +476,7 @@ export default {
                       while(cell.tagName !== 'TD'){
                         cell = cell.parentElement;
                       }
-                      // console.log("xdtable==>",cell);
+                      // // console.log("xdtable==>",cell);
                       const cellRect = cell.getBoundingClientRect();
                       return { x:cellRect.x,y:cellRect.y,width:cellRect.width,height:cellRect.height};
                     }catch(e){
@@ -459,22 +484,40 @@ export default {
                     }
                   }
 
-                  function setMouseCellSelect(cell) {
+                  function setMouseCellSelect(cell,selRowList) {
                     try{
                       while(cell.tagName !== 'TD'){
                         cell = cell.parentElement;
                       }
-                      cell.className = cell.className + " seled";
 
+                      if(cell.className.indexOf("--selection") != -1 ){
+                          return;
+                      }
+
+                      // 选中和取消选中
+                      if(cell.className.indexOf("seled") != -1 ){
+                        // cell.classList.remove("seled");
+                        // vnode.context.multipleSelection=[];
+                      }
+                      else{
+                        cell.className = cell.className + " seled";
+                      }
                       const cellInfo=getCellPosition(cell);
                       vnode.context.multipleSelection=[];
                       vnode.context.multipleSelection.push(cellInfo);
 
+                      // 行样式设置
+                      // const refTableObj=vnode.context.getInstance();
+                      // let rowIndex = cell.rowIndex;
+                      // // selRowList[i].className = selRowList[i].className + " rowSeled";
+                      // refTableObj.toggleRowSelection(vnode.context.tableData[rowIndex],true)
 
                     }catch(e){
                     }
                   }
 
+
+
                   // 获取鼠标位置的单元格
                   function getCellPosition(cell) {
                     try{
@@ -518,7 +561,9 @@ export default {
           })
 
         }
-    }
+      },
+
+
   },
   data() {
     return {
@@ -533,8 +578,6 @@ export default {
       isMouseDown: true, // 是否需要(允许)处理鼠标的移动事件
       tbSize:"",
 
-
-
       name: '',
       config: {
         children: [],
@@ -555,6 +598,8 @@ export default {
       mouseflag: false,
       //选中的数组
       multipleSelection: [],
+      multipleRowSelection:[],
+
       //控制右键菜单弹出显示
       contextVisible:false,
 
@@ -571,9 +616,14 @@ export default {
       currentCellInfo:null,
       currentSelectStr:null,
 
+      currentOdiv:null,
+      currentCell:null,
+
       checkAll: false, //招标阶段 是否全选
       isIndeterminate: false, //全选复选框标识
 
+      copyHanderEvent:null,
+
       // 表格个性化记忆配置
       isNeedDbSaveTpl:false,
       fullUrl:null,
@@ -583,7 +633,15 @@ export default {
       storageList: [],
       openTbShowTplDlg:false,
       curentTbShowTpl:null,
-      form:{},
+      form:{
+        id: null,
+          tplCode: null,
+          tplName: null,
+          tplType: null,
+          tagId: null,
+          blDefault: null,
+          tplData: null,
+      },
       rules: {
         tplName: [
           { required: true, message: "模版名称必填", trigger: "blur" }
@@ -602,40 +660,60 @@ export default {
     },
   },
   mounted() {
+    // console.log("===>xdtabe mounted==111->");
     if(this.saveStorageName&&this.saveStorageName!=undefined&&this.saveStorageName!=''){
       this.isNeedDbSaveTpl=true;
     }else{
       this.fullUrl=window.location.origin + window.location.pathname + window.location.search + window.location.hash;
       this.pageId=this.MD5(this.fullUrl);
       this.saveStorageName=this.pageId;
-      // console.log("===> this.fullUrl==>", this.fullUrl,this.saveStorageName)
+      // // console.log("===> this.fullUrl==>", this.fullUrl,this.saveStorageName)
       this.isNeedDbSaveTpl=false;
     }
-    // this.getTbShowlList();
+
+    // 初始化默认模版到本地
+    this.initDefaultTplList();
     this.initStorage()
     this.updateTable()
-    this.initSort();
-    if(this.enableSelectCopy==true){
-      // 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() {
+        return this.$refs.table.$refs?.elTable
+      },
       getUUID() {
         return Math.random().toString(36).substring(3,10);
       },
 
-      initKeyDown(){
-        let that=this;
-        document.addEventListener('keydown', function(e) {
-          e = e||window.event;
-          if(e.ctrlKey&&e.code=="KeyC"){
-            that.handleCopySelect(e);
-            return false;
-          }
+      clearSelection(){
+        this.$nextTick(()=>{
+          this.$refs.table.$refs.elTable.clearSelection();
         });
       },
+
+      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()!== '') {
           //e.target.value就是录入的内容
@@ -675,11 +753,14 @@ export default {
         if(val){
           if(this.storeTplList&&this.storeTplList.length>0){
             const tplItem = this.storeTplList.find(d => d.tplCode === val)
-            // console.log("===>tplItem==>",tplItem);
+            // // console.log("===>changeTbShowTpl==111->",tplItem);
             this.form=Object.assign({},tplItem);
             if(this.form.tplData){
-              this.storageList=JSON.parse(this.form.tplData);
-              this.updateTable()
+              let tplColList=JSON.parse(this.form.tplData);
+              // 保存模版数据到本地
+              this.storeTplToLocal(tplColList);
+              this.initStorage();
+              this.updateTable();
             }
           }
         }else{
@@ -693,32 +774,39 @@ export default {
             tplData: null,
           }
           window.localStorage.removeItem('tableStorage');
-          this.reload();
+          this.reInitList();
         }
       },
-      getTbShowlList() {
+      async initDefaultTplList() {
         if(!this.isNeedDbSaveTpl){
           return;
         }
         let queryParams = {
           tagId:this.saveStorageName
         };
+
         this.storeTplList=[];
-        listSysCustomizeTpl(queryParams).then(response => {
-          if(response.rows&&response.rows.length>0){
-            this.storeTplList=response.rows;
-            // 获取默认模版
+        // 获取模版列表
+        let res=await listSysCustomizeTpl(queryParams)
+        if(res.rows&&res.rows.length>0){
+            this.storeTplList=res.rows;
+            // 设置默认模版
             const selTplItem=this.storeTplList.find(item=>item.blDefault == '1' );
             if(selTplItem){
               this.form=selTplItem;
               this.curentTbShowTpl=selTplItem.tplCode;
+              const tplColList=JSON.parse(this.form.tplData);
+              // console.log("===>initDefaultTplList=2222=>",tplColList);
+              // 存储到本地tpl
+              this.storeTplToLocal(tplColList);
             }
-
-          }
-        });
+        }
       },
+      // 矫正模版数据
+
       savaTbShowTpl(){
         if(!this.form.tplName){
+          // this.form.tplName='默认'
           this.$modal.msgError("模版名称必填");
           return;
         }
@@ -736,7 +824,7 @@ export default {
           updateSysCustomizeTpl(this.form).then(response => {
             this.$modal.msgSuccess("修改成功");
             this.openTbShowTplDlg=false;
-            this.getTbShowlList();
+            this.initDefaultTplList();
             this.curentTbShowTpl=this.form.tplCode;
           });
         } else {
@@ -746,20 +834,25 @@ export default {
           addSysCustomizeTpl(this.form).then(response => {
             this.$modal.msgSuccess("新增成功");
             this.openTbShowTplDlg=false;
-            this.getTbShowlList();
+            this.initDefaultTplList();
             this.curentTbShowTpl=this.form.tplCode;
           });
         }
       },
       delTbShowTpl(){
         const ids = this.form.id;
+        if(!ids || ids==undefined){
+          this.$modal.msgSuccess("未选择模版");
+          return;
+        }
+
         this.$modal.confirm('是否确认删除').then(function() {
           return delSysCustomizeTpl(ids);
         }).then(() => {
-          this.getTbShowlList();
+          this.curentTbShowTpl=null;
+          this.initDefaultTplList();
           this.openTbShowTplDlg=false;
           this.changeTbShowTpl(null);
-
           this.$modal.msgSuccess("删除成功");
         }).catch(() => {});
       },
@@ -808,21 +901,98 @@ export default {
 
               let str=item.text;
               if(!str || str==''){
-                str='';
+                str=' ';
               }
               selStr = selStr+str+"\t";
+
               currentRow=item.row;
 
             });
-
             selStr=this.trimTabChar(selStr,'\t','');
-            // console.log("=selStr==>",selStr);
+            // 去除两端空格
 
             this.currentSelectStr=selStr;
+
           }
 
           // this.$emit('handleSelect',this.multipleSelection)
       },
+      getCellInfo(cell) {
+          try{
+
+            while(cell.tagName !== 'TD'){
+              cell = cell.parentElement;
+            }
+
+            const rowIndex = cell.parentElement.rowIndex;
+            const cellIndex = cell.cellIndex;
+            const text = cell.innerText;
+            return { row:rowIndex,col: cellIndex ,text:text};
+          }catch(e){
+            return { rowIndex:-1,cellIndex:-1};
+          }
+      },
+      // 复制选中数据
+      handleCopySelect(event) {
+        this.contextVisible=false;
+        if(this.currentSelectStr){
+          if (navigator.clipboard && window.isSecureContext) {
+            // navigator clipboard 向剪贴板写文本
+            this.$modal.msgSuccess('复制成功')
+            return navigator.clipboard.writeText(this.currentSelectStr)
+          } else {
+            // 创建text area
+            const textArea = document.createElement('textarea')
+            textArea.value = this.currentSelectStr
+            // 使text area不在viewport，同时设置不可见
+            document.body.appendChild(textArea)
+            textArea.focus()
+            textArea.select()
+            this.$modal.msgSuccess('复制成功')
+            return new Promise((res, rej) => {
+              // 执行复制命令并移除文本框
+              document.execCommand('copy') ? res() : rej()
+              textArea.remove()
+            })
+          }
+        }
+      },
+      // 选择整行
+      handleSelectCurrentRow(evt){
+        this.contextVisible=false;
+        var fileNodes = this.currentOdiv.getElementsByTagName("td");
+        if(this.currentCellInfo){
+          this.multipleSelection=[];
+          for (var i = 0; i < fileNodes.length; i++) {
+              const selItem=fileNodes[i];
+              if (selItem.className.indexOf("el-table__cell") != -1 && selItem.parentElement.rowIndex == this.currentCellInfo.row ) {
+                  selItem.className = selItem.className + " seled";
+                  const cellInfo=this.getCellInfo(selItem);
+                  this.multipleSelection.push(cellInfo);
+              }else{
+                selItem.classList.remove("seled");
+              }
+          }
+        }
+      },
+      // 选择整列
+      handleSelectCurrentColumn(evt){
+        this.contextVisible=false;
+        var fileNodes = this.currentOdiv.getElementsByTagName("td");
+        if(this.currentCellInfo){
+          this.multipleSelection=[];
+          for (var i = 0; i < fileNodes.length; i++) {
+              const selItem=fileNodes[i];
+              if (selItem.className.indexOf("el-table__cell") != -1 && selItem.cellIndex == this.currentCellInfo.col ) {
+                  selItem.className = selItem.className + " seled";
+                  const cellInfo=this.getCellInfo(selItem);
+                  this.multipleSelection.push(cellInfo);
+              }else{
+                selItem.classList.remove("seled");
+              }
+          }
+        }
+      },
       trimTabChar(str,char, type) {
         if (char) {
           if (type == 'left') {
@@ -837,14 +1007,16 @@ export default {
     // ---------------
     //清除默认事件
     clearEventBubble(evt) {
-        if (evt.stopPropagation)
-            evt.stopPropagation();
-        else
-            evt.cancelBubble = true;
-        if (evt.preventDefault)
-            evt.preventDefault();
-        else
-            evt.returnValue = false;
+        if(evt!=null){
+          if (evt.stopPropagation)
+              evt.stopPropagation();
+          else
+              evt.cancelBubble = true;
+          if (evt.preventDefault)
+              evt.preventDefault();
+          else
+              evt.returnValue = false;
+        }
     },
     getTableDom() {
       return this.$refs.table.$refs.elTable.$el;
@@ -856,23 +1028,12 @@ export default {
       clip(text, event)
     },
 
-    handleCopySelect(event) {
-      this.contextVisible=false;
-      if(this.currentSelectStr){
-        navigator.clipboard.writeText(this.currentSelectStr).then(() => {
-          this.$message({message: '复制成功', type:'success'})//提示
-          this.currentSelectStr=null;
-        });
-      }
-    },
-    handleSelectCurrentRow(){
 
-    },
     setHeaderSortable(){
       let that=this;
       this.$nextTick(function () {
         const wrapperTr = document.querySelector('#'+that.tableId+' .el-table__header-wrapper > table > thead > tr');
-            // console.log("===>wrapperTr==>",wrapperTr);
+            // // console.log("===>wrapperTr==>",wrapperTr);
             if(wrapperTr){
               Sortable.create(wrapperTr, {
                 animation: 100,
@@ -889,9 +1050,13 @@ export default {
                   arr.splice(newIndex-1, 0, currCol);
 
                   that.storageList = arr;
-                  that.updateTable();
-                    // this.refreshKeyId=Math.random().toString(36).substring(3,10);
 
+                  console.log("====>setHeaderSortable===>",that.storageList)
+                  this.storeTplToLocal(that.storageList)
+                  this.initStorage()
+                  this.updateTable()
+                  // that.updateTable();
+                    // this.refreshKeyId=Math.random().toString(36).substring(3,10);
 
                   // const currCol = vnode.context.storageList.splice(oldIndex-1, 1)[0];
                   // vnode.context.storageList.splice(newIndex-1, 0, currCol);
@@ -902,9 +1067,7 @@ export default {
           }
       })
     },
-    handleSelectCurrentColumn(){
 
-    },
     // 定义方法 isEqual 来比较两个选中数据对象是否相同
     isEqual(data1, data2) {
       return (
@@ -914,21 +1077,35 @@ export default {
         data1.factor === data2.factor
       );
     },
+    // 重新初始化
+    reInitList() {
+        let list=[];
+        this.$vnode.componentOptions.children.forEach(node => {
+            // 以prop为准，因为可能会改文本
+            if (!(!node.componentOptions || node.componentOptions.propsData.type) && list.findIndex(i => i.prop === node.componentOptions.propsData.prop) < 0) {
+              // 非插槽且 不是特殊类型的 找不到就加上
+              const propsData = JSON.parse(JSON.stringify(node.componentOptions.propsData))
+              if (propsData.fixed === undefined || propsData.fixed === false) {
+                propsData.fixed = false
+              } else {
+                propsData.fixed = propsData.fixed ? propsData.fixed : 'left'
+              }
+              list.push({
+                fixed: false, // 默认新增的都是不固定
+                show: true, // 默认新增的都是显示的
+                ...propsData
+              })
+            }
+        })
 
-    // 动态列渲染表格时，需要在列渲染完成后重新渲染一下表格
-    reload() {
-      this.$nextTick(() => {
+        this.storeTplToLocal(list)
         this.initStorage()
         this.updateTable()
-        this.initSort();
-      })
     },
+
     download(){
       this.$emit("download");
     },
-    initSort() {
-
-	  },
     // 查询
     queryTable(){
       this.$emit("queryTable");
@@ -955,21 +1132,10 @@ export default {
         const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
         storage[this.saveStorageName] = []
         window.localStorage.setItem('tableStorage', JSON.stringify(storage))
-        location.reload()
-      })
-    },
-    delAllStorage() {
-      this.$confirm('重置将清除系统设置并刷新页面是否继续?', '提示', {
-        confirmButtonText: '确定',
-        cancelButtonText: '取消',
-        type: 'warning'
-      }).then(() => {
-        window.localStorage.removeItem('tableStorage')
-        location.reload()
-      })
-      // window.localStorage.removeItem('tableStorage');
-      // this.reload();
+        this.changeSaveTbShowTpl(null);
+        this.reInitList();
 
+      })
     },
     handleCheckAllChange(isCheckAll){
         if(isCheckAll){
@@ -993,6 +1159,7 @@ export default {
         })
         return
       }
+
       this.updateTable()
     },
     setFixed(value, clo) {
@@ -1006,7 +1173,7 @@ export default {
      // 更多操作触发
      handleAdjustTableSize(command) {
       //size:mini/small/medium;
-      // console.log(this.config);
+      // // console.log(this.config);
       switch (command) {
         case "small":
           this.config.attrs.size='small';
@@ -1027,14 +1194,16 @@ export default {
       this.storageList = []
       let list = [];
       const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
-      // 不管是否初次还是要做一下处理，万一页面有修改，做一下更新，以最新的node节点数组为准
+
       if(this.showCustomizeTpl && this.saveStorageName!=undefined && this.saveStorageName!=''){
         list = storage[this.saveStorageName] ? storage[this.saveStorageName] : []
       }
 
+      // || node.componentOptions.propsData.type
+      // 不管是否初次还是要做一下处理，万一页面有修改，做一下更新，以最新的node节点数组为准
       this.$vnode.componentOptions.children.forEach(node => {
-        // 以label为准，因为可能会改文本
-        if (!(!node.componentOptions || node.componentOptions.propsData.type) && list.findIndex(i => i.label === node.componentOptions.propsData.label) < 0) {
+        // 以prop为准，因为可能会改文本
+        if (!(!node.componentOptions ) && list.findIndex(i => i.prop === node.componentOptions.propsData.prop) < 0) {
           // 非插槽且 不是特殊类型的 找不到就加上
           const propsData = JSON.parse(JSON.stringify(node.componentOptions.propsData))
           if (propsData.fixed === undefined || propsData.fixed === false) {
@@ -1049,19 +1218,29 @@ export default {
           })
         }
       })
+
       // 必须在节点数组存在的才有意义
       list = list.filter(item => this.$vnode.componentOptions.children.find(n => {
-        return n.componentOptions && item.label === n.componentOptions.propsData.label
+        return n.componentOptions && n.componentOptions.propsData.label && item.prop === n.componentOptions.propsData.prop
       }))
-      this.storageList = list
-    },
-    keyDown(e) {
-      if(e.ctrlKey && e.keyCode==13) {   //用户点击了ctrl+enter触发
-
+       // 去除重复数据
+      let map = new Map();
+      let list2 = [];  // 数组用于返回结果
+      for (let i = 0; i < list.length; i++) {
+        if(map.has(list[i].prop)) {  // 如果有该key值
+          map.set(list[i].prop, true);
+        } else {
+          map.set(list[i].prop, false);   // 如果没有该key值
+          // 必须要存在 列名称才处理
+          if(list[i].label){
+            list2.push(list[i]);
+          }
+        }
       }
-      // this.textarea += '\n';
-      // }else { //用户点击了enter触发
-      //   this.sendMessage();
+      list=list2;
+      // console.log("===>list=1111=>",list);
+
+      this.storageList = list
     },
     // 根据缓存的数组进行渲染表格
     updateTable() {
@@ -1069,30 +1248,59 @@ export default {
       const childrenNodes = this.$vnode.componentOptions.children.filter(node => node.componentOptions && node.componentOptions.propsData.type)
       this.storageList.forEach(item => {
         if (item.show) {
-          const node = this.$vnode.componentOptions.children.find(n => n.componentOptions && n.componentOptions.propsData.label === item.label)
+          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;
+            }
             node.componentOptions.propsData.fixed = item.fixed
             childrenNodes.push(node)
           }
         }
       })
 
-      this.$listeners['']
       this.config.children = childrenNodes
       this.config.attrs = this.$attrs
       this.config.listeners = this.$listeners;
 
       // 通过key值触发表格刷新，避免拖拽由于数组长度一致导致diff算法无法识别
-      this.config.key = Math.random() + ''
+      // this.config.key = Math.random() + ''
       // 控制下表格重新刷新
-      // this.getInstance()?.doLayout()
+      this.getInstance()?.doLayout()
       if(this.showCustomizeTpl){
-        const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
-        storage[this.saveStorageName] = this.storageList
-        window.localStorage.setItem('tableStorage', JSON.stringify(storage))
+        this.storeTplToLocal(this.storageList);
+      }else{
+        // 清除本地缓存
+        // window.localStorage.removeItem('tableStorage')
       }
 
-      // this.setHeaderSortable();
+      // const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
+      // storage[this.saveStorageName] = this.storageList
+      // window.localStorage.setItem('tableStorage', JSON.stringify(storage))
+
+    },
+    storeTplToLocal(tplColList){
+      const storage = window.localStorage.getItem('tableStorage') ? JSON.parse(window.localStorage.getItem('tableStorage')) : {}
+      storage[this.saveStorageName] = tplColList
+      window.localStorage.setItem('tableStorage', JSON.stringify(storage))
+    },
+     /** 导出excel文件操作 */
+    exportData(fileName,dataList,formatJson,loadingInstance){
+      const curList =dataList
+      import('@/vendor/Export2Excel').then(excel => {
+        const exportParam=this.getExportParam();
+        const tHeader = exportParam.header;
+        const filterVal = exportParam.filter;
+        const data = formatJson(filterVal, curList, selData)
+        excel.export_json_to_excel({
+          header: tHeader,
+          data,
+          filename: fileName,
+          autoWidth: true
+        })
+        loadingInstance.close()
+      })
     },
 
   }
@@ -1144,10 +1352,13 @@ export default {
         padding-bottom: 6px;
       }
     }
+
+    .parent:has(.child){
+        background-color: #eee;
+    }
   }
 
-.drag-ghost { background-color: #e7e7e77d; }
-.drag-chosen { background-color: #e7e7e77d; }
+
 
 .pagination-container{
   padding: 0px 20px !important;
@@ -1162,13 +1373,22 @@ export default {
 
 
 :deep .seled{
-  // background-color: #d9ecff7d !important;
-  background-color: #f6ffbe8a !important;
+  background-color: #51dd397d !important;
 
   color: black;
   font-weight: 600;
 }
 
+:deep .rowSeled{
+  background-color: #ffa5a55e !important;
+
+  color: black;
+  font-weight: 600;
+}
+
+.xd-tb-wrapper :deep .el-table__body tr:hover > td {
+     background-color: #ffa5a55e;
+ }
 
 .xd-tb-wrapper{
 		-webkit-user-select: none; /* Safari */
@@ -1177,10 +1397,9 @@ export default {
 		user-select: none;
 }
 
-.el-table__body tr.current-row>td {
-        background: #453878 !important;
-}
 
+.drag-ghost { background-color: #e7e7e77d; }
+.drag-chosen { background-color: #e7e7e77d; }
 
 // 拖拽
 .dragClass {
@@ -1195,6 +1414,40 @@ export default {
   background: rgba($color: #f56c6c, $alpha: 0.5) !important;
 }
 
+.el-table__body tr.current-row > td {
+    background-color: #78f709 !important;
+}
+.el-table--enable-row-hover .el-table__body tr:hover > td {
+    background-color: #f6d604 !important;
+    cursor:pointer;
+}
+
+.full-block{
+    height:100%;
+    width:100%;
+    overflow:hidden;
+}
+.flex-layout{
+    display:flex;
+    flex-direction:column;
+}
+.flex-auto{
+    flex:1 1 auto
+}
+.flex-none{
+    flex:none
+}
+
+.el-table {
+	width: 100%;
+	display: flex;
+	flex-direction: column;
+	.el-table__body-wrapper {
+		flex: 1;
+    }
+}
+
+
 </style>
 
 
diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index 2dfacc5..57d1a98 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -124,6 +124,7 @@ export default {
     ...mapGetters([
       'sidebar',
       'avatar',
+      'userId',
       'nickName',
       'userName',
       'ownerSiteName',
@@ -171,9 +172,9 @@ export default {
     },
     // 初始化客服
     initKFClient(){
-      qimoClientId = {userId: this.userId, nickName:this.empName,agent:'8001',customField: {}, priority: false}
-      // console.log(qimoClientId);
-      // this.insertJsScript('https://ykf-weixin01.7moor.com/javascripts/7moorInit.js?accessId=0c6a3ec0-020b-11ef-a016-bf340ef083f1&autoShow=true&language=ZHCN');
+      qimoClientId = {userId: this.userId, nickName:this.nickName,agent:'8000',customField: {}, priority: false}
+      console.log("==qimoClientId=>",qimoClientId);
+      this.insertJsScript('https://ykf-weixin01.7moor.com/javascripts/7moorInit.js?accessId=0c6a3ec0-020b-11ef-a016-bf340ef083f1&autoShow=true&language=ZHCN');
     },
     toggleSideBar() {
       this.$store.dispatch('app/toggleSideBar')
diff --git a/src/permission.js b/src/permission.js
index 126d402..19b69e2 100644
--- a/src/permission.js
+++ b/src/permission.js
@@ -10,7 +10,7 @@ import getPageTitle from '@/utils/get-page-title'
 
 NProgress.configure({ showSpinner: false })
 
-const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/tools','/loginBySSO','/queryTraceInfo']
+const whiteList = ['/login', '/auth-redirect', '/bind', '/register','/tools','/loginBySSO','/queryTraceInfo','/onlineChat']
 
 router.beforeEach(async(to, from, next) => {
   NProgress.start()
diff --git a/src/router/index.js b/src/router/index.js
index 3de9c26..2ae04c7 100644
--- a/src/router/index.js
+++ b/src/router/index.js
@@ -65,6 +65,14 @@ export const constantRoutes = [
       title:'轨迹查询'
     }
   },
+  {
+    path: '/onlineChat',
+    component: () => import('@/views/openpage/onlineChat'),
+    hidden: true,
+    meta:{
+      title:'在线客服'
+    }
+  },
   {
     path: '/register',
     component: () => import('@/views/register'),
diff --git a/src/store/getters.js b/src/store/getters.js
index d7bf605..e774b2d 100644
--- a/src/store/getters.js
+++ b/src/store/getters.js
@@ -8,7 +8,7 @@ const getters = {
   avatar: state => state.user.avatar,
   empCode: state => state.user.empCode,
   empName: state => state.user.empName,
-  nickName: state => state.user.nickName,
+  userId: state => state.user.userId,
   name: state => state.user.name,
   nickName: state => state.user.nickName,
   customerType: state => state.user.customerType,
diff --git a/src/store/modules/user.js b/src/store/modules/user.js
index cd12301..8a2f9e6 100644
--- a/src/store/modules/user.js
+++ b/src/store/modules/user.js
@@ -6,6 +6,7 @@ const user = {
     token: getToken(),
     empCode:'',
     empName:'',
+    userId:'',
     ownerSiteCode:'',
     ownerSiteName:'',
     customerType:'',
@@ -24,12 +25,16 @@ const user = {
       state.name = name
     },
     SET_EXTRA: (state, userInfo) => {
+      state.userId = userInfo.userId;
       state.empCode = userInfo.empCode;
       state.empName = userInfo.empName;
       state.ownerSiteCode = userInfo.ownerSiteCode;
       state.ownerSiteName = userInfo.ownerSiteName;
       state.customerType = userInfo.customerType;
     },
+    SET_USER_ID: (state, userId) => {
+      state.userId = userId
+    },
     SET_NICK_NAME: (state, nickName) => {
       state.nickName = nickName
     },
@@ -110,6 +115,8 @@ const user = {
           } else {
             commit('SET_ROLES', ['ROLE_DEFAULT'])
           }
+
+          commit('SET_USER_ID', user.userId)
           commit('SET_NAME', user.userName)
           commit('SET_NICK_NAME', user.nickName)
           commit('SET_AVATAR', avatar)
diff --git a/src/views/oms/emisWaybill/OrderRecord.vue b/src/views/oms/emisWaybill/OrderRecord.vue
index 91f9397..09ff702 100644
--- a/src/views/oms/emisWaybill/OrderRecord.vue
+++ b/src/views/oms/emisWaybill/OrderRecord.vue
@@ -485,7 +485,7 @@
                                 <el-input  v-model="scope.row.ingredients" size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column> -->
-                            <el-table-column prop="supplier" label="供应商" align="center" width="60" :show-overflow-tooltip="true">
+                            <el-table-column prop="supplier" label="供应商" align="center" width="80" :show-overflow-tooltip="true">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.supplier" size="mini" placeholder=""></el-input>
                               </template>
@@ -496,17 +496,17 @@
                               </template>
                             </el-table-column>
 
-                            <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="60">
+                            <el-table-column prop="length"  :label="$t('长(cm)')"  align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.length"   size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="60">
+                            <el-table-column prop="width"  :label="$t('宽(cm)')"  align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.width"  size="mini" placeholder=""></el-input>
                               </template>
                             </el-table-column>
-                            <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="60">
+                            <el-table-column prop="height"   :label="$t('高(cm)')" align="center" width="80">
                               <template slot-scope="scope">
                                 <el-input  v-model="scope.row.height"   size="mini" placeholder=""></el-input>
                               </template>
@@ -692,6 +692,7 @@ import CardWithHeader from '@/components/CardWithHeader/index.vue';
 import GoodsInput from '@/views/oms/EmisBaseTools/GoodsInput.vue';
 
 import TransProductCasPicker from '@/views/oms/EmisBaseTools/TransProductCasPicker.vue';
+import { listSimpleEmisMonthpayAccount } from "@/api/oms/emisMonthpayAccount";
 
 // import TransProductCasPicker from '@/views/oms/EmisBaseTools/TransProductCasPicker.vue';
 
@@ -777,7 +778,7 @@ data() {
           { required: true, message: "收货人名不能为空", trigger: ["blur",'change'] }
         ],
         phone: [
-          { required: true, message: "收货人手机号不能为空", trigger: "blur" }
+          { required: true, message: "收货人手机号不能为空", trigger: ["blur",'change'] }
         ],
         country: [
           { required: true, message: "收货人国家不能为空",  trigger: ["blur",'change'] }
@@ -795,7 +796,7 @@ data() {
         //   { required: true, message: "区不能为空", trigger: "blur" }
         // ],
         address: [
-          { required: true, message: "收货地址不能为空", trigger: "blur" }
+          { required: true, message: "收货地址不能为空", trigger: ["blur",'change'] }
         ],
       },
       sender:{
@@ -803,7 +804,7 @@ data() {
           { required: true, message: "寄件人名不能为空", trigger: ["blur",'change'] }
         ],
         phone: [
-          { required: true, message: "寄件人手机号不能为空", trigger: "blur" }
+          { required: true, message: "寄件人手机号不能为空", trigger: ["blur",'change'] }
         ],
         country: [
           { required: true, message: "寄件人国家不能为空", trigger: ["blur",'change']  }
@@ -822,7 +823,7 @@ data() {
         //   { required: true, message: "寄件区不能为空", trigger: "blur" }
         // ],
         address: [
-          { required: true, message: "寄件地址不能为空", trigger: "blur" }
+          { required: true, message: "寄件地址不能为空", trigger: ["blur",'change'] }
         ],
       },
       paymentType: [
@@ -859,10 +860,10 @@ data() {
       //   { required: true, message: "总体积不能为空", trigger: "blur" }
       // ],
       parcelQty: [
-        { required: true, message: "件数不能为空", trigger: "blur" }
+        { required: true, message: "件数不能为空", trigger: ["blur",'change'] }
       ],
       billWeight: [
-        { required: true, message: "实际重量不能为空", trigger: "blur" }
+        { required: true, message: "实际重量不能为空", trigger: ["blur",'change'] }
       ],
       // volumeWeight: [
       //   { required: true, message: "体积重量不能为空", trigger: "blur" }
@@ -871,7 +872,7 @@ data() {
       //   { required: true, message: "结算重量不能为空", trigger: "blur" }
       // ],
       freight: [
-        { required: true, message: "运费不能为空", trigger: "blur" }
+        { required: true, message: "运费不能为空", trigger: ["blur",'change'] }
       ],
       // sendSiteCode: [
       //   { required: true, message: "发件网点代码不能为空", trigger: ["blur",'change'] }
@@ -880,7 +881,7 @@ data() {
       //   { required: true, message: "发货时间不能为空", trigger: "blur" }
       // ],
       dispatchUnderlingSiteCode: [
-        { required: true, message: "目的地网点代码不能为空", trigger: "blur" }
+        { required: true, message: "目的地网点代码不能为空", trigger: ["blur",'change'] }
       ],
       custNo: [
         { required: true, message: "月结卡号不能为空", trigger: ["blur",'change'] }
@@ -926,7 +927,7 @@ watch: {
 
 created() {
 
-  if(this.$route.query.action=="copyOrder"){
+  if(this.$route.query.action=="copyOrder"||this.$route.query.action=="modify"){
     this.action=this.$route.query.action;
     this.billCode=this.$route.query.billCode;
     this.initData();
@@ -946,7 +947,10 @@ methods: {
       if(this.billCode && this.billCode!=undefined) {
         this.loading = true;
         getWaybillDetail(this.billCode).then(response => {
-          this.form = response.data;
+          console.log("===>getWaybillDetail===>",response);
+          this.form =  deepClone(response.data);
+          console.log("===>this.form===>",this.form);
+
           this.form.productTypeSelArr=[this.form.transLine,this.form.productType];
           this.loading = false;
 
@@ -976,6 +980,29 @@ methods: {
           this.form.blMessage='1'
           this.form.blAcceptMessage='1'
           this.isNeedSave=true;
+
+          // 月结客户OMS登录
+          let customerType=this.$store.getters.customerType;
+          if(customerType==2){
+            // 获取默认的月结账号
+            this.form.paymentType='2';
+            this.form.custNo=this.$store.getters.userName;
+
+              let qParams = {
+                pageNumber:1,
+                pageSize:10
+              };
+              listSimpleEmisMonthpayAccount(qParams).then(response => {
+                let monthList=response.rows;
+                if(monthList&&monthList.length>0){
+                  let item=monthList[0];
+                  this.form.custNo=item.custNo;
+                  this.form.payee=item.payee;
+                  this.form.salesmen=item.salesmen;
+                }
+
+              });
+          }
           this.productFeeList=[];
       }
 
diff --git a/src/views/oms/emisWaybill/SendOrderbillList.vue b/src/views/oms/emisWaybill/SendOrderbillList.vue
index 415b8b4..c55b478 100644
--- a/src/views/oms/emisWaybill/SendOrderbillList.vue
+++ b/src/views/oms/emisWaybill/SendOrderbillList.vue
@@ -29,11 +29,11 @@
         <el-form-item label="查询时间范围" prop="">
                   <div slot="label"  >
                         <el-radio-group  class="query-label" v-model="queryOrderDateType" style="font-size:12px">
-                              <el-radio :key="1" label="1" ><span style="font-size:12px">发货时间</span></el-radio>
-                              <el-radio :key="1" label="1"><span style="font-size:12px">创建时间</span></el-radio>
+                              <el-radio :key="1" label="1" ><span style="font-size:12px">下单时间</span></el-radio>
+                              <!-- <el-radio :key="2" label="2"><span style="font-size:12px">创建时间</span></el-radio> -->
                         </el-radio-group>
                   </div>
-                  <elDateAdvPicker      v-model="dateRange"  ></elDateAdvPicker>
+                  <elDateAdvPicker v-model="dateRange"  ></elDateAdvPicker>
               </el-form-item>
 
 
@@ -503,6 +503,7 @@
 
       <!-- <el-table-column label="创建人" align="center" prop="createByName"  width="80" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column label="创建网点" align="center" prop="createSiteName"  width="80" :show-overflow-tooltip="true"/> -->
+      <el-table-column label="下单时间" align="center" prop="orderDate"  width="170"/>
       <el-table-column label="创建时间" align="center" prop="createTime"  width="170"/>
       <!-- <el-table-column label="修改人" align="center" prop="updateByName"  width="80" :show-overflow-tooltip="true"/> -->
       <!-- <el-table-column label="修改网点" align="center" prop="updateSiteName"  width="80" :show-overflow-tooltip="true"/> -->
diff --git a/src/views/openpage/queryTraceInfo.vue b/src/views/openpage/queryTraceInfo.vue
index 72c042d..3ca0af1 100644
--- a/src/views/openpage/queryTraceInfo.vue
+++ b/src/views/openpage/queryTraceInfo.vue
@@ -49,7 +49,7 @@
 
 
       </div>
-      <div v-if="extBillInfo.blBillPicDispatchRmk==1" style="line-height:30px;margin-top: 10px; font-size: 14px;display: inline-flex;width:100%"  class="panel" >
+      <div v-if="extBillInfo!=null&&extBillInfo.blBillPicDispatchRmk==1" style="line-height:30px;margin-top: 10px; font-size: 14px;display: inline-flex;width:100%"  class="panel" >
         <div style="width: 85%;color:gray;padding-left: 10px;">签收底单</div>
         <div style="width: 15%;text-align: center;font-size: 14px;" @click="viewSignedPic">查看</div>
       </div>