From e73be31cf4ae51e8b91781ab5628fa958154a97e Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Thu, 24 Oct 2024 11:30:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bookingcabin/CabinManagement/columns.tsx  | 20 +++++++++----------
 .../CodeDataRuleTemplate/columnView.vue       | 14 ++++++-------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/src/views/bookingcabin/CabinManagement/columns.tsx b/src/views/bookingcabin/CabinManagement/columns.tsx
index 1e49faf3..72e52d71 100644
--- a/src/views/bookingcabin/CabinManagement/columns.tsx
+++ b/src/views/bookingcabin/CabinManagement/columns.tsx
@@ -46,7 +46,7 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
   },
   {
-    field: 'STATUS',
+    field: 'status',
     label: '舱位状态',
     component: 'Select',
     componentProps: {
@@ -70,19 +70,19 @@ export const searchFormSchema: FormSchema[] = [
     colProps: { span: 4 },
   },
   {
-    field: 'VESSEL',
+    field: 'vessel',
     label: '船名',
     component: 'Input',
     colProps: { span: 4 },
   },
   {
-    field: 'VOYNO',
+    field: 'voyno',
     label: '航次',
     component: 'Input',
     colProps: { span: 4 },
   },
   {
-    field: 'PORTLOAD',
+    field: 'portLoadId',
     label: '装货港',
     component: 'ApiSelect',
     required: false,
@@ -93,15 +93,15 @@ export const searchFormSchema: FormSchema[] = [
         api: GetClientPortSelectList,
         resultField: 'data',
         labelField: 'pinYinCode',
-        valueField: 'ediCode',
-        showName: 'ediCode',
+        valueField: 'id',
+        showName: 'portName',
         immediate: false,
         onChange: (e, obj) => {},
       }
     },
   },
   {
-    field: 'PORTDISCHARGE',
+    field: 'portDischargeId',
     label: '卸货港',
     component: 'ApiSelect',
     required: false,
@@ -112,8 +112,8 @@ export const searchFormSchema: FormSchema[] = [
         api: GetClientPortSelectList,
         resultField: 'data',
         labelField: 'pinYinCode',
-        valueField: 'ediCode',
-        showName: 'ediCode',
+        valueField: 'id',
+        showName: 'portName',
         immediate: false,
         onChange: (e, obj) => {},
       }
@@ -258,7 +258,7 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    field: 'LANENAME',
+    field: 'laneName',
     label: '航线名称',
     component: 'Input',
     colProps: { span: 4 },
diff --git a/src/views/system/CodeDataRuleTemplate/columnView.vue b/src/views/system/CodeDataRuleTemplate/columnView.vue
index 44833245..b75c0fad 100644
--- a/src/views/system/CodeDataRuleTemplate/columnView.vue
+++ b/src/views/system/CodeDataRuleTemplate/columnView.vue
@@ -95,9 +95,9 @@
                     </a-button>
                   </div>
                 </div>
-                <a-button type="link" @click="addDetailGroup(index, key)">
+                <!-- <a-button type="link" @click="addDetailGroup(index, key)">
                   <span class="iconfont icon-new_document"></span> 添加条件组
-                </a-button>
+                </a-button> -->
               </div>
               <div class="item-btns">
                 <a-button type="link" @click="addRow(index)">
@@ -314,11 +314,11 @@ const operatorOptions = [
   },
   {
     label: '包含',
-    value: 1,
+    value: 6,
   },
   {
     label: '不包含',
-    value: 13,
+    value: 7,
   },
 ]
 // 存储接口返回的查询条件
@@ -463,7 +463,7 @@ defineExpose({
 // .ds-advanced-search-modal {
 .ant-form-small {
   margin-top: 15px;
-  min-height: 400px;
+  // min-height: 400px;
 }
 
 .ds-advanced-search-item {
@@ -498,8 +498,8 @@ defineExpose({
 }
 
 .add-group {
-  position: absolute;
-  bottom: 16px;
+  // position: absolute;
+  // bottom: 16px;
   margin-left: 65px;
 }