箱管调整

3 months ago · 8d56086a69
parent 0d02865c6d
commit 8d56086a69
6 changed files with 24 additions and 19 deletions
--- 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"
--- 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,
    },
  },
 ]
--- 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) => {
--- 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"
--- 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,
    },
--- 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"