From e6978ad64f3d019de8068c623f26cfb5cdb4c10a 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, 15 Oct 2024 15:31:46 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AE=B1=E7=AE=A1=20=20=E5=8D=95=E7=A8=8B?=
 =?UTF-8?q?=E7=A7=9F=E5=85=A5=20=E5=8D=95=E7=A8=8B=E7=A7=9F=E5=87=BA=20?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../RentOneWay/TenantAuditStepModal.vue       | 25 ++++++++++---------
 .../RentOneWay/columns.tsx                    | 18 +++++++++++++
 .../RentOneWayIn/columns.tsx                  | 19 ++++++++++++++
 3 files changed, 50 insertions(+), 12 deletions(-)

diff --git a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
index a35ffebc..68096a8a 100644
--- a/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/RentOneWay/TenantAuditStepModal.vue
@@ -552,11 +552,6 @@
       width: 120,
       data: 'dropoffPortCode',
     },
-    {
-      title: '租箱客户ID',
-      width: 120,
-      data: 'rentCustomerId',
-    },
     {
       title: '租箱业务ID',
       width: 120,
@@ -592,9 +587,9 @@
       },
     },
     {
-      title: '租箱客户',
+      title: '原箱主',
       width: 120,
-      data: 'rentCustomerName',
+      data: 'oldContainerOwner',
       type: 'dropdown',
       // 下拉框数据，可以同步或者异步返回(异步需要process返回)
       source: async (query, process) => {
@@ -645,6 +640,12 @@
       width: 120,
       data: 'ctnReleaseNo',
     },
+    {
+      title: '单程租入合同号',
+      width: 120,
+      data: 'ctnReleaseNo_In',
+      readOnly: true,
+    },
     {
       title: '租箱日期',
       width: 120,
@@ -787,7 +788,7 @@
     fixedColumnsLeft: 1,
     // 需要隐藏的列
     hiddenColumns: {
-      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10],
+      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9],
       indicators: true,
     },
     // 控制回车移动
@@ -816,7 +817,7 @@
           list.value[changes[0][0]]['ctnall'] = dict?.ctnName
           list.value[changes[0][0]]['ctnCode'] = dict?.ediCode
         }
-        if (changes[0][1] === 'rentCustomerName') {
+        if (changes[0][1] === 'oldContainerOwner') {
           const res = ContainerOwnerDict.value.length
             ? ContainerOwnerDict.value
             : (await GetClientListByCode({ code: 'leasing' }))?.data
@@ -825,8 +826,8 @@
             return item.pinYinCode === changes[0][3]
           })
           if (item) dict = item[0]
-          list.value[changes[0][0]]['rentCustomerName'] = dict?.pinYinCode
-          list.value[changes[0][0]]['rentCustomerId'] = dict?.id
+          list.value[changes[0][0]]['oldContainerOwner'] = dict?.pinYinCode
+          list.value[changes[0][0]]['oldContainerOwnerId'] = dict?.id
         }
         if (changes[0][1] === 'rentDirect') {
           const res = rentDirectDict.value.length
@@ -965,7 +966,7 @@
     fixedColumnsLeft: 1,
     // 需要隐藏的列
     hiddenColumns: {
-      columns: [1, 2, 3, 4, 5, 6, 7, 8],
+      columns: [1, 2, 3, 4, 5, 6, 7, 8, 9],
       indicators: true,
     },
     // // 控制回车移动
diff --git a/src/views/ContainerManagement/RentOneWay/columns.tsx b/src/views/ContainerManagement/RentOneWay/columns.tsx
index 2e02628d..e6f25c28 100644
--- a/src/views/ContainerManagement/RentOneWay/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWay/columns.tsx
@@ -96,6 +96,12 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
+  {
+    title: '合同号',
+    dataIndex: 'ctnReleaseNo',
+    sorter: true,
+    width: 200,
+  },
   {
     title: '业务锁定',
     dataIndex: 'isBusinessLocking',
@@ -231,6 +237,12 @@ export const searchFormSchema: FormSchema[] = [
       format: 'YYYY-MM',
     },
   },
+  {
+    field: 'ctnReleaseNo',
+    label: '合同号',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
   // {
   //   field: 'etd',
   //   label: 'ETD',
@@ -438,6 +450,12 @@ export const formSchema: FormSchema[] = [
       format: 'YYYY-MM',
     },
   },
+  {
+    field: 'ctnReleaseNo',
+    label: '合同号',
+    component: 'Input',
+    colProps: { span: 6 },
+  },
   {
     field: 'isBusinessLocking',
     label: '业务锁定',
diff --git a/src/views/ContainerManagement/RentOneWayIn/columns.tsx b/src/views/ContainerManagement/RentOneWayIn/columns.tsx
index 5eb2c219..ab49b2c5 100644
--- a/src/views/ContainerManagement/RentOneWayIn/columns.tsx
+++ b/src/views/ContainerManagement/RentOneWayIn/columns.tsx
@@ -93,6 +93,19 @@ export const columns: BasicColumn[] = [
     sorter: true,
     width: 200,
   },
+  {
+    title: '合同号',
+    dataIndex: 'ctnReleaseNo',
+    sorter: true,
+    width: 200,
+  },
+  {
+    field: 'ctnReleaseNo',
+    label: '合同号',
+    component: 'Input',
+
+    colProps: { span: 6 },
+  },
   {
     title: '业务锁定',
     dataIndex: 'isBusinessLocking',
@@ -228,6 +241,12 @@ export const searchFormSchema: FormSchema[] = [
       format: 'YYYY-MM',
     },
   },
+  {
+    field: 'ctnReleaseNo',
+    label: '合同号',
+    component: 'Input',
+    colProps: { span: 4 },
+  },
   // {
   //   field: 'etd',
   //   label: 'ETD',