From 1be16a29c9579fef58b3b9f20f5e2c05425e59ad Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Mon, 11 Nov 2024 18:51:40 +0800
Subject: [PATCH] vxe

---
 src/components/ActionBar/index.vue                |  2 +-
 src/components/ApproveBtns/index.vue              |  2 +-
 src/components/CostEntry/actionBar.vue            |  2 +-
 .../CostEntry/components/ToFeeTemDrawer.vue       |  2 +-
 .../CostEntry/components/applyModify.vue          |  2 +-
 src/components/CostEntry/components/feeTable.vue  |  2 +-
 .../CostEntry/components/feeTemDrawer.vue         |  2 +-
 .../CostEntry/components/historyDrawer.vue        |  2 +-
 src/components/CostEntry/feeStatistic.vue         |  2 +-
 src/components/CostEntry/feeTable.vue             |  3 ---
 src/components/CostEntry/index.vue                |  2 +-
 src/components/CostEntry/mainInfo.vue             |  2 +-
 src/components/Form/src/BasicForm.vue             |  9 ++++-----
 .../Form/src/components/AdvancedSearch.vue        |  6 +-----
 src/components/Form/src/components/FormAction.vue |  1 -
 src/components/Form/src/components/FormItem.vue   |  1 -
 src/components/Form/src/hooks/useFormEvents.ts    |  1 +
 src/components/HColSet/index.vue                  |  2 ++
 src/components/Table/src/BasicTable.vue           | 15 +++++++++------
 src/components/Table/src/hooks/useTableScroll.ts  |  9 +++++++--
 src/components/Table/src/types/table.ts           |  4 +++-
 src/components/importExcel/index.vue              |  1 -
 src/settings/componentSetting.ts                  |  7 ++++++-
 .../approve/fee/components/AlterNewValue.vue      |  2 +-
 src/views/approve/fee/components/feeActionBar.vue |  2 +-
 .../approve/fee/components/mainActionBar.vue      |  2 +-
 src/views/approve/paid/components/calcTable.vue   |  2 +-
 .../approve/paid/components/feeActionBar.vue      |  2 +-
 src/views/approve/paid/components/feeTable.vue    |  2 +-
 .../approve/paid/components/mainActionBar.vue     |  2 +-
 src/views/baseinfo/columnset/api.ts               | 11 ++++++++++-
 .../baseinfo/formcopy/components/Modal copy.vue   |  2 +-
 src/views/baseinfo/formcopy/components/Modal.vue  |  2 +-
 .../baseinfo/formset/component/FormModel.vue      |  2 +-
 .../finance/feeSettlement/detail/invoiceTable.vue |  2 +-
 .../detail/components/applyInfo.vue               |  2 +-
 .../detail/components/businessTable.vue           |  2 +-
 .../paymentSettlementFree/invoiceTable.vue        |  2 +-
 .../detail/components/SearchTable.vue             |  2 +-
 .../operation/invoiceApply/detail/feeTable.vue    |  2 --
 .../paidApply/components/tableActionBar.vue       |  2 +-
 .../paidApply/detail/components/applyInfo.vue     |  2 +-
 .../paidApply/detail/components/businessTable.vue |  2 +-
 .../paidApply/detail/components/exchangeRate.vue  |  2 +-
 src/views/operation/paidApply/detail/index.vue    |  2 +-
 .../seaexport/detail/components/container.vue     |  2 +-
 .../seaexport/detail/components/storageSpace.vue  |  2 +-
 .../detail/modules/Letter/OpBusinessYardEdit.vue  |  2 +-
 .../seaexport/detail/modules/PersonModal.vue      |  2 +-
 .../seaexport/detail/modules/basicInfo.vue        |  2 +-
 .../seaexport/detail/modules/contactList.vue      |  2 +-
 .../seaexport/detail/modules/noteInfo.vue         |  2 +-
 .../seaexport/detail/modules/otherInfo.vue        |  2 +-
 .../seaexport/detail/modules/rightContent.vue     |  2 +-
 src/views/operation/seaexport/index.vue           |  5 ++++-
 .../system/CodeDataRuleTemplate/columnView.vue    |  3 ---
 .../taskList/BLConfirmation/container.vue         |  6 +-----
 57 files changed, 88 insertions(+), 78 deletions(-)

diff --git a/src/components/ActionBar/index.vue b/src/components/ActionBar/index.vue
index b483fd0d..2b054908 100644
--- a/src/components/ActionBar/index.vue
+++ b/src/components/ActionBar/index.vue
@@ -185,7 +185,7 @@
   </div>
 </template>
 <script lang="ts">
-  import { defineComponent, ref, defineExpose, unref } from 'vue'
+  import { defineComponent, ref } from 'vue'
   import { SvgIcon } from '/@/components/Icon'
   // 引入提示信息
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/components/ApproveBtns/index.vue b/src/components/ApproveBtns/index.vue
index 22e9f6c0..e2b36c2f 100644
--- a/src/components/ApproveBtns/index.vue
+++ b/src/components/ApproveBtns/index.vue
@@ -44,7 +44,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, nextTick, defineProps } from 'vue'
+  import { ref, nextTick } from 'vue'
   import FlowChart from '../FlowChart/index.vue'
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { useRoute } from 'vue-router'
diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue
index c87377be..85a25a68 100644
--- a/src/components/CostEntry/actionBar.vue
+++ b/src/components/CostEntry/actionBar.vue
@@ -168,7 +168,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineEmits, defineProps, ref, onMounted, defineExpose } from 'vue'
+  import { ref } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import HistoryDrawer from './components/historyDrawer.vue'
   import FeeTemDrawer from './components/feeTemDrawer.vue'
diff --git a/src/components/CostEntry/components/ToFeeTemDrawer.vue b/src/components/CostEntry/components/ToFeeTemDrawer.vue
index 63c617e0..9f53b52e 100644
--- a/src/components/CostEntry/components/ToFeeTemDrawer.vue
+++ b/src/components/CostEntry/components/ToFeeTemDrawer.vue
@@ -33,7 +33,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineEmits, defineProps, ref, reactive, onMounted, defineExpose, watch, nextTick } from 'vue'
+  import { ref, reactive, watch, nextTick } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { BasicForm, useForm } from '/@/components/Form/index'
   // 费用表格
diff --git a/src/components/CostEntry/components/applyModify.vue b/src/components/CostEntry/components/applyModify.vue
index 6b458d6e..5e2bd23e 100644
--- a/src/components/CostEntry/components/applyModify.vue
+++ b/src/components/CostEntry/components/applyModify.vue
@@ -43,7 +43,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineEmits, defineProps, ref, reactive, onMounted, defineExpose, watch } from 'vue'
+  import { ref, onMounted } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   const { createMessage } = useMessage()
   import { BasicForm, useForm } from '/@/components/Form/index'
diff --git a/src/components/CostEntry/components/feeTable.vue b/src/components/CostEntry/components/feeTable.vue
index eeeb5074..03c31f88 100644
--- a/src/components/CostEntry/components/feeTable.vue
+++ b/src/components/CostEntry/components/feeTable.vue
@@ -37,7 +37,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, reactive, defineExpose, watch, defineProps } from 'vue'
+  import { ref, reactive, defineExpose } from 'vue'
   // 费用信息表格
   import { feeColumns, feeApplyColumns } from './feeColumns'
   import { feeStatusList } from '../columns'
diff --git a/src/components/CostEntry/components/feeTemDrawer.vue b/src/components/CostEntry/components/feeTemDrawer.vue
index cbfc907c..aac203d9 100644
--- a/src/components/CostEntry/components/feeTemDrawer.vue
+++ b/src/components/CostEntry/components/feeTemDrawer.vue
@@ -24,7 +24,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineEmits, defineProps, ref, reactive, onMounted, defineExpose, watchEffect, watch } from 'vue'
+  import { ref, reactive, watch } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { BasicTable, useTable } from '/@/components/Table'
   // 费用表格
diff --git a/src/components/CostEntry/components/historyDrawer.vue b/src/components/CostEntry/components/historyDrawer.vue
index 4ec23c82..5cd5fc4a 100644
--- a/src/components/CostEntry/components/historyDrawer.vue
+++ b/src/components/CostEntry/components/historyDrawer.vue
@@ -33,7 +33,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineEmits, defineProps, ref, reactive, defineExpose, watch } from 'vue'
+  import { ref, reactive, watch } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { BasicTable, useTable } from '/@/components/Table'
   import { formatParams } from '/@/hooks/web/common'
diff --git a/src/components/CostEntry/feeStatistic.vue b/src/components/CostEntry/feeStatistic.vue
index 45132c38..7dad2fc6 100644
--- a/src/components/CostEntry/feeStatistic.vue
+++ b/src/components/CostEntry/feeStatistic.vue
@@ -95,7 +95,7 @@
 
 <script lang="ts" setup>
   import { BasicTable, useTable } from '/@/components/Table'
-  import { onMounted, ref, defineProps, watch, defineExpose } from 'vue'
+  import { ref, watch, defineExpose } from 'vue'
   import emitter from '/@/utils/Bus'
   import { FeeStatistics } from './api'
   import { currencyColumns, costomerColumns } from './columns'
diff --git a/src/components/CostEntry/feeTable.vue b/src/components/CostEntry/feeTable.vue
index 9c2db28a..d875dc9d 100644
--- a/src/components/CostEntry/feeTable.vue
+++ b/src/components/CostEntry/feeTable.vue
@@ -42,9 +42,6 @@
 </template>
 <script lang="ts" setup>
   import {
-    defineProps,
-    defineExpose,
-    defineEmits,
     ref,
     watch,
     watchEffect,
diff --git a/src/components/CostEntry/index.vue b/src/components/CostEntry/index.vue
index 8ae8b3c3..c7968780 100644
--- a/src/components/CostEntry/index.vue
+++ b/src/components/CostEntry/index.vue
@@ -52,7 +52,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineProps, ref, watch, defineExpose, defineAsyncComponent } from 'vue'
+  import { ref, watch, defineAsyncComponent } from 'vue'
   // 主单信息组件
   import MainInfo from './mainInfo.vue'
   // 应收表格组件
diff --git a/src/components/CostEntry/mainInfo.vue b/src/components/CostEntry/mainInfo.vue
index 627c1f24..84a6002f 100644
--- a/src/components/CostEntry/mainInfo.vue
+++ b/src/components/CostEntry/mainInfo.vue
@@ -22,7 +22,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { defineProps, ref, watch } from 'vue'
+  import { ref, watch } from 'vue'
   // 表单字段
   const list = ref([
     { label: '委托编号', field: 'customerNo', span: 4, value: '' },
diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 8c6678a2..6652532b 100644
--- a/src/components/Form/src/BasicForm.vue
+++ b/src/components/Form/src/BasicForm.vue
@@ -12,7 +12,7 @@
       <slot name="formHeader"></slot>
       <template v-for="schema in getSchema" :key="schema.field">
         <FormItem
-          v-if="getFormItemVisible(schema)"
+          v-show="getFormItemVisible(schema)"
           :is-advanced="fieldsIsAdvancedMap[schema.field]"
           :table-action="tableAction"
           :form-action-type="formActionType"
@@ -28,7 +28,7 @@
           </template>
         </FormItem>
         <!-- 只读 -->
-        <a-col :span="schema?.colProps?.span || 24" v-if="getReadonlyColItemVisible(schema)">
+        <a-col :span="schema?.colProps?.span || 24" v-show="getReadonlyColItemVisible(schema)">
           <div class="ds-form-onlyread">
             <span class="label">{{ schema.label }}：</span>
             <slot :name="schema.field" :model="formModel"><span>{{ formModel[schema.field] || '-' }}</span></slot>
@@ -137,13 +137,12 @@
       )
 
       const getFormItemVisible = (schema: FormSchema) => {
-        const visibleFlag = schema.isEdit != 1 || schema.component == 'Divider'
+        const visibleFlag = (schema.isEdit != 1 || schema.component == 'Divider') && schema.show !== false
         if (unref(getBindValue).textAreaReadOnly) return visibleFlag
         return visibleFlag || schema.component == 'InputTextArea'
       }
       const getReadonlyColItemVisible = (schema: FormSchema) => {
-        const visibleFlag =
-          schema.show !== false && schema.isEdit == 1 && schema.component != 'Divider'
+        const visibleFlag = schema.show !== false && schema.isEdit == 1 && schema.component != 'Divider'
         if (unref(getBindValue).textAreaReadOnly) return visibleFlag
         return visibleFlag && schema.component != 'InputTextArea'
       }
diff --git a/src/components/Form/src/components/AdvancedSearch.vue b/src/components/Form/src/components/AdvancedSearch.vue
index 7e967928..514c4051 100644
--- a/src/components/Form/src/components/AdvancedSearch.vue
+++ b/src/components/Form/src/components/AdvancedSearch.vue
@@ -133,11 +133,7 @@
 <script lang="ts" setup name="AdvancedSearch">
   import {
     ref,
-    defineProps,
-    defineEmits,
-    defineExpose,
-    unref,
-    reactive,
+    reactive
   } from 'vue'
   // 引入表格权限信息（包含id和name）
   import { permissionsInfo } from '/@/hooks/web/usePermission'
diff --git a/src/components/Form/src/components/FormAction.vue b/src/components/Form/src/components/FormAction.vue
index 1f72fb2e..fdceefd6 100644
--- a/src/components/Form/src/components/FormAction.vue
+++ b/src/components/Form/src/components/FormAction.vue
@@ -166,7 +166,6 @@
       })
 
       function toggleAdvanced() {
-        console.log(props.isAdvanced)
         const tb = document.getElementsByClassName("ds-table")
         if (tb) {
           const child = tb[0]?.getElementsByClassName('ant-table-body')
diff --git a/src/components/Form/src/components/FormItem.vue b/src/components/Form/src/components/FormItem.vue
index 7b36d8da..4187cfec 100644
--- a/src/components/Form/src/components/FormItem.vue
+++ b/src/components/Form/src/components/FormItem.vue
@@ -110,7 +110,6 @@
             ? props.isAdvanced
             : true
           : true
-
         let isShow = true
         let isIfShow = true
 
diff --git a/src/components/Form/src/hooks/useFormEvents.ts b/src/components/Form/src/hooks/useFormEvents.ts
index 0e1db052..78c836ef 100644
--- a/src/components/Form/src/hooks/useFormEvents.ts
+++ b/src/components/Form/src/hooks/useFormEvents.ts
@@ -299,6 +299,7 @@ export function useFormEvents({
   }
 
   async function validate(nameList?: NamePath[] | undefined) {
+    console.log(unref(formElRef))
     return await unref(formElRef)?.validate(nameList)
   }
 
diff --git a/src/components/HColSet/index.vue b/src/components/HColSet/index.vue
index 3618922c..78fcceb6 100644
--- a/src/components/HColSet/index.vue
+++ b/src/components/HColSet/index.vue
@@ -101,6 +101,7 @@
       colData.value = JSON.parse(JSON.stringify(props.columns))
     }
   })
+  const vid = ref(null)
   const handleOk = (b) => {
     if (props.type == 'excel') {
       // handsontable设置
@@ -112,6 +113,7 @@
         id: props.columns?.id || 0
       }).then(res => {
         createMessage.success(res.message)
+        if (res.data) vid.value = res.data
         emits('updateCol', TableColDragRef.value.getColList())
         if (!b) visible.value = false
       })
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 973863df..949aac4d 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -130,7 +130,7 @@ import { basicProps } from './props'
 import { isFunction } from '/@/utils/is'
 import { warn } from '/@/utils/log'
 // vxe列设置接口
-import { getColumnSetInfoByModule } from '/@/views/baseinfo/columnset/api'
+import { getColumnSetInfoByModule, UpdateColumnSetField } from '/@/views/baseinfo/columnset/api'
 // 引入表格权限信息（包含id和name）
 import { permissionsInfo } from '/@/hooks/web/usePermission'
 
@@ -163,7 +163,6 @@ export default defineComponent({
     'columns-change'
   ],
   setup(props, { attrs, emit, slots, expose }) {
-    console.log(props)
     const tableElRef = ref(null)
     const tableData = ref<Recordable[]>([])
 
@@ -254,7 +253,6 @@ export default defineComponent({
       getColumnsRef,
       getCacheColumns,
     } = useColumns(getProps, getPaginationInfo)
-
     const { getScrollRef, redoHeight, tableHeightRef } = useTableScroll(
       getProps,
       tableElRef,
@@ -262,7 +260,7 @@ export default defineComponent({
       getRowSelectionRef,
       getDataSourceRef,
       wrapRef,
-      formRef,
+      formRef
     )
     const { scrollTo } = useTableScrollTo(tableElRef, getDataSourceRef)
 
@@ -431,8 +429,13 @@ export default defineComponent({
     }
     // vxe拖动列触发实时保存
     const resizableChangeEvent = (item) => {
-
-      console.log(item)
+      const postData = {
+        permissionId: permissionsInfo().permissionId,
+        columnNo: props.id,
+        field: item.column.field,
+        width: item.resizeWidth
+      }
+      UpdateColumnSetField(postData)
     }
     // 更新vxe列设置
     const updateCol = (data) => {
diff --git a/src/components/Table/src/hooks/useTableScroll.ts b/src/components/Table/src/hooks/useTableScroll.ts
index 02b77212..c188b330 100644
--- a/src/components/Table/src/hooks/useTableScroll.ts
+++ b/src/components/Table/src/hooks/useTableScroll.ts
@@ -15,7 +15,7 @@ export function useTableScroll(
   rowSelectionRef: ComputedRef<TableRowSelection | null>,
   getDataSourceRef: ComputedRef<Recordable[]>,
   wrapRef: Ref<HTMLElement | null>,
-  formRef: Ref<ComponentRef>,
+  formRef: Ref<ComponentRef>
 ) {
   const tableHeightRef: Ref<Nullable<number | string>> = ref(167)
   const modalFn = useModalContext()
@@ -27,7 +27,12 @@ export function useTableScroll(
     const { canResize, scroll } = unref(propsRef)
     return canResize && !(scroll || {}).y
   })
-
+  watch(
+    () => unref(propsRef).autoHeight,
+    (v) => {
+      tableHeightRef.value = v
+    }
+  )
   watch(
     () => [unref(getCanResize), unref(getDataSourceRef)?.length],
     () => {
diff --git a/src/components/Table/src/types/table.ts b/src/components/Table/src/types/table.ts
index 09be5649..2bd86275 100644
--- a/src/components/Table/src/types/table.ts
+++ b/src/components/Table/src/types/table.ts
@@ -200,7 +200,9 @@ export interface BasicTableProps<T = any> {
   // 自适应高度偏移， 计算结果-偏移量
   resizeHeightOffset?: number
   // 选择table组件类型，antd 或 vxe
-  tableComponent?: string
+  tableComponent?: string,
+  // vxe 空数据表格的默认高度
+  autoHeight?: number,
   // 在分页改变的时候清空选项
   clearSelectOnPageChange?: boolean
   //
diff --git a/src/components/importExcel/index.vue b/src/components/importExcel/index.vue
index dd1e62d7..95b5c01a 100644
--- a/src/components/importExcel/index.vue
+++ b/src/components/importExcel/index.vue
@@ -18,7 +18,6 @@
 </template>
 
 <script lang="ts" setup name="ImportExcel">
-  import { defineProps, defineEmits } from 'vue'
   import * as XLSX from 'xlsx'
   // 引入提示信息
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/settings/componentSetting.ts b/src/settings/componentSetting.ts
index 89362c75..9c52d7af 100644
--- a/src/settings/componentSetting.ts
+++ b/src/settings/componentSetting.ts
@@ -1,3 +1,8 @@
+/*
+ * @Desc: 
+ * @Author: lijj
+ * @Date: 2024-08-15 17:49:19
+ */
 // Used to configure the general configuration of some components without modifying the components
 
 import type { SorterResult } from '../components/Table'
@@ -18,7 +23,7 @@ export default {
       totalField: 'total',
     },
     // Number of pages that can be selected
-    pageSizeOptions: ['10', '20', '50', '80', '100'],
+    pageSizeOptions: ['20', '50', '80', '100', '500'],
     // Default display quantity on one page
     defaultPageSize: 100,
     // Default Size
diff --git a/src/views/approve/fee/components/AlterNewValue.vue b/src/views/approve/fee/components/AlterNewValue.vue
index 4ae87cc8..90eb4a28 100644
--- a/src/views/approve/fee/components/AlterNewValue.vue
+++ b/src/views/approve/fee/components/AlterNewValue.vue
@@ -28,7 +28,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
+  import { onMounted, ref } from 'vue'
   import { GetModifyValue } from '../api'
   const props = defineProps({
     // 勾选中的id
diff --git a/src/views/approve/fee/components/feeActionBar.vue b/src/views/approve/fee/components/feeActionBar.vue
index cdd21cd5..5c8c9611 100644
--- a/src/views/approve/fee/components/feeActionBar.vue
+++ b/src/views/approve/fee/components/feeActionBar.vue
@@ -39,7 +39,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
+  import { onMounted, ref } from 'vue'
   import FlowChart from '/@/components/FlowChart/index.vue'
   import FeeRejectModal from './feeRejectModal.vue'
   import { useModal } from '/@/components/Modal'
diff --git a/src/views/approve/fee/components/mainActionBar.vue b/src/views/approve/fee/components/mainActionBar.vue
index 26d5c9b7..5d254ac2 100644
--- a/src/views/approve/fee/components/mainActionBar.vue
+++ b/src/views/approve/fee/components/mainActionBar.vue
@@ -53,7 +53,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineProps, watch, defineEmits, defineExpose } from 'vue'
+  import { onMounted, ref, watch } from 'vue'
   import { Divider } from 'ant-design-vue'
   import { SvgIcon } from '/@/components/Icon'
   import { AuditByBiz } from '../api'
diff --git a/src/views/approve/paid/components/calcTable.vue b/src/views/approve/paid/components/calcTable.vue
index d3cee099..ac7b74a6 100644
--- a/src/views/approve/paid/components/calcTable.vue
+++ b/src/views/approve/paid/components/calcTable.vue
@@ -29,7 +29,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, defineProps, watch, defineExpose, defineEmits } from 'vue'
+  import { onMounted, watch } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { columns } from './calcTable'
   import { GetStat } from '../api'
diff --git a/src/views/approve/paid/components/feeActionBar.vue b/src/views/approve/paid/components/feeActionBar.vue
index 516bbb49..12a62346 100644
--- a/src/views/approve/paid/components/feeActionBar.vue
+++ b/src/views/approve/paid/components/feeActionBar.vue
@@ -39,7 +39,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
+  import { onMounted, ref } from 'vue'
   import FlowChart from '/@/components/FlowChart/index.vue'
   import FeeRejectModal from './feeRejectModal.vue'
   import { useModal } from '/@/components/Modal'
diff --git a/src/views/approve/paid/components/feeTable.vue b/src/views/approve/paid/components/feeTable.vue
index 68c91f08..9222baaf 100644
--- a/src/views/approve/paid/components/feeTable.vue
+++ b/src/views/approve/paid/components/feeTable.vue
@@ -36,7 +36,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, defineProps, watch, defineExpose, defineEmits } from 'vue'
+  import { onMounted, ref, defineProps, watch } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { columns } from '/@/views/operation/paidApply/detail/components/applyInfoColumns'
diff --git a/src/views/approve/paid/components/mainActionBar.vue b/src/views/approve/paid/components/mainActionBar.vue
index bdc82da7..f45ae53f 100644
--- a/src/views/approve/paid/components/mainActionBar.vue
+++ b/src/views/approve/paid/components/mainActionBar.vue
@@ -47,7 +47,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, defineProps, watch, defineEmits } from 'vue'
+  import { onMounted, ref, watch } from 'vue'
   import { Audit, OneClickAudit } from '../api'
   import emitter from '/@/utils/Bus'
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/views/baseinfo/columnset/api.ts b/src/views/baseinfo/columnset/api.ts
index d3845740..05832cbb 100644
--- a/src/views/baseinfo/columnset/api.ts
+++ b/src/views/baseinfo/columnset/api.ts
@@ -10,6 +10,7 @@ const Api = {
   edit: '/mainApi/ColumnSet/EditColumnSet',
   newColunm: '/mainApi/ColumnSet/GetColumnSetInfoByModule',
   del: '/mainApi/ColumnSet/BatchDelColumnSet',
+  UpdateColumnSetField: '/mainApi/ColumnSet/UpdateColumnSetField'
 }
 // 列表数据
 export function getColumnSetList(data: PageRequest) {
@@ -44,4 +45,12 @@ export function ApiDel(data: PageRequest) {
     method: 'post',
     data,
   })
-}
\ No newline at end of file
+}
+// 更新列宽
+export function UpdateColumnSetField(data: PageRequest) {
+  return request<DataResult>({
+    url: Api.UpdateColumnSetField,
+    method: 'post',
+    data,
+  })
+}
diff --git a/src/views/baseinfo/formcopy/components/Modal copy.vue b/src/views/baseinfo/formcopy/components/Modal copy.vue
index 51225855..906dd17f 100644
--- a/src/views/baseinfo/formcopy/components/Modal copy.vue	
+++ b/src/views/baseinfo/formcopy/components/Modal copy.vue	
@@ -103,7 +103,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, unref, reactive, defineEmits } from 'vue'
+  import { ref, unref, reactive } from 'vue'
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { EditFormCopy, getCodeGoodsTypeInfo, getTablesByClient, getColumnsByClient } from '../api'
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/views/baseinfo/formcopy/components/Modal.vue b/src/views/baseinfo/formcopy/components/Modal.vue
index ca4afc59..61560c21 100644
--- a/src/views/baseinfo/formcopy/components/Modal.vue
+++ b/src/views/baseinfo/formcopy/components/Modal.vue
@@ -152,7 +152,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, unref, reactive, defineEmits } from 'vue'
+  import { ref, unref, reactive } from 'vue'
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import {
     EditFormCopy,
diff --git a/src/views/baseinfo/formset/component/FormModel.vue b/src/views/baseinfo/formset/component/FormModel.vue
index 302469ef..53419c45 100644
--- a/src/views/baseinfo/formset/component/FormModel.vue
+++ b/src/views/baseinfo/formset/component/FormModel.vue
@@ -45,7 +45,7 @@
   <!-- <Modal v-if="ModalType" :schema-arr="schemaArr" @register="register" @contentOk="contentOk" /> -->
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, defineEmits } from 'vue'
+  import { ref, computed, unref } from 'vue'
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { editCodeGoodsType, getCodeGoodsTypeInfo } from './../api'
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/views/finance/feeSettlement/detail/invoiceTable.vue b/src/views/finance/feeSettlement/detail/invoiceTable.vue
index bfe49863..b2269457 100644
--- a/src/views/finance/feeSettlement/detail/invoiceTable.vue
+++ b/src/views/finance/feeSettlement/detail/invoiceTable.vue
@@ -130,7 +130,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
+import { onMounted, ref, reactive, watch, h } from 'vue'
 import { BasicTable, useTable } from '/@/components/Table'
 import {
   InvoiceSettlementGetInvoiceList, InvoiceSettlementGetInvoiceDetails, PaymentFreeSettlementGetFees,
diff --git a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue
index 9a84a9d0..49d34aa8 100644
--- a/src/views/finance/paymentSettlement/detail/components/applyInfo.vue
+++ b/src/views/finance/paymentSettlement/detail/components/applyInfo.vue
@@ -51,7 +51,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
+  import { onMounted, ref, watch } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { mainBusinessColumns } from '../columns'
   import { Divider } from 'ant-design-vue'
diff --git a/src/views/finance/paymentSettlement/detail/components/businessTable.vue b/src/views/finance/paymentSettlement/detail/components/businessTable.vue
index 7525beaa..98957674 100644
--- a/src/views/finance/paymentSettlement/detail/components/businessTable.vue
+++ b/src/views/finance/paymentSettlement/detail/components/businessTable.vue
@@ -69,7 +69,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
+  import { onMounted, ref, reactive, h } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { GetApplicationList, Save, GetExchanges } from '../../api'
   import { businessColumns, searchFormSchema, currencyFormSchema } from '../columns'
diff --git a/src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue b/src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue
index f6c2729b..7c889284 100644
--- a/src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue
+++ b/src/views/finance/paymentSettlement/paymentSettlementFree/invoiceTable.vue
@@ -129,7 +129,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
+import { onMounted, ref } from 'vue'
 import { BasicTable, useTable } from '/@/components/Table'
 import {
   InvoiceSettlementGetInvoiceList, InvoiceSettlementGetInvoiceDetails, PaymentFreeSettlementGetFees,
diff --git a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
index 117acfaa..9b145ec4 100644
--- a/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
+++ b/src/views/financialTax/expenseAccount/detail/components/SearchTable.vue
@@ -55,7 +55,7 @@
   </a-modal>
 </template>
 <script lang="ts" setup>
-  import { ref, defineEmits, computed, watch, unref } from 'vue'
+  import { ref, computed, watch, unref } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { columns, searchFormSchema } from './columns'
   import { GetInvoiceList } from '../../api'
diff --git a/src/views/operation/invoiceApply/detail/feeTable.vue b/src/views/operation/invoiceApply/detail/feeTable.vue
index 331e0413..7176c135 100644
--- a/src/views/operation/invoiceApply/detail/feeTable.vue
+++ b/src/views/operation/invoiceApply/detail/feeTable.vue
@@ -95,8 +95,6 @@
 </template>
 <script lang="ts" setup>
 import {
-  defineProps,
-  defineEmits,
   ref,
   watch,
   watchEffect,
diff --git a/src/views/operation/paidApply/components/tableActionBar.vue b/src/views/operation/paidApply/components/tableActionBar.vue
index f8ad9a41..deb8677b 100644
--- a/src/views/operation/paidApply/components/tableActionBar.vue
+++ b/src/views/operation/paidApply/components/tableActionBar.vue
@@ -27,7 +27,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, defineProps, reactive, defineEmits } from 'vue'
+  import { ref, defineProps, reactive } from 'vue'
   import { useGo } from '/@/hooks/web/usePage'
   import { SvgIcon } from '/@/components/Icon'
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/views/operation/paidApply/detail/components/applyInfo.vue b/src/views/operation/paidApply/detail/components/applyInfo.vue
index d0637977..3da99419 100644
--- a/src/views/operation/paidApply/detail/components/applyInfo.vue
+++ b/src/views/operation/paidApply/detail/components/applyInfo.vue
@@ -61,7 +61,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
+  import { onMounted, ref, watch } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { columns } from './applyInfoColumns'
   import invoiceFile from '/@/views/operation/invoiceIssue/detail/invoiceFile.vue'
diff --git a/src/views/operation/paidApply/detail/components/businessTable.vue b/src/views/operation/paidApply/detail/components/businessTable.vue
index 16233561..6616d4a6 100644
--- a/src/views/operation/paidApply/detail/components/businessTable.vue
+++ b/src/views/operation/paidApply/detail/components/businessTable.vue
@@ -95,7 +95,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, reactive, watch, defineExpose, defineProps, defineEmits, h } from 'vue'
+  import { onMounted, ref, reactive, watch } from 'vue'
   import { BasicTable, useTable } from '/@/components/Table'
   import { GetBizList, GetCurrencies, BizSave } from '../../api'
   import { businessColumns, searchFormSchema, currencyFormSchema } from '../columns'
diff --git a/src/views/operation/paidApply/detail/components/exchangeRate.vue b/src/views/operation/paidApply/detail/components/exchangeRate.vue
index f299d09e..079eca7c 100644
--- a/src/views/operation/paidApply/detail/components/exchangeRate.vue
+++ b/src/views/operation/paidApply/detail/components/exchangeRate.vue
@@ -40,7 +40,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { onMounted, ref, defineEmits, defineProps, watch, defineExpose } from 'vue'
+  import { ref } from 'vue'
   import { GetExchangeRate } from '../../api'
   const emit = defineEmits(['submit'])
   const visible = ref(false)
diff --git a/src/views/operation/paidApply/detail/index.vue b/src/views/operation/paidApply/detail/index.vue
index cc5ae555..540441ae 100644
--- a/src/views/operation/paidApply/detail/index.vue
+++ b/src/views/operation/paidApply/detail/index.vue
@@ -131,7 +131,7 @@
   const status = ref(0)
   // 保存
   const save = async (feeInfo) => {
-    const postData = await getFieldsValue()
+    const postData = await validate()
     if (feeInfo && feeInfo.length) {
       postData['details'] = [...feeData.value, ...feeInfo]
     } else {
diff --git a/src/views/operation/seaexport/detail/components/container.vue b/src/views/operation/seaexport/detail/components/container.vue
index 414c54e3..c635dbbd 100644
--- a/src/views/operation/seaexport/detail/components/container.vue
+++ b/src/views/operation/seaexport/detail/components/container.vue
@@ -41,7 +41,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, nextTick, defineProps, defineComponent, onMounted, defineExpose, watch, defineEmits } from 'vue'
+  import { ref, nextTick, defineComponent, onMounted, watch } from 'vue'
   import { HotTable } from '@handsontable/vue3'
   import 'handsontable/dist/handsontable.full.min.css'
   import { GetOpCtnList, BatchDelBillManageCtn } from '/@/views/operation/seaexport/api/BookingLedger'
diff --git a/src/views/operation/seaexport/detail/components/storageSpace.vue b/src/views/operation/seaexport/detail/components/storageSpace.vue
index 721ba195..8484d072 100644
--- a/src/views/operation/seaexport/detail/components/storageSpace.vue
+++ b/src/views/operation/seaexport/detail/components/storageSpace.vue
@@ -12,7 +12,7 @@
   </a-modal>
 </template>
 <script lang="ts" setup>
-import { defineExpose, ref, defineProps, defineEmits } from 'vue'
+import { ref } from 'vue'
 import { BasicTable, useTable } from '/@/components/Table'
 import { GetAvailableBookingSlots, BringInBookingSlotToOrder } from '../../api/BookingLedger.js'
 import { storageColumns, storageSearchFormSchema } from './ladingInfo'
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue
index 835a22c0..7615a8fd 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessYardEdit.vue
@@ -40,7 +40,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-  import { ref, watch, defineExpose, defineEmits } from 'vue'
+  import { ref, watch } from 'vue'
   import { SvgIcon } from '/@/components/Icon'
   import { BasicForm, useForm } from '/@/components/Form/index'
   // 打印组件
diff --git a/src/views/operation/seaexport/detail/modules/PersonModal.vue b/src/views/operation/seaexport/detail/modules/PersonModal.vue
index ca7ab695..90a06956 100644
--- a/src/views/operation/seaexport/detail/modules/PersonModal.vue
+++ b/src/views/operation/seaexport/detail/modules/PersonModal.vue
@@ -32,7 +32,7 @@
   </BasicModal>
 </template>
 <script lang="ts" setup>
-  import { ref, computed, unref, defineEmits, onMounted } from 'vue'
+  import { ref, computed, unref, onMounted } from 'vue'
   // 弹窗组件
   import { BasicModal, useModalInner } from '/@/components/Modal'
   import { BasicForm, useForm } from '/@/components/Form/index'
diff --git a/src/views/operation/seaexport/detail/modules/basicInfo.vue b/src/views/operation/seaexport/detail/modules/basicInfo.vue
index b062831e..6df20e04 100644
--- a/src/views/operation/seaexport/detail/modules/basicInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/basicInfo.vue
@@ -136,7 +136,7 @@
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { basicInfoFormSchema, basicInfoFormAllSchema } from './baseInfo.tsx'
-  import { ref, watch, onMounted, reactive, getCurrentInstance, defineEmits } from 'vue'
+  import { ref, watch, onMounted, reactive, getCurrentInstance } from 'vue'
   import { useMessage } from '/@/hooks/web/useMessage'
   import emitter from '/@/utils/Bus'
   const { createMessage } = useMessage()
diff --git a/src/views/operation/seaexport/detail/modules/contactList.vue b/src/views/operation/seaexport/detail/modules/contactList.vue
index cc5906ec..d46bb32a 100644
--- a/src/views/operation/seaexport/detail/modules/contactList.vue
+++ b/src/views/operation/seaexport/detail/modules/contactList.vue
@@ -45,7 +45,7 @@
 </template>
 
 <script lang="ts" setup>
-  import { ref, defineEmits, watch, onMounted, onUnmounted } from 'vue'
+  import { ref, watch, onMounted } from 'vue'
   import emitter from '/@/utils/Bus'
   import { personColumns } from './baseInfo.tsx'
   import { BasicTable, useTable, TableAction } from '/@/components/Table'
diff --git a/src/views/operation/seaexport/detail/modules/noteInfo.vue b/src/views/operation/seaexport/detail/modules/noteInfo.vue
index c0272c78..4d262316 100644
--- a/src/views/operation/seaexport/detail/modules/noteInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/noteInfo.vue
@@ -15,7 +15,7 @@
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { noteFormSchema } from './baseInfo.tsx'
   import emitter from '/@/utils/Bus'
-  import { ref, watch, defineProps, defineExpose, onMounted, onUnmounted, defineEmits } from 'vue'
+  import { ref, watch, onMounted, onUnmounted } from 'vue'
   import { useRoute } from 'vue-router'
   const route = useRoute()
   // 判断页面来源
diff --git a/src/views/operation/seaexport/detail/modules/otherInfo.vue b/src/views/operation/seaexport/detail/modules/otherInfo.vue
index e4a27732..c1cc5f67 100644
--- a/src/views/operation/seaexport/detail/modules/otherInfo.vue
+++ b/src/views/operation/seaexport/detail/modules/otherInfo.vue
@@ -54,7 +54,7 @@
 <script lang="ts" setup>
   import { BasicForm, useForm } from '/@/components/Form/index'
   import { otherInfoFormSchema } from './baseInfo.tsx'
-  import { ref, watch, defineEmits, computed, onMounted, onUnmounted } from 'vue'
+  import { ref, watch, computed, onMounted, onUnmounted } from 'vue'
   import emitter from '/@/utils/Bus'
   import { useMessage } from '/@/hooks/web/useMessage'
   import { getDictOption } from '/@/utils/dictUtil'
diff --git a/src/views/operation/seaexport/detail/modules/rightContent.vue b/src/views/operation/seaexport/detail/modules/rightContent.vue
index 0f4a5e3a..abc29feb 100644
--- a/src/views/operation/seaexport/detail/modules/rightContent.vue
+++ b/src/views/operation/seaexport/detail/modules/rightContent.vue
@@ -485,7 +485,7 @@
     EditSeaExportRemark,
     DelSeaExportRemark
   } from '/@/views/operation/seaexport/api/BookingLedger'
-  import { ref, Ref, watch, defineEmits, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
+  import { ref, Ref, watch, onMounted, onUnmounted, defineAsyncComponent } from 'vue'
   // 字典
   import { getDictOption } from '/@/utils/dictUtil'
 
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index 25575220..9df20438 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -335,6 +335,8 @@ import { formatParams } from '/@/hooks/web/common'
 const appStore = useAppStore()
 const { createMessage } = useMessage()
 const go = useGo()
+// 空数据表格高度
+const tbHeight = window.innerHeight - 310
 // 合计列
 const calcColumns = [
   {
@@ -428,7 +430,7 @@ console.log(columns)
 const fieldFlag = ref(true)
 // 合计数据
 const calcData = ref([{}])
-const [registerTable, { reload, getVxeSelectRows, setLoading, setColumns }] = useTable({
+const [registerTable, { reload, getVxeSelectRows, setLoading }] = useTable({
   title: '',
   api: async (p) => {
     // queryData.value = p
@@ -510,6 +512,7 @@ const [registerTable, { reload, getVxeSelectRows, setLoading, setColumns }] = us
   resizeHeightOffset: 75,
   immediate: false,
   tableComponent: 'vxe',
+  autoHeight: tbHeight,
   id: '0',
   actionColumn: {
     width: 60,
diff --git a/src/views/system/CodeDataRuleTemplate/columnView.vue b/src/views/system/CodeDataRuleTemplate/columnView.vue
index b75c0fad..5ecf6ca3 100644
--- a/src/views/system/CodeDataRuleTemplate/columnView.vue
+++ b/src/views/system/CodeDataRuleTemplate/columnView.vue
@@ -126,9 +126,6 @@ import {
   PropType,
   ref,
   watchEffect,
-  defineProps,
-  defineEmits,
-  defineExpose,
   unref,
   watch,
   reactive,
diff --git a/src/views/taskmanage/taskList/BLConfirmation/container.vue b/src/views/taskmanage/taskList/BLConfirmation/container.vue
index db97d67c..c3eccd46 100644
--- a/src/views/taskmanage/taskList/BLConfirmation/container.vue
+++ b/src/views/taskmanage/taskList/BLConfirmation/container.vue
@@ -43,12 +43,8 @@
   import {
     ref,
     nextTick,
-    defineProps,
-    defineComponent,
     onMounted,
-    defineExpose,
-    watch,
-    defineEmits,
+    watch
   } from 'vue'
   import { HotTable } from '@handsontable/vue3'
   import { registerAllModules } from 'handsontable/registry'