diff --git a/src/design/public.less b/src/design/public.less index 24d842dc..2be840ca 100644 --- a/src/design/public.less +++ b/src/design/public.less @@ -290,5 +290,5 @@ h5 { } .anticon-exclamation-circle { - display: none!important; + // display: none!important; } \ No newline at end of file diff --git a/src/views/operation/seaexport/columns.tsx b/src/views/operation/seaexport/columns.tsx index 30a409b8..ebc3d659 100644 --- a/src/views/operation/seaexport/columns.tsx +++ b/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, diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue index 7e326c0d..eaa746a5 100644 --- a/src/views/operation/seaexport/detail/modules/operationArea.vue +++ b/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) {