diff --git a/src/components/mskBookingOrder/index.vue b/src/components/mskBookingOrder/index.vue deleted file mode 100644 index c87fb5b7..00000000 --- a/src/components/mskBookingOrder/index.vue +++ /dev/null @@ -1,978 +0,0 @@ - - - - - MSK 订舱 - - - - - - MaerskContract - MaerskSpot - SealandSpot - - - - - - - BOOKAPI - - - - - - - - - - {{ item.contractName }} - {{ item.contractNo }} - - - - - - - - MAEU - SEAU - SEJJ - MCPU - MAEI - - - - - - - - - - - - - - - {{ item.contractName }} - {{ item.contractNo }} - - - - - - - - - {{ form.bookedByCompanyName }} - - - - - {{ form.bookedByMaerskPartyCode }} - - - - - - - {{ form.bookedByCompanyContactName }} - - - - - {{ form.bookedByCompanyContactEmail }} - - - - - - - {{ form.cyfCompanyName }} - - - - - {{ form.cyfPartyCode }} - - - - - - - {{ form.cyfContactName }} - - - - - {{ form.cyfEmail }} - - - - 地点、船期详情 - - - - - - - {{ item.cityName }} ( - {{ item.unRegionName }} ) , - {{ item.countryName }} - - - - - - - - - - {{ item.cityName }} ( - {{ item.unRegionName }} ) , - {{ item.countryName }} - - - - - - - - - - CY - SD - CFS - - - - - - - CY - SD - CFS - - - - - - - - - 检索船期 - - - - - - - {{ item.orignCityName }} - - {{ item.deliveryCityName }} - - - - - - 离港 - {{ item.etd }} - - - - - - 到港 - {{ item.atd }} - - - - - - 运输时间 - {{ item.days }}天数 - - - - - - 船名/航次 - {{ item.vesselName }} / {{ item.carrierDepartureVoyageNumber }} - - - - - - 货物详情 - - - - - 检索商品 - - - - - - MaerskCode - - - - - - - - KGS - - - - - - DRY - REEFER - - - - - - - - - - - - - - - - - - - - - - - - - - m³/hour - - - - - - - % - - - - - 箱型箱量 - - 添加 - - - - - - - {{ item.name }} - - - - - - - - - - - - - - - - - - - - - - - {{ form.placeOfReceiptCityName }} - - - - - {{ form.placeOfDeliveryCityName }} - - - - - - - - - - - - - - - 检索 - - - - - - {{ item.orignCityName }} - - {{ item.deliveryCityName }} - - - - - - 离港 - {{ item.etd }} - - - - - - 到港 - {{ item.atd }} - - - - - - 运输时间 - {{ item.days }}天数 - - - - - - 船名/航次 - {{ item.vesselName }} / {{ item.carrierDepartureVoyageNumber }} - - - - - - 选择 - - - - 共计 {{ shipList.length }} 条船期记录 - - - - - - - - - - - - - 检索 - - - - - - - 商品代码 - {{ item.commodityCode }} - - - 商品名称 - {{ item.commodityName }} - - - 货物类型 - - {{ - ite - }} - - - - - - 选择 - - - - - - - - - - diff --git a/src/views/bookingcabin/cabinBooking/api.ts b/src/views/bookingcabin/cabinBooking/api.ts index 491c3a1c..57467432 100644 --- a/src/views/bookingcabin/cabinBooking/api.ts +++ b/src/views/bookingcabin/cabinBooking/api.ts @@ -4,7 +4,7 @@ import { DataResult, PageRequest } from '/@/api/model/baseModel' export function SearchShipSailingScheduleSpot(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/SearchShipSailingSchedule', + url: '/opApi/SpaceBookingMSKAPISpot/SearchShipSailingSchedule', method: 'post', data, }) @@ -36,7 +36,7 @@ export function SearchCommodities(data) { export function mskGetGetInfoSpot(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/GetInfo', + url: '/opApi/SpaceBookingMSKAPISpot/GetInfo', method: 'get', params: data, }) @@ -44,7 +44,7 @@ export function mskGetGetInfoSpot(data) { export function mskGetSaveSpot(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/Save', + url: '/opApi/SpaceBookingMSKAPISpot/Save', method: 'post', data, }) @@ -84,14 +84,14 @@ export function mskGetGetInfo(data) { export function GetInitInfoMsk() { return request({ - url: '/opApi/SpaceBookingSPOTAPI/GetInitInfo', + url: '/opApi/SpaceBookingMSKAPISpot/GetInitInfo', method: 'get', }) } export function SendMSKBookingSpot(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/SendMSKBooking', + url: '/opApi/SpaceBookingMSKAPISpot/SendMSKBooking', method: 'post', data, }) @@ -106,7 +106,7 @@ export function GetInitInfoMskApi() { export function maskCopySPOT(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/BatchCopy', + url: '/opApi/SpaceBookingMSKAPISpot/BatchCopy', method: 'post', data, }) @@ -114,7 +114,7 @@ export function maskCopySPOT(data) { export function SearchCommoditiesSpot(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/SearchCommodities', + url: '/opApi/SpaceBookingMSKAPISpot/SearchCommodities', method: 'post', data, }) @@ -122,7 +122,7 @@ export function SearchCommoditiesSpot(data) { export function SearchLocationsSpot(data) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/SearchLocations', + url: '/opApi/SpaceBookingMSKAPISpot/SearchLocations', method: 'post', data, }) @@ -153,7 +153,7 @@ export function BatchSend(parameter) { export function BatchSendSPOT(parameter) { return request({ - url: '/opApi/SpaceBookingSPOTAPI/BatchSend', + url: '/opApi/SpaceBookingMSKAPISpot/BatchSend', method: 'post', data: parameter }) diff --git a/src/views/bookingcabin/cabinBooking/detail.vue b/src/views/bookingcabin/cabinBooking/detail.vue index c06dcfb2..c9c6dfa0 100644 --- a/src/views/bookingcabin/cabinBooking/detail.vue +++ b/src/views/bookingcabin/cabinBooking/detail.vue @@ -761,7 +761,7 @@ const mskSpotInfo = ref({}) const mskApiInfo = ref({}) onMounted(() => { - // getinitInfoMsk() + getinitInfoMsk() GetCtnSelectList().then(res => { ctnallList.value = res.data }) @@ -769,9 +769,9 @@ onMounted(() => { //获取订舱人初始值 function getinitInfoMsk() { - GetInitInfoMsk().then(res => { - mskSpotInfo.value = res.data - }) + // GetInitInfoMsk().then(res => { + // mskSpotInfo.value = res.data + // }) GetInitInfoMskApi().then(res => { mskApiInfo.value = res.data }) @@ -1037,12 +1037,12 @@ function handleSubimt() { function handleSave() { form.value.carrierCode = 'MSK' - if (!form.value.isBookingPartOwnPrice) { - if (!form.value.priceOwnerReferenceId) { - createMessage.warning('请选择持约方合同') - return false - } - } + // if (!form.value.isBookingPartOwnPrice) { + // if (!form.value.priceOwnerReferenceId) { + // createMessage.warning('请选择持约方合同') + // return false + // } + // } formLoading.value = true if (mskType.value === 'add') { if (mskBookType.value === 'spot') { diff --git a/src/views/bookingcabin/cabinBooking/index.vue b/src/views/bookingcabin/cabinBooking/index.vue index 8d5b6711..e259ecbd 100644 --- a/src/views/bookingcabin/cabinBooking/index.vue +++ b/src/views/bookingcabin/cabinBooking/index.vue @@ -167,9 +167,9 @@ const [registerTable, { reload, getSelectRows, setLoading }] = useTable({ fixed: 'right', } }) -const timeValue = ref('') +const timeValue = ref('SpecificTimeDoOnce') function handledbclick(record) { - console.log('双击') + handleEdit(record) } const timeLoad = ref(false) const tenantParam = ref([]) as any
共计 {{ shipList.length }} 条船期记录