From f10619db5ca6372b5b621b538bba572bd55b1c66 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Tue, 5 Nov 2024 09:30:13 +0800
Subject: [PATCH] vxetable

---
 src/components/HColSet/index.vue        | 8 +++++++-
 src/components/Table/src/BasicTable.vue | 1 -
 src/views/operation/seaexport/index.vue | 1 +
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/components/HColSet/index.vue b/src/components/HColSet/index.vue
index 4bd9bc14..6eeaff9c 100644
--- a/src/components/HColSet/index.vue
+++ b/src/components/HColSet/index.vue
@@ -83,11 +83,17 @@
   const init = () => {
     visible.value = true
     nextTick(() => {
+      console.log(colData.value)
       TableColDragRef.value.init(colData.value)
     })
   }
   onMounted(() => {
-    colData.value = props.columns.data
+    console.log(props.columns)
+    if (props.type == 'excel') {
+      colData.value = props.columns.data
+    } else {
+      colData.value = props.columns
+    }
   })
   const handleOk = (b) => {
     const content = JSON.stringify(TableColDragRef.value.getColList())
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 93c42e3d..9cb885cf 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -16,7 +16,6 @@
         </a-button>
         <!-- 列设置 -->
         <HColSet
-          :ref="`dsTb${getBindValues.id}`"
           :code="getBindValues.id"
           :columns="getBindValues.columns"
           type="normal"
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index 3232d6c8..cddab6bb 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -508,6 +508,7 @@ const [registerTable, { reload, getVxeSelectRows, setLoading, setColumns }] = us
   resizeHeightOffset: 75,
   immediate: false,
   tableComponent: 'vxe',
+  id: 'order-ledger',
   actionColumn: {
     width: 60,
     title: '操作',