From 38a4f44a0df37a3765f21c5cb0c32c929fa2c3cd Mon Sep 17 00:00:00 2001
From: lijingjia <lijj_xl@163.com>
Date: Fri, 15 Nov 2024 18:13:55 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=E6=8D=A2=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ContainerManagement/BuyCtn/index.vue      | 80 ++++++++++---------
 .../ContainerManagement/RentIn/index.vue      | 66 +++++++--------
 .../ContainerManagement/RentOut/index.vue     | 64 ++++++++-------
 .../ContainerManagement/SellCtn/index.vue     | 36 ++++-----
 .../ContainerManagement/StateChange/index.vue | 10 ++-
 5 files changed, 133 insertions(+), 123 deletions(-)

diff --git a/src/views/ContainerManagement/BuyCtn/index.vue b/src/views/ContainerManagement/BuyCtn/index.vue
index 717066cf..fa9dd5aa 100644
--- a/src/views/ContainerManagement/BuyCtn/index.vue
+++ b/src/views/ContainerManagement/BuyCtn/index.vue
@@ -2,42 +2,41 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="handleCreate">
-          <span class="iconfont icon-tianjia"></span>
-          新建
-        </a-button>
-        <a-popconfirm
-          title="确定删除当前选中数据？"
-          ok-text="是"
-          cancel-text="否"
-          @confirm="handleDel"
-        >
-          <a-button type="link">
-            <span class="iconfont icon-shanchu21"></span>
-            删除
+        <span>
+          <a-button type="link" @click="handleCreate">
+            <span class="iconfont icon-tianjia"></span>
+            新建
           </a-button>
-        </a-popconfirm>
-        <a-button type="link" @click="Confirm">
-          <span class="iconfont icon-yiwancheng2"></span>
-          确认执行
-        </a-button>
-        <a-button type="link" @click="Cancel">
-          <span class="iconfont icon-weiwancheng"></span>
-          取消确认
-        </a-button>
+          <a-popconfirm
+            title="确定删除当前选中数据？"
+            ok-text="是"
+            cancel-text="否"
+            @confirm="handleDel"
+          >
+            <a-button type="link">
+              <span class="iconfont icon-shanchu21"></span>
+              删除
+            </a-button>
+          </a-popconfirm>
+          <a-button type="link" @click="Confirm">
+            <span class="iconfont icon-yiwancheng2"></span>
+            确认执行
+          </a-button>
+          <a-button type="link" @click="Cancel">
+            <span class="iconfont icon-weiwancheng"></span>
+            取消确认
+          </a-button>
+        </span>
       </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: handleAudit.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="handleAudit(record)">
+            <span class="iconfont icon-icon_519"></span>
+          </a-button>
+        </a-tooltip>
       </template>
     </BasicTable>
 
@@ -56,7 +55,7 @@
   // 引入处理入参方法
   import { formatParams } from '/@/hooks/web/common'
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getSelectRows }] = useTable({
+  const [registerTable, { reload, getVxeSelectRows }] = useTable({
     title: '',
     api: async (p) => {
       const res: API.DataResult = await ApiList(p)
@@ -84,7 +83,7 @@
       width: 60,
     },
     canResize: true,
-    resizeHeightOffset: 35,
+    resizeHeightOffset: 15,
     immediate: true,
     actionColumn: {
       width: 80,
@@ -92,6 +91,9 @@
       dataIndex: 'action',
       fixed: 'right',
     },
+    tableComponent: 'vxe',
+    autoHeight: window.innerHeight - 250,
+    id: '0'
   })
   function handleCreate() {
     openModal(true, {
@@ -100,7 +102,7 @@
     })
   }
   function Confirm() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -119,7 +121,7 @@
     })
   }
   function Cancel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -139,7 +141,7 @@
   }
 
   function handleDel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       ids: [],
     }
diff --git a/src/views/ContainerManagement/RentIn/index.vue b/src/views/ContainerManagement/RentIn/index.vue
index 02c446bb..e080935d 100644
--- a/src/views/ContainerManagement/RentIn/index.vue
+++ b/src/views/ContainerManagement/RentIn/index.vue
@@ -2,21 +2,23 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="handleCreate">
-          <span class="iconfont icon-tianjia"></span>
-          新建
-        </a-button>
-        <a-popconfirm
-          title="确定删除当前选中数据？"
-          ok-text="是"
-          cancel-text="否"
-          @confirm="handleDel"
-        >
-          <a-button type="link">
-            <span class="iconfont icon-shanchu21"></span>
-            删除
+        <span>
+          <a-button type="link" @click="handleCreate">
+            <span class="iconfont icon-tianjia"></span>
+            新建
           </a-button>
-        </a-popconfirm>
+          <a-popconfirm
+            title="确定删除当前选中数据？"
+            ok-text="是"
+            cancel-text="否"
+            @confirm="handleDel"
+          >
+            <a-button type="link">
+              <span class="iconfont icon-shanchu21"></span>
+              删除
+            </a-button>
+          </a-popconfirm>
+        </span>
         <!-- <a-button type="link" @click="Confirm">
           <span class="iconfont icon-yiwancheng2"></span>
           确认执行
@@ -26,21 +28,17 @@
           取消确认
         </a-button> -->
       </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: handleAudit.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="handleAudit(record)">
+            <span class="iconfont icon-icon_519"></span>
+          </a-button>
+        </a-tooltip>
       </template>
     </BasicTable>
-
     <TenantAuditStepModal @register="registerModal" @success="handleSuccess" />
   </div>
 </template>
@@ -55,8 +53,9 @@
   const { notification } = useMessage()
   // 引入处理入参方法
   import { formatParams } from '/@/hooks/web/common'
+  const tbHeight = window.innerHeight - 250
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getSelectRows }] = useTable({
+  const [registerTable, { reload, getVxeSelectRows }] = useTable({
     title: '',
     api: async (p) => {
       const res: API.DataResult = await ApiList(p)
@@ -84,7 +83,9 @@
       width: 60,
     },
     canResize: true,
-    resizeHeightOffset: 35,
+    resizeHeightOffset: 15,
+    tableComponent: 'vxe',
+    autoHeight: tbHeight,
     immediate: true,
     actionColumn: {
       width: 80,
@@ -92,6 +93,7 @@
       dataIndex: 'action',
       fixed: 'right',
     },
+    id: '0'
   })
   function handleCreate() {
     openModal(true, {
@@ -100,7 +102,7 @@
     })
   }
   function Confirm() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -119,7 +121,7 @@
     })
   }
   function Cancel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -139,7 +141,7 @@
   }
 
   function handleDel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       ids: [],
     }
diff --git a/src/views/ContainerManagement/RentOut/index.vue b/src/views/ContainerManagement/RentOut/index.vue
index f8334031..9e4e40ec 100644
--- a/src/views/ContainerManagement/RentOut/index.vue
+++ b/src/views/ContainerManagement/RentOut/index.vue
@@ -2,21 +2,23 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable" @row-dbClick="handleAudit">
       <template #tableTitle>
-        <a-button type="link" @click="handleCreate">
-          <span class="iconfont icon-tianjia"></span>
-          新建
-        </a-button>
-        <a-popconfirm
-          title="确定删除当前选中数据？"
-          ok-text="是"
-          cancel-text="否"
-          @confirm="handleDel"
-        >
-          <a-button type="link">
-            <span class="iconfont icon-shanchu21"></span>
-            删除
+        <span>
+          <a-button type="link" @click="handleCreate">
+            <span class="iconfont icon-tianjia"></span>
+            新建
           </a-button>
-        </a-popconfirm>
+          <a-popconfirm
+            title="确定删除当前选中数据？"
+            ok-text="是"
+            cancel-text="否"
+            @confirm="handleDel"
+          >
+            <a-button type="link">
+              <span class="iconfont icon-shanchu21"></span>
+              删除
+            </a-button>
+          </a-popconfirm>
+        </span>
         <!-- <a-button type="link" @click="Confirm">
           <span class="iconfont icon-yiwancheng2"></span>
           确认执行
@@ -26,18 +28,15 @@
           取消确认
         </a-button> -->
       </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: handleAudit.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="handleAudit(record)">
+            <span class="iconfont icon-icon_519"></span>
+          </a-button>
+        </a-tooltip>
       </template>
     </BasicTable>
 
@@ -56,7 +55,7 @@
   // 引入处理入参方法
   import { formatParams } from '/@/hooks/web/common'
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getSelectRows }] = useTable({
+  const [registerTable, { reload, getVxeSelectRows }] = useTable({
     title: '',
     api: async (p) => {
       const res: API.DataResult = await ApiList(p)
@@ -84,7 +83,7 @@
       width: 60,
     },
     canResize: true,
-    resizeHeightOffset: 35,
+    resizeHeightOffset: 15,
     immediate: true,
     actionColumn: {
       width: 80,
@@ -92,6 +91,9 @@
       dataIndex: 'action',
       fixed: 'right',
     },
+    tableComponent: 'vxe',
+    autoHeight: window.innerHeight - 250,
+    id: '0'
   })
   function handleCreate() {
     openModal(true, {
@@ -100,7 +102,7 @@
     })
   }
   function Confirm() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -119,7 +121,7 @@
     })
   }
   function Cancel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -139,7 +141,7 @@
   }
 
   function handleDel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       ids: [],
     }
diff --git a/src/views/ContainerManagement/SellCtn/index.vue b/src/views/ContainerManagement/SellCtn/index.vue
index 7c1b6f09..2240ea53 100644
--- a/src/views/ContainerManagement/SellCtn/index.vue
+++ b/src/views/ContainerManagement/SellCtn/index.vue
@@ -26,18 +26,15 @@
           取消确认
         </a-button> -->
       </template>
-      <template #bodyCell="{ column, record }">
-        <template v-if="column.key === 'action'">
-          <TableAction
-            :actions="[
-              {
-                icon: 'clarity:note-edit-line',
-                tooltip: '编辑',
-                onClick: handleAudit.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="handleAudit(record)">
+            <span class="iconfont icon-icon_519"></span>
+          </a-button>
+        </a-tooltip>
       </template>
     </BasicTable>
 
@@ -56,7 +53,7 @@
   // 引入处理入参方法
   import { formatParams } from '/@/hooks/web/common'
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getSelectRows }] = useTable({
+  const [registerTable, { reload, getVxeSelectRows }] = useTable({
     title: '',
     api: async (p) => {
       const res: API.DataResult = await ApiList(p)
@@ -84,14 +81,17 @@
       width: 60,
     },
     canResize: true,
-    resizeHeightOffset: 35,
+    resizeHeightOffset: 15,
     immediate: true,
     actionColumn: {
-      width: 80,
+      width: 50,
       title: '操作',
       dataIndex: 'action',
       fixed: 'right',
     },
+    id:'0',
+    tableComponent: 'vxe',
+    autoHeight: window.innerHeight - 250
   })
   function handleCreate() {
     openModal(true, {
@@ -100,7 +100,7 @@
     })
   }
   function Confirm() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -119,7 +119,7 @@
     })
   }
   function Cancel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       id: '',
       ids: [],
@@ -139,7 +139,7 @@
   }
 
   function handleDel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       ids: [],
     }
diff --git a/src/views/ContainerManagement/StateChange/index.vue b/src/views/ContainerManagement/StateChange/index.vue
index 9b93db92..7d757aae 100644
--- a/src/views/ContainerManagement/StateChange/index.vue
+++ b/src/views/ContainerManagement/StateChange/index.vue
@@ -33,8 +33,9 @@
   const { notification } = useMessage()
   // 引入处理入参方法
   import { formatParams } from '/@/hooks/web/common'
+  const tbHeight = window.innerHeight - 270
   const [registerModal, { openModal }] = useModal()
-  const [registerTable, { reload, getForm, getSelectRows }] = useTable({
+  const [registerTable, { reload, getForm, getVxeSelectRows }] = useTable({
     title: '',
     api: async (p) => {
       if (p.queryCondition == '[]') {
@@ -80,12 +81,15 @@
     indexColumnProps: {
       width: 60,
     },
+    tableComponent: 'vxe',
+    autoHeight: tbHeight,
     canResize: true,
-    resizeHeightOffset: 35,
+    resizeHeightOffset: 15,
     immediate: false,
+    id: '0'
   })
   function handleDel() {
-    const select = getSelectRows()
+    const select = getVxeSelectRows()
     let ApiData: any = {
       ids: [],
     }