From ee73d55ef2f71728427a3f5ea50ecf1aaaa55b15 Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Wed, 13 Nov 2024 12:45:42 +0800
Subject: [PATCH] vxe

---
 src/components/Table/src/BasicTable.vue       | 13 ++++----
 src/layouts/page/index.vue                    |  2 ++
 .../infoclient/FeeCustTemplate/columns.tsx    |  4 +--
 src/views/fee/FeeCustTemplate/columns.tsx     |  6 ++--
 src/views/finance/paymentSettlement/index.vue | 31 ++++++++++---------
 src/views/operation/seaexport/columns.tsx     |  4 +--
 .../operation/seaexport/detail/index.vue      |  2 +-
 .../modules/Letter/OpBusinessTruckColumns.tsx |  2 +-
 .../seaexport/detail/modules/baseInfo.tsx     | 14 ++++-----
 src/views/operation/seaexport/index.vue       |  4 +--
 10 files changed, 42 insertions(+), 40 deletions(-)

diff --git a/src/components/Table/src/BasicTable.vue b/src/components/Table/src/BasicTable.vue
index 4422378c..c6fce129 100644
--- a/src/components/Table/src/BasicTable.vue
+++ b/src/components/Table/src/BasicTable.vue
@@ -36,7 +36,7 @@
         :height="tableHeightRef + 35"
         :row-config="{ isCurrent: true, isHover: true }"
         :column-config="{ resizable: true }"
-        :scroll-y="{ enabled: true, gt: 0 }"
+        :scroll-y="{ enabled: true, gt: 15 }"
         :scroll-x="{ enabled: true, gt: 0 }"
         :sort-config="{ trigger: 'cell', remote: true }"
         rowSelection
@@ -45,6 +45,7 @@
         @cell-dblclick="dbclickVxeRow"
         @sort-change="sortChangeEvent"
         @resizable-change="resizableChangeEvent"
+        
       >
         <template #empty>
           <div>
@@ -106,7 +107,7 @@
 </template>
 <script lang="ts">
 import type { BasicTableProps, TableActionType, SizeType, ColumnChangeParam } from './types/table'
-import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect, watch } from 'vue'
+import { defineComponent, ref, computed, unref, toRaw, inject, watchEffect, watch, onUnmounted } from 'vue'
 import { Table, Pagination } from 'ant-design-vue'
 import { BasicForm, useForm } from '/@/components/Form/index'
 import { PageWrapperFixedHeightKey } from '/@/components/Page'
@@ -458,10 +459,9 @@ export default defineComponent({
       })
       setColumns(data)
     }
-    // 初始化列设置
-    const initColSet = () => {
-      
-    }
+    onUnmounted(() => {
+      console.log(111111111111111)
+    })
     // vxe服务端筛选
     // const filterChangeEvent = ({ filterList }) => {
     //   console.log(filterList)
@@ -492,7 +492,6 @@ export default defineComponent({
       dbclickVxeRow,
       redoHeight,
       fetch,
-      initColSet,
       getFormProps: getFormProps as any,
       replaceFormSlotKey,
       getFormSlotKeys,
diff --git a/src/layouts/page/index.vue b/src/layouts/page/index.vue
index 9b3f6c49..f461eee5 100644
--- a/src/layouts/page/index.vue
+++ b/src/layouts/page/index.vue
@@ -48,6 +48,8 @@
       const tabStore = useMultipleTabStore()
 
       const { getOpenKeepAlive } = useRootSetting()
+      console.log(getOpenKeepAlive.value)
+      console.log(getShowMultipleTab.value)
 
       const { getBasicTransition, getEnableTransition } = useTransitionSetting()
 
diff --git a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
index e9747d1d..035c2ab6 100644
--- a/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
+++ b/src/views/baseinfo/infoclient/FeeCustTemplate/columns.tsx
@@ -613,7 +613,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'Booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -1006,7 +1006,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'Booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
diff --git a/src/views/fee/FeeCustTemplate/columns.tsx b/src/views/fee/FeeCustTemplate/columns.tsx
index faf31b61..37ac502f 100644
--- a/src/views/fee/FeeCustTemplate/columns.tsx
+++ b/src/views/fee/FeeCustTemplate/columns.tsx
@@ -638,7 +638,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'Booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -920,7 +920,7 @@ export const viewSearchFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'Booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
@@ -1321,7 +1321,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'Booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'id',
diff --git a/src/views/finance/paymentSettlement/index.vue b/src/views/finance/paymentSettlement/index.vue
index b703e032..4351594c 100644
--- a/src/views/finance/paymentSettlement/index.vue
+++ b/src/views/finance/paymentSettlement/index.vue
@@ -42,18 +42,15 @@
           </div>
         </div>
       </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: handleEdit.bind(null, record),
-              }
-            ]"
-          />
-        </template>
+      <template v-slot:tableAction="{ record }">
+        <a-tooltip placement="top" :mouseEnterDelay="0.5">
+          <template #title>
+            <span>编辑</span>
+          </template>
+          <a-button type="link" @click="handleEdit(record)">
+            <span class="iconfont icon-icon_519"></span>
+          </a-button>
+        </a-tooltip>
       </template>
     </BasicTable>
   </div>
@@ -68,9 +65,11 @@
   import { columns, searchFormSchema } from './columns'
   import { numberThousandFormat } from '/@/utils/commonUtil'
   import { useMessage } from '/@/hooks/web/useMessage'
+  // 空数据表格高度
+  const tbHeight = window.innerHeight - 250
   const { createMessage } = useMessage()
   const go = useGo()
-  const [registerTable, { reload, getForm, getSelectRows }] = useTable({
+  const [registerTable, { reload, getForm, getVxeSelectRows }] = useTable({
     title: '',
     api: async (p) => {
       const res: API.DataResult = await GetList(p)
@@ -107,9 +106,11 @@
     },
     canResize: true,
     resizeHeightOffset: 15,
+    tableComponent: 'vxe',
+    autoHeight: tbHeight,
     immediate: true,
     actionColumn: {
-      width: 80,
+      width: 60,
       title: '操作',
       dataIndex: 'action',
       fixed: 'right'
@@ -117,7 +118,7 @@
   })
   // 删除
   function deleteRow() {
-    const rows = getSelectRows()
+    const rows = getVxeSelectRows()
     if (rows.length == 0) return createMessage.warning('请勾选要删除的结算申请单！')
     const ids = rows.map(item => {
       return item.id
diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx
index 923880e4..a36d6bc8 100644
--- a/src/views/operation/seaexport/columns.tsx
+++ b/src/views/operation/seaexport/columns.tsx
@@ -302,7 +302,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: () => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'contract' },
+        params: { code: 'isContract' },
         labelField: 'pinYinCode',
         valueField: 'id',
         showName: 'shortName',
@@ -327,7 +327,7 @@ export const searchFormSchema: FormSchema[] = [
     componentProps: () => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         valueField: 'forwarderId',
         showName: 'description',
diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue
index ba17872c..eb236611 100644
--- a/src/views/operation/seaexport/detail/index.vue
+++ b/src/views/operation/seaexport/detail/index.vue
@@ -174,7 +174,7 @@
   </div>
 </template>
 
-<script lang="ts" setup>
+<script lang="ts" setup name="海运出口-详情">
   import { ref, computed, nextTick, onMounted, onUnmounted, defineAsyncComponent, watch } from 'vue'
   import { useAppStore } from '/@/store/modules/app'
   import { useMessage } from '/@/hooks/web/useMessage'
diff --git a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
index ffff6f35..98fe3637 100644
--- a/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
+++ b/src/views/operation/seaexport/detail/modules/Letter/OpBusinessTruckColumns.tsx
@@ -276,7 +276,7 @@ export const formSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'truck' },
+        params: { code: 'isTruck' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
index c56dd3b8..da079d3e 100644
--- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx
+++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx
@@ -214,7 +214,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel, formActionType }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'contract' },
+        params: { code: 'isContract' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'shortName',
@@ -327,7 +327,7 @@ export const basicInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'booking' },
+        params: { code: 'isBooking' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2748,7 +2748,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'truck' },
+        params: { code: 'isTruck' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
@@ -2782,7 +2782,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'agent' },
+        params: { code: 'isAgent' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2811,7 +2811,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'yard' },
+        params: { code: 'isYard' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2846,7 +2846,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'shipagency' },
+        params: { code: 'isShipagency' },
         labelField: 'pinYinCode',
         showName: 'description',
         valueField: 'shortName',
@@ -2881,7 +2881,7 @@ export const otherInfoFormSchema: FormSchema[] = [
     componentProps: ({ formModel }) => {
       return {
         api: GetSupplierListByCode,
-        params: { code: 'custom' },
+        params: { code: 'isCustom' },
         labelField: 'pinYinCode',
         valueField: 'shortName',
         showName: 'description',
diff --git a/src/views/operation/seaexport/index.vue b/src/views/operation/seaexport/index.vue
index d566bcd3..8a71ea3c 100644
--- a/src/views/operation/seaexport/index.vue
+++ b/src/views/operation/seaexport/index.vue
@@ -314,7 +314,7 @@
   </div>
 </template>
 <script lang="ts" setup name="订单管理">
-import { ref, defineAsyncComponent, onActivated } from 'vue'
+import { ref, defineAsyncComponent, onActivated, onMounted } from 'vue'
 const TableActionBar = defineAsyncComponent(() => import("./components/tableActionBar.vue"))
 import { CheckCircleFilled, CloseCircleFilled, RedoOutlined } from '@ant-design/icons-vue'
 const tableActionBarRight = defineAsyncComponent(() => import("./components/tableActionBarRight.vue"))
@@ -652,7 +652,7 @@ function compareSuccess() {
   setLoading(false);
   reload()
 }
-onActivated(() => {
+onMounted(() => {
   //初始化
   reload()
 })