From cd108a96a205845c58608efcf736b83b2412a691 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E5=90=8C=E6=B5=B7?=
 <14166000+zhangtonghai@user.noreply.gitee.com>
Date: Tue, 12 Nov 2024 17:30:53 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E8=B7=9F=E9=9A=8F=20forma?=
 =?UTF-8?q?tParams=20=E5=8F=98=E5=8A=A8=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/ContainerManagement/BaseInfo/columns.tsx   | 8 --------
 src/views/ContainerManagement/BaseInfo/index.vue     | 3 ++-
 src/views/ContainerManagement/BuyCtn/index.vue       | 3 ++-
 src/views/ContainerManagement/CtnScrap/index.vue     | 3 ++-
 src/views/ContainerManagement/CurrentState/index.vue | 3 ++-
 src/views/ContainerManagement/CustFeeDui/index.vue   | 3 ++-
 src/views/ContainerManagement/RentIn/index.vue       | 3 ++-
 src/views/ContainerManagement/RentOneWay/index.vue   | 3 ++-
 src/views/ContainerManagement/RentOneWayIn/index.vue | 3 ++-
 src/views/ContainerManagement/RentOut/index.vue      | 3 ++-
 src/views/ContainerManagement/SellCtn/index.vue      | 3 ++-
 src/views/ContainerManagement/Templat/index.vue      | 3 ++-
 src/views/ContainerManagement/dsxxcl/index.vue       | 3 ++-
 src/views/fee/FeeCustTemplate/index.vue              | 3 ++-
 14 files changed, 26 insertions(+), 21 deletions(-)

diff --git a/src/views/ContainerManagement/BaseInfo/columns.tsx b/src/views/ContainerManagement/BaseInfo/columns.tsx
index ae321158..b077d785 100644
--- a/src/views/ContainerManagement/BaseInfo/columns.tsx
+++ b/src/views/ContainerManagement/BaseInfo/columns.tsx
@@ -68,14 +68,6 @@ export const searchFormSchema: FormSchema[] = [
         labelField: 'ctnName',
         valueField: 'ediCode',
         resultField: 'data',
-        onChange: (e, obj) => {
-          if (e && obj) {
-            formModel.ctnall = obj.label
-          }
-          if (!e && !obj) {
-            formModel.ctnall = ''
-          }
-        },
       }
     },
   },
diff --git a/src/views/ContainerManagement/BaseInfo/index.vue b/src/views/ContainerManagement/BaseInfo/index.vue
index c00c4a10..07e0e78e 100644
--- a/src/views/ContainerManagement/BaseInfo/index.vue
+++ b/src/views/ContainerManagement/BaseInfo/index.vue
@@ -33,7 +33,8 @@
       })
     },
     beforeFetch: (p) => {
-      let Rdata = formatParams(p, ['ctnCode'])
+      // ['ctnCode']
+      let Rdata = formatParams(p, searchFormSchema)
       if (!!p.cntrno) {
         let data = JSON.parse(Rdata.queryCondition)
         data.forEach((item, index) => {
diff --git a/src/views/ContainerManagement/BuyCtn/index.vue b/src/views/ContainerManagement/BuyCtn/index.vue
index 2f334873..717066cf 100644
--- a/src/views/ContainerManagement/BuyCtn/index.vue
+++ b/src/views/ContainerManagement/BuyCtn/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['oldContainerOwner', 'bsdate', 'accdate'])
+      // ['oldContainerOwner', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/CtnScrap/index.vue b/src/views/ContainerManagement/CtnScrap/index.vue
index 0953057f..455389d1 100644
--- a/src/views/ContainerManagement/CtnScrap/index.vue
+++ b/src/views/ContainerManagement/CtnScrap/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['bsdate', 'accdate'])
+      // ['bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue
index 54c9b172..51872f0c 100644
--- a/src/views/ContainerManagement/CurrentState/index.vue
+++ b/src/views/ContainerManagement/CurrentState/index.vue
@@ -54,7 +54,8 @@
       })
     },
     beforeFetch: (p) => {
-      let Rdata = formatParams(p, ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid'])
+      // ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid']
+      let Rdata = formatParams(p, searchFormSchema)
       if (!!p.cntrno || !!p.CM_ctnCode || !!p.CM_ctnSize || !!p.stateTime) {
         let data = JSON.parse(Rdata.queryCondition)
         let CM_ctnCode: any = null
diff --git a/src/views/ContainerManagement/CustFeeDui/index.vue b/src/views/ContainerManagement/CustFeeDui/index.vue
index 111c72c4..ba2018fc 100644
--- a/src/views/ContainerManagement/CustFeeDui/index.vue
+++ b/src/views/ContainerManagement/CustFeeDui/index.vue
@@ -57,7 +57,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['oldContainerOwner', 'rentDirectId'])
+      // ['oldContainerOwner', 'rentDirectId']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/RentIn/index.vue b/src/views/ContainerManagement/RentIn/index.vue
index 5eb5417f..02c446bb 100644
--- a/src/views/ContainerManagement/RentIn/index.vue
+++ b/src/views/ContainerManagement/RentIn/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['oldContainerOwner', 'rentDirectId', 'bsdate', 'accdate'])
+      // ['oldContainerOwner', 'rentDirectId', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/RentOneWay/index.vue b/src/views/ContainerManagement/RentOneWay/index.vue
index 2592f0ec..364216fe 100644
--- a/src/views/ContainerManagement/RentOneWay/index.vue
+++ b/src/views/ContainerManagement/RentOneWay/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['rentCustomerName', 'bsdate', 'accdate'])
+      // ['rentCustomerName', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/RentOneWayIn/index.vue b/src/views/ContainerManagement/RentOneWayIn/index.vue
index 2592f0ec..364216fe 100644
--- a/src/views/ContainerManagement/RentOneWayIn/index.vue
+++ b/src/views/ContainerManagement/RentOneWayIn/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['rentCustomerName', 'bsdate', 'accdate'])
+      // ['rentCustomerName', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/RentOut/index.vue b/src/views/ContainerManagement/RentOut/index.vue
index 86bd7cdc..f8334031 100644
--- a/src/views/ContainerManagement/RentOut/index.vue
+++ b/src/views/ContainerManagement/RentOut/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['rentCustomerName', 'rentDirectId', 'bsdate', 'accdate'])
+      // ['rentCustomerName', 'rentDirectId', 'bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/SellCtn/index.vue b/src/views/ContainerManagement/SellCtn/index.vue
index 899c80f0..7c1b6f09 100644
--- a/src/views/ContainerManagement/SellCtn/index.vue
+++ b/src/views/ContainerManagement/SellCtn/index.vue
@@ -65,7 +65,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['bsdate', 'accdate'])
+      // ['bsdate', 'accdate']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/Templat/index.vue b/src/views/ContainerManagement/Templat/index.vue
index a777ccb5..3bf57c75 100644
--- a/src/views/ContainerManagement/Templat/index.vue
+++ b/src/views/ContainerManagement/Templat/index.vue
@@ -55,7 +55,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid'])
+      // ['ctnOwner', 'ctnSourceId', 'isOnlineId', 'portid']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     formConfig: {
diff --git a/src/views/ContainerManagement/dsxxcl/index.vue b/src/views/ContainerManagement/dsxxcl/index.vue
index b760419d..def3e947 100644
--- a/src/views/ContainerManagement/dsxxcl/index.vue
+++ b/src/views/ContainerManagement/dsxxcl/index.vue
@@ -32,7 +32,8 @@
       })
     },
     beforeFetch: (p) => {
-      return formatParams(p, ['ctnall', 'ctnSourceId', 'isOnlineId'])
+      // ['ctnall', 'ctnSourceId', 'isOnlineId']
+      return formatParams(p, searchFormSchema)
     },
     columns,
     rowSelection: { type: 'checkbox' },
diff --git a/src/views/fee/FeeCustTemplate/index.vue b/src/views/fee/FeeCustTemplate/index.vue
index 5ef0b540..6b4448e1 100644
--- a/src/views/fee/FeeCustTemplate/index.vue
+++ b/src/views/fee/FeeCustTemplate/index.vue
@@ -89,7 +89,8 @@
     beforeFetch: (p) => {
       p['isShared'] = 1
       p['customerId'] = props.clientId
-      return formatParams(p, ['isShared', 'isDisabled'])
+      // ['isShared', 'isDisabled']
+      return formatParams(p, searchFormSchema)
     },
     columns: columns,
     formConfig: {