From 8f846e24523c8b0d79f6208de3de54d985130b3e Mon Sep 17 00:00:00 2001
From: sunzehua <sunzehua@jchshipping.net>
Date: Fri, 15 Nov 2024 08:57:29 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=A1=B9=E7=9B=AE?=
 =?UTF-8?q?=E5=92=8C=E5=8F=91=E7=A5=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/operation/seaexport/detail/modules/aiRecognition.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/views/operation/seaexport/detail/modules/aiRecognition.vue b/src/views/operation/seaexport/detail/modules/aiRecognition.vue
index 98621b3f..ca323c0f 100644
--- a/src/views/operation/seaexport/detail/modules/aiRecognition.vue
+++ b/src/views/operation/seaexport/detail/modules/aiRecognition.vue
@@ -93,6 +93,9 @@ function uploadFile(file) {
     formData.append('file', file.file)
     GetBookingAIResult(formData).then(res => {
         if (res.succeeded) {
+            res.data.shipperContent = res.data.shipper
+            res.data.consigneeContent = res.data.consignee
+            res.data.notifyPartyContent = res.data.notifyParty
             res.data.bookingRemark = res.data.remark
             setFieldsValue(res.data)
             list.value = res.data.ctnInfo

From c19073ebb36d8a0cd2c0fed2979e2f5fc5e5060d 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: Fri, 15 Nov 2024 09:18:01 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../CurrentState/TenantAuditStepModal.vue     |  2 +-
 .../CurrentState/columns.tsx                  | 24 +++++++++----------
 .../CurrentState/index.vue                    |  4 ++--
 .../CurrentState/infoModal.vue                |  2 +-
 .../CustFeeDui/TenantAuditStepModal.vue       |  2 +-
 .../RentOut/TenantAuditStepModal.vue          |  8 +++----
 .../SellCtn/TenantAuditStepModal.vue          |  4 ++--
 .../StateChange/columns.tsx                   | 16 ++++++-------
 .../ContainerManagement/StateChange/index.vue |  4 ++--
 .../TemplatImport/TenantAuditStepModal.vue    |  8 +++----
 .../TemplatImport/columns.tsx                 |  6 ++---
 .../TemplatImport/index.vue                   |  4 ++--
 .../ContainerManagement/dsxxcl/columns.tsx    |  6 ++---
 .../qbxdtbdrz/TenantAuditStepModal.vue        |  2 +-
 .../ContainerManagement/qbxdtbdrz/columns.tsx | 16 ++++++-------
 15 files changed, 54 insertions(+), 54 deletions(-)

diff --git a/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue b/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
index 7b4fc7fd..8859e361 100644
--- a/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     :use-wrapper="true"
-    title="箱状态批量维护"
+    title="箱可用状态批量维护"
     width="55%"
     @register="registerModal"
     @ok="handleSave"
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index c15a07b0..d65babed 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
     title: '箱型',
     dataIndex: 'ctnall',
     sorter: true,
-    width: 150,
+    width: 100,
   },
   {
     title: '序号',
@@ -40,13 +40,13 @@ export const columns: BasicColumn[] = [
     width: 50,
   },
   // {
-  //   title: '箱状态',
+  //   title: '箱可用状态',
   //   dataIndex: 'ctnState',
   //   sorter: true,
   //   width: 200,
   // },
   {
-    title: '箱流转状态',
+    title: '箱状态',
     dataIndex: 'ctnFlowState',
     sorter: true,
     width: 200,
@@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '空重箱',
+    title: '空重',
     dataIndex: 'isHeavy',
     sorter: true,
     width: 80,
@@ -108,7 +108,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 150,
@@ -159,7 +159,7 @@ export const columns: BasicColumn[] = [
   // },
 
   // {
-  //   title: '箱状态',
+  //   title: '箱可用状态',
   //   dataIndex: 'ctnState',
   //   sorter: true,
   //   width: 200,
@@ -649,7 +649,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'ctnStateId',
-    label: '箱状态',
+    label: '箱可用状态',
     component: 'ApiSelect',
     colProps: { span: 6 },
     defaultValue: '',
@@ -721,7 +721,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'isHeavy',
-    label: '空重箱',
+    label: '空重',
     component: 'Switch',
     defaultValue: false,
     colProps: { span: 6 },
@@ -879,7 +879,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'depot',
-    label: '码头或场站',
+    label: '场地',
     component: 'ApiSelect',
     colProps: { span: 6 },
     required: false,
@@ -1071,13 +1071,13 @@ export const InfoColumns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '箱状态',
+    title: '箱可用状态',
     dataIndex: 'ctnState',
     sorter: true,
     width: 150,
   },
   {
-    title: '空重箱',
+    title: '空重',
     dataIndex: 'isHeavy',
     sorter: true,
     width: 80,
@@ -1097,7 +1097,7 @@ export const InfoColumns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 150,
diff --git a/src/views/ContainerManagement/CurrentState/index.vue b/src/views/ContainerManagement/CurrentState/index.vue
index 51872f0c..ff8beb61 100644
--- a/src/views/ContainerManagement/CurrentState/index.vue
+++ b/src/views/ContainerManagement/CurrentState/index.vue
@@ -2,10 +2,10 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable">
       <template #tableTitle>
-        <a-button type="link" @click="handleCreate">
+        <!-- <a-button type="link" @click="handleCreate">
           <span class="iconfont icon-piliangbianji"></span>
           批量维护
-        </a-button>
+        </a-button> -->
       </template>
       <template #bodyCell="{ column, record }">
         <template v-if="column.key === 'action'">
diff --git a/src/views/ContainerManagement/CurrentState/infoModal.vue b/src/views/ContainerManagement/CurrentState/infoModal.vue
index 8557844b..8ad8016f 100644
--- a/src/views/ContainerManagement/CurrentState/infoModal.vue
+++ b/src/views/ContainerManagement/CurrentState/infoModal.vue
@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     :use-wrapper="true"
-    title="箱状态详情"
+    title="箱可用状态详情"
     width="55%"
     @register="registerModal"
   >
diff --git a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
index 52b04a2a..dd2fd5fb 100644
--- a/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CustFeeDui/TenantAuditStepModal.vue
@@ -865,7 +865,7 @@
       data: 'ctnstate',
     },
     {
-      title: '箱流转状态',
+      title: '箱状态',
       width: 120,
       data: 'ctnflowstate',
     },
diff --git a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
index 96826703..c9b9cdc5 100644
--- a/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOut/TenantAuditStepModal.vue
@@ -1424,12 +1424,12 @@
       data: 'ctnBizState',
     },
     {
-      title: '箱状态',
+      title: '箱可用状态',
       width: 120,
       data: 'ctnState',
     },
     {
-      title: '箱流转状态',
+      title: '箱状态',
       width: 120,
       data: 'ctnFlowState',
     },
@@ -1568,12 +1568,12 @@
       data: 'ctnBizState',
     },
     {
-      title: '箱状态',
+      title: '箱可用状态',
       width: 120,
       data: 'ctnState',
     },
     {
-      title: '箱流转状态',
+      title: '箱状态',
       width: 120,
       data: 'ctnFlowState',
     },
diff --git a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
index 3a097a5d..b04d873f 100644
--- a/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/SellCtn/TenantAuditStepModal.vue
@@ -651,7 +651,7 @@
       data: 'ctnBizStateId',
     },
     {
-      title: '箱状态ID',
+      title: '箱可用状态ID',
       width: 120,
       data: 'ctnStateId',
     },
@@ -736,7 +736,7 @@
     //   },
     // },
     // {
-    //   title: '箱状态',
+    //   title: '箱可用状态',
     //   width: 120,
     //   data: 'ctnState',
     //   type: 'dropdown',
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index af0e6682..19f14b94 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -32,7 +32,7 @@ export const columns: BasicColumn[] = [
     title: '箱型',
     dataIndex: 'ctnall',
     sorter: true,
-    width: 150,
+    width: 100,
   },
   {
     title: '序号',
@@ -40,13 +40,13 @@ export const columns: BasicColumn[] = [
     width: 50,
   },
   // {
-  //   title: '箱状态',
+  //   title: '箱可用状态',
   //   dataIndex: 'ctnState',
   //   sorter: true,
   //   width: 200,
   // },
   {
-    title: '箱流转状态',
+    title: '箱状态',
     dataIndex: 'ctnFlowState',
     sorter: true,
     width: 200,
@@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '空重箱',
+    title: '空重',
     dataIndex: 'isHeavy',
     sorter: true,
     width: 80,
@@ -108,7 +108,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 150,
@@ -423,7 +423,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'ctnStateId',
-    label: '箱状态',
+    label: '箱可用状态',
     component: 'ApiSelect',
     colProps: { span: 6 },
     defaultValue: '',
@@ -454,7 +454,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'isHeavy',
-    label: '空重箱',
+    label: '空重',
     component: 'Switch',
     defaultValue: false,
     colProps: { span: 6 },
@@ -604,7 +604,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'depot',
-    label: '码头或场站',
+    label: '场地',
     component: 'ApiSelect',
     colProps: { span: 6 },
     required: false,
diff --git a/src/views/ContainerManagement/StateChange/index.vue b/src/views/ContainerManagement/StateChange/index.vue
index a988bbb9..9b93db92 100644
--- a/src/views/ContainerManagement/StateChange/index.vue
+++ b/src/views/ContainerManagement/StateChange/index.vue
@@ -2,10 +2,10 @@
   <div>
     <BasicTable class="ds-table" @register="registerTable">
       <template #tableTitle>
-        <a-button type="link" @click="handleCreate">
+        <!-- <a-button type="link" @click="handleCreate">
           <span class="iconfont icon-tianjia"></span>
           批量添加
-        </a-button>
+        </a-button> -->
         <a-popconfirm
           title="确定删除当前选中数据？"
           ok-text="是"
diff --git a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
index 794e7ccc..3dd1ab45 100644
--- a/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/TemplatImport/TenantAuditStepModal.vue
@@ -434,7 +434,7 @@
       data: 'dealRemark',
     },
     {
-      title: '箱流转状态',
+      title: '箱状态',
       width: 120,
       data: 'ctnFlowState',
     },
@@ -474,7 +474,7 @@
       data: 'portDischarge',
     },
     {
-      title: '场站/码头',
+      title: '场地',
       width: 120,
       data: 'depot',
     },
@@ -522,12 +522,12 @@
     // },
 
     // {
-    //   title: '箱状态',
+    //   title: '箱可用状态',
     //   width: 120,
     //   data: 'ctnState',
     // },
     // {
-    //   title: '空重箱',
+    //   title: '空重',
     //   width: 120,
     //   data: 'isHeavy',
     // },
diff --git a/src/views/ContainerManagement/TemplatImport/columns.tsx b/src/views/ContainerManagement/TemplatImport/columns.tsx
index 54e2f9eb..4ad15510 100644
--- a/src/views/ContainerManagement/TemplatImport/columns.tsx
+++ b/src/views/ContainerManagement/TemplatImport/columns.tsx
@@ -195,13 +195,13 @@ export const InfoColumns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '箱状态',
+    title: '箱可用状态',
     dataIndex: 'ctnState',
     sorter: true,
     width: 150,
   },
   {
-    title: '空重箱',
+    title: '空重',
     dataIndex: 'isHeavy',
     sorter: true,
     width: 80,
@@ -221,7 +221,7 @@ export const InfoColumns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 150,
diff --git a/src/views/ContainerManagement/TemplatImport/index.vue b/src/views/ContainerManagement/TemplatImport/index.vue
index dcafcc29..9c743abc 100644
--- a/src/views/ContainerManagement/TemplatImport/index.vue
+++ b/src/views/ContainerManagement/TemplatImport/index.vue
@@ -145,7 +145,7 @@
       data: 'dealRemark',
     },
     {
-      title: '箱流转状态',
+      title: '箱状态',
       width: 120,
       data: 'ctnFlowState',
     },
@@ -185,7 +185,7 @@
       data: 'portDischarge',
     },
     {
-      title: '场站/码头',
+      title: '场地',
       width: 120,
       data: 'depot',
     },
diff --git a/src/views/ContainerManagement/dsxxcl/columns.tsx b/src/views/ContainerManagement/dsxxcl/columns.tsx
index 0cfeba20..7f5a505e 100644
--- a/src/views/ContainerManagement/dsxxcl/columns.tsx
+++ b/src/views/ContainerManagement/dsxxcl/columns.tsx
@@ -58,7 +58,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '箱状态',
+    title: '箱可用状态',
     dataIndex: 'ctnState',
     sorter: true,
     width: 200,
@@ -76,7 +76,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '空重箱',
+    title: '空重',
     dataIndex: 'isHeavy',
     sorter: true,
     width: 200,
@@ -88,7 +88,7 @@ export const columns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 200,
diff --git a/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue b/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
index 55e28522..caa1f354 100644
--- a/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
@@ -2,7 +2,7 @@
   <BasicModal
     v-bind="$attrs"
     :use-wrapper="true"
-    title="箱状态批量维护"
+    title="箱可用状态批量维护"
     width="55%"
     @register="registerModal"
     @ok="handleSave"
diff --git a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
index f7cf6b77..746938aa 100644
--- a/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
+++ b/src/views/ContainerManagement/qbxdtbdrz/columns.tsx
@@ -72,7 +72,7 @@ export const columns: BasicColumn[] = [
     width: 200,
   },
   {
-    title: '箱状态',
+    title: '箱可用状态',
     dataIndex: 'ctnState',
     sorter: true,
     width: 200,
@@ -85,7 +85,7 @@ export const columns: BasicColumn[] = [
   },
 
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 200,
@@ -325,7 +325,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'ctnStateId',
-    label: '箱状态',
+    label: '箱可用状态',
     component: 'ApiSelect',
     colProps: { span: 6 },
     defaultValue: '',
@@ -357,7 +357,7 @@ export const formSchema: FormSchema[] = [
 
   {
     field: 'isHeavy',
-    label: '空重箱',
+    label: '空重',
     component: 'Switch',
     defaultValue: false,
     colProps: { span: 6 },
@@ -396,7 +396,7 @@ export const formSchema: FormSchema[] = [
   },
   {
     field: 'depot',
-    label: '码头或场站',
+    label: '场地',
     component: 'ApiSelect',
     colProps: { span: 6 },
     required: false,
@@ -553,13 +553,13 @@ export const InfoColumns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '箱状态',
+    title: '箱可用状态',
     dataIndex: 'ctnState',
     sorter: true,
     width: 150,
   },
   {
-    title: '空重箱',
+    title: '空重',
     dataIndex: 'isHeavy',
     sorter: true,
     width: 150,
@@ -571,7 +571,7 @@ export const InfoColumns: BasicColumn[] = [
     width: 150,
   },
   {
-    title: '码头或场站',
+    title: '场地',
     dataIndex: 'depot',
     sorter: true,
     width: 150,