10.28禅道

src/design/public.less

@@ -290,5 +290,5 @@ h5 {
 }
 
 .anticon-exclamation-circle {
-  display: none!important;
+  // display: none!important;
 }

src/views/operation/seaexport/columns.tsx

@@ -165,7 +165,7 @@ export const searchFormSchema: FormSchema[] = [
   },
   {
     label: '船名',
-    field: 'vesselId',
+    field: 'vessel',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -174,7 +174,7 @@ export const searchFormSchema: FormSchema[] = [
       return {
         api: GetVesselSelectList,
         labelField: 'vesselName',
-        valueField: 'id',
+        valueField: 'vesselName',
         resultField: 'data',
         immediate: false,
         mode: 'SECRET_COMBOBOX_MODE_DO_NOT_USE'
@@ -182,21 +182,10 @@ export const searchFormSchema: FormSchema[] = [
     },
   },
   {
-    label: '航次',
-    field: 'voyno',
-    component: 'ApiSelect',
-    required: false,
-    dynamicDisabled: false,
-    colProps: { span: 4 },
-    componentProps: () => {
-      return {
-        api: GetVoynoSelectList,
-        immediate: false,
-        labelField: 'voyNo',
-        valueField: 'id',
-        resultField: 'data'
-      }
-    },
+    label: '船司航次',
+    field: 'innerVoyno',
+    component: 'Input',
+    colProps: { span: 4 }
   },
   {
     label: '装货港',
@@ -304,6 +293,17 @@ export const searchFormSchema: FormSchema[] = [
       }
     },
   },
+  {
+    field: 'createTime',
+    label: '创建日期',
+    component: 'RangePicker',
+    required: false,
+    dynamicDisabled: false,
+    colProps: { span: 4 },
+    componentProps: {
+      allowClear: true,
+    },
+  },
   {
     label: '场站',
     field: 'yard',
@@ -1327,7 +1327,7 @@ export const BatchModificationFormSchema: FormSchema[] = [
   },
   {
     label: '船名',
-    field: 'vessel',
+    field: 'vesselId',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,
@@ -1345,8 +1345,8 @@ export const BatchModificationFormSchema: FormSchema[] = [
     },
   },
   {
-    label: '航次',
-    field: 'voyno',
+    label: '船司航次',
+    field: 'innerVoyno',
     component: 'ApiSelect',
     required: false,
     dynamicDisabled: false,

src/views/operation/seaexport/detail/modules/operationArea.vue

@@ -1489,9 +1489,9 @@
     // 未订舱或者已开船，不可退舱
     const etd = props.details.etd
     const now = new Date()
-    // if (!props?.details?.isBooking || new Date(etd) > now) {
-    //   return createMessage.warning('未订舱或已开船不可退舱！')
-    // }
+    if (!props?.details?.isBooking || new Date(etd) > now) {
+      return createMessage.warning('未订舱或已开船不可退舱！')
+    }
     returnCabinFlag.value = true
   }
   // function uploadFile(file) {