From d128f8b116917aceb6fbd5f5cfcdb62eba05558e Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Tue, 12 Nov 2024 10:59:24 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8D=B1=E9=99=A9=E5=93=81=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Form/src/BasicForm.vue                 |  2 +-
 src/components/Table/src/BasicTable.vue               | 11 ++++++-----
 src/components/Table/src/props.ts                     |  5 +++++
 src/views/operation/paidApply/detail/index.vue        |  2 +-
 .../operation/seaexport/components/tableActionBar.vue |  2 +-
 src/views/operation/seaexport/index.vue               |  8 +-------
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/src/components/Form/src/BasicForm.vue b/src/components/Form/src/BasicForm.vue
index 00e2c993..f5f0246a 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-show="getFormItemVisible(schema)"
+          v-if="getFormItemVisible(schema)"
           :is-advanced="fieldsIsAdvancedMap[schema.field]"
           :table-action="tableAction"
           :form-action-type="formActionType"
diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 10778fa7..8ec9e224 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -107,7 +107,7 @@
 </template>
 <script lang="ts">
 import type { BasicTableProps, TableActionType, SizeType, ColumnChangeParam } from './types/table'
-import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect, onMounted } from 'vue'
+import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect, onMounted, watch } from 'vue'
 import { Table, Pagination } from 'ant-design-vue'
 import { BasicForm, useForm } from '/@/components/Form/index'
 import { PageWrapperFixedHeightKey } from '/@/components/Page'
@@ -180,6 +180,7 @@ export default defineComponent({
     const [registerForm, formActions] = useForm()
 
     const getProps = computed(() => {
+      console.log(props.tableComponent)
       return { ...props, ...unref(innerPropsRef) } as BasicTableProps
     })
 
@@ -191,7 +192,6 @@ export default defineComponent({
           "'canResize' of BasicTable may not work in PageWrapper with 'fixedHeight' (especially in hot updates)",
         )
     })
-
     const { getLoading, setLoading } = useLoading(getProps)
     const {
       getPaginationInfo,
@@ -362,6 +362,7 @@ export default defineComponent({
     const vxeSetId = ref('0')
     // vxe 列设置数据查询
     const getVxeColSetData = () => {
+      console.log(props)
       if (props.id) {
         getColumnSetInfoByModule({ permissionId: permissionsInfo().permissionId, columnNo: props.id }).then(res => {
           const { data } = res
@@ -450,9 +451,9 @@ export default defineComponent({
       })
       setColumns(data)
     }
-    onMounted(() => {
-      getVxeColSetData()
-    })
+    // onMounted(() => {
+    //   getVxeColSetData()
+    // })
     // 初始化列设置
     const initColSet = () => {
       
diff --git a/src/components/Table/src/props.ts b/src/components/Table/src/props.ts
index 590707af..d638d953 100644
--- a/src/components/Table/src/props.ts
+++ b/src/components/Table/src/props.ts
@@ -162,4 +162,9 @@ export const basicProps = {
     type: Boolean,
     default: false
   },
+  // basicTable 使用的表格类型 antd TB 或 vxe
+  tableComponent: {
+    type: String,
+    default: 'normal'
+  }
 }
diff --git a/src/views/operation/paidApply/detail/index.vue b/src/views/operation/paidApply/detail/index.vue
index 540441ae..cc5ae555 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 validate()
+    const postData = await getFieldsValue()
     if (feeInfo && feeInfo.length) {
       postData['details'] = [...feeData.value, ...feeInfo]
     } else {
diff --git a/src/views/operation/seaexport/components/tableActionBar.vue b/src/views/operation/seaexport/components/tableActionBar.vue
index 3151b32f..c8052ff2 100644
--- a/src/views/operation/seaexport/components/tableActionBar.vue
+++ b/src/views/operation/seaexport/components/tableActionBar.vue
@@ -88,7 +88,7 @@ const props = defineProps({
   queryData: {
     type: Object,
     default: {},
-  },
+  }
 })
 // 新建
 function addBooking() {
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index c7f32cd7..e3b61b15 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -434,12 +434,6 @@ const calcData = ref([{}])
 const [registerTable, { reload, getVxeSelectRows, setLoading }] = useTable({
   title: '',
   api: async (p) => {
-    // queryData.value = p
-    // 如果存在改变的列，设置列
-    // if (fieldFlag.value) {
-    //   updateTableField(setColumns)
-    //   fieldFlag.value = false
-    // }
     const res: API.DataResult = await PageDataByBooking(p)
     calcData.value = [res.data?.dataTotal]
     return new Promise((resolve) => {
@@ -523,7 +517,7 @@ const [registerTable, { reload, getVxeSelectRows, setLoading }] = useTable({
   immediate: false,
   tableComponent: 'vxe',
   autoHeight: tbHeight,
-  id: '0',
+  id: '011',
   actionColumn: {
     width: 60,
     title: '操作',