diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index 0c3a024b..aca26eb8 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -1779,13 +1779,6 @@ export function BookingSlotGetAvailableSlots(parameter) { }) } -export function CancelAllocationSlot(parameter) { - return request({ - url: '/BookingOrder/CancelAllocationSlot?id=' + parameter, - method: 'post', - }) -} - export function GetCtnListRefsh(parameter) { return request({ url: '/BookingOrder/GetCtnList', diff --git a/src/views/operation/seaexport/detail/index.vue b/src/views/operation/seaexport/detail/index.vue index 6eaf7117..30ea4b26 100644 --- a/src/views/operation/seaexport/detail/index.vue +++ b/src/views/operation/seaexport/detail/index.vue @@ -578,6 +578,13 @@ ediInfo: ediFrom, ctnInfo } + // 处理截港截单时间 + if (postData.closingDate && postData.closingDate.length == 13) { + postData.closingDate = postData.closingDate + ':00:00' + } + if (postData.closeDocDate && postData.closeDocDate.length == 13) { + postData.closeDocDate = postData.closeDocDate + ':00:00' + } if (id.value) postData['id'] = id.value // 发送请求 loading.value = true diff --git a/src/views/operation/seaexport/detail/modules/baseInfo.tsx b/src/views/operation/seaexport/detail/modules/baseInfo.tsx index 90798f12..42c891ac 100644 --- a/src/views/operation/seaexport/detail/modules/baseInfo.tsx +++ b/src/views/operation/seaexport/detail/modules/baseInfo.tsx @@ -245,7 +245,7 @@ export const basicInfoFormSchema: FormSchema[] = [ api: GetBookingContractNoList, params: { carrierId: formModel.carrierId }, labelField: 'contractName', - valueField: 'contractNo', + valueField: 'id', showName: 'contractNo', resultField: 'data', immediate: false, diff --git a/src/views/operation/seaexport/detail/modules/operationArea.vue b/src/views/operation/seaexport/detail/modules/operationArea.vue index d8538668..00d4eb13 100644 --- a/src/views/operation/seaexport/detail/modules/operationArea.vue +++ b/src/views/operation/seaexport/detail/modules/operationArea.vue @@ -106,6 +106,15 @@ 改配 + + + 退舱 + @@ -587,8 +596,22 @@ > + + + + + @@ -688,6 +711,8 @@ const fileFlag = ref(false) // 改配弹窗开关 const changeConfigFlag = ref(false) + // 退舱弹窗开关 + const returnCabinFlag = ref(false) // 表单校验规则 const rules = { traceValue: [ @@ -1098,11 +1123,18 @@ schemas: fileForm, showActionButtonGroup: false, }) + // 改配表单 const [registerFormC, { validate, setFieldsValue }] = useForm({ labelWidth: 100, schemas: changeForm, showActionButtonGroup: false, }) + // 退舱表单 + const [registerFormR, { validate: validater, setFieldsValue: setFieldsValuer }] = useForm({ + labelWidth: 100, + schemas: changeForm, + showActionButtonGroup: false, + }) // 改配 const changeConfig = () => { GetChangeOrderStatus({ id: props.id }).then((res) => { @@ -1450,6 +1482,16 @@ { name: '卸货港', code: 'dischargePort' }, { name: '通知人', code: 'notifyPartyContent' }, ]) + // 退舱按钮 + const returnCabin = () => { + // 未订舱或者已开船,不可退舱 + const etd = props.details.etd + const now = new Date() + // if (!props?.details?.isBooking || new Date(etd) > now) { + // return createMessage.warning('未订舱或已开船不可退舱!') + // } + returnCabinFlag.value = true + } // function uploadFile(file) { // const formData = new FormData() // formData.append('file', file.file) @@ -1620,15 +1662,7 @@ } function handleCancelCabin() { cabinLoad.value = true - CancelAllocationSlot(props.details.id).then((res) => { - if (res.succeeded) { - notification.success({ message: '取消成功', duration: 3 }) - emit('handleSetCtnList') - } else { - notification.error({ message: res.message, duration: 3 }) - } - cabinLoad.value = false - }) + } function removeOrder() { emit('removeOrder')