From 8d56086a69f30151651854bcb83a72afd315183b 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, 27 Aug 2024 17:54:10 +0800
Subject: [PATCH] =?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      |  4 ++--
 .../CurrentState/columns.tsx                   | 18 ++++++++----------
 .../ContainerManagement/RentIn/columns.tsx     |  4 ++--
 .../StateChange/TenantAuditStepModal.vue       |  4 ++--
 .../StateChange/columns.tsx                    |  9 ++++++++-
 .../qbxdtbdrz/TenantAuditStepModal.vue         |  4 ++--
 6 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue b/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
index 5ab231ad..7b4fc7fd 100644
--- a/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/CurrentState/TenantAuditStepModal.vue
@@ -19,14 +19,14 @@
         @click="closeModal"
         >取消</a-button
       >
-      <a-button
+      <!-- <a-button
         type="success"
         :loading="loading"
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
         >仅保存</a-button
-      >
+      > -->
       <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"
diff --git a/src/views/ContainerManagement/CurrentState/columns.tsx b/src/views/ContainerManagement/CurrentState/columns.tsx
index 5c6b1d88..d65c7859 100644
--- a/src/views/ContainerManagement/CurrentState/columns.tsx
+++ b/src/views/ContainerManagement/CurrentState/columns.tsx
@@ -299,25 +299,23 @@ export const searchFormSchema: FormSchema[] = [
   {
     field: 'etd',
     label: 'ETD',
-    component: 'DatePicker',
+    component: 'RangePicker',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 4 },
-    defaultValue: '',
     componentProps: {
-      showTime: false,
-      style: 'width:100%',
-      valueFormat: 'YYYY-MM-DD 00:00:00',
+      allowClear: true,
     },
   },
   {
     field: 'eta',
     label: 'ETA',
-    component: 'DatePicker',
+    component: 'RangePicker',
+    required: false,
+    dynamicDisabled: false,
     colProps: { span: 4 },
-    defaultValue: '',
     componentProps: {
-      showTime: false,
-      style: 'width:100%',
-      valueFormat: 'YYYY-MM-DD 00:00:00',
+      allowClear: true,
     },
   },
 ]
diff --git a/src/views/ContainerManagement/RentIn/columns.tsx b/src/views/ContainerManagement/RentIn/columns.tsx
index 9ddfa63b..7d515263 100644
--- a/src/views/ContainerManagement/RentIn/columns.tsx
+++ b/src/views/ContainerManagement/RentIn/columns.tsx
@@ -485,7 +485,7 @@ export const formSchema: FormSchema[] = [
 
 export const formSearchBoxSchema: FormSchema[] = [
   {
-    field: 'oldContainerOwner',
+    field: 'oldContainerOwnerId',
     label: '原箱主',
     component: 'ApiSelect',
     required: false,
@@ -499,7 +499,7 @@ export const formSearchBoxSchema: FormSchema[] = [
         params: { code: 'leasing' },
         labelField: 'pinYinCode',
         showName: 'shortName',
-        valueField: 'shortName',
+        valueField: 'id',
         resultField: 'data',
         immediate: false,
         filterOption: (input: string, option: any) => {
diff --git a/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue b/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue
index 50275dd5..7e61813e 100644
--- a/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/StateChange/TenantAuditStepModal.vue
@@ -19,14 +19,14 @@
         @click="closeModal"
         >取消</a-button
       >
-      <a-button
+      <!-- <a-button
         type="success"
         :loading="loading"
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
         >仅保存</a-button
-      >
+      > -->
       <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"
diff --git a/src/views/ContainerManagement/StateChange/columns.tsx b/src/views/ContainerManagement/StateChange/columns.tsx
index 03559017..5fe5c82f 100644
--- a/src/views/ContainerManagement/StateChange/columns.tsx
+++ b/src/views/ContainerManagement/StateChange/columns.tsx
@@ -196,9 +196,16 @@ export const formSchema: FormSchema[] = [
     field: 'cntrno',
     label: '集装箱号',
     component: 'InputTextArea',
-    required: true,
+    rules: [
+      {
+        required: true,
+        trigger: 'blur',
+        message: '请输入集装箱号',
+      },
+    ],
     colProps: { span: 24 },
     componentProps: {
+      validateOnRuleChange: false,
       placeholder: '请输入，多个箱号请以“，”逗号间隔',
       rows: 3,
     },
diff --git a/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue b/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
index 8831fe60..55e28522 100644
--- a/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
+++ b/src/views/ContainerManagement/qbxdtbdrz/TenantAuditStepModal.vue
@@ -19,14 +19,14 @@
         @click="closeModal"
         >取消</a-button
       >
-      <a-button
+      <!-- <a-button
         type="success"
         :loading="loading"
         pre-icon="ant-design:check-outlined"
         style="margin-right: 0.8rem"
         @click="handleSave(false)"
         >仅保存</a-button
-      >
+      > -->
       <a-button
         pre-icon="ant-design:check-circle-outlined"
         type="primary"