diff --git a/src/views/baseinfo/port/columns.tsx b/src/views/baseinfo/port/columns.tsx index 43dfae05..74f3b459 100644 --- a/src/views/baseinfo/port/columns.tsx +++ b/src/views/baseinfo/port/columns.tsx @@ -143,6 +143,12 @@ export const searchFormSchema: FormSchema[] = [ component: 'Input', colProps: { span: 4 }, }, + { + field: 'portName', + label: '港口英文名称', + component: 'Input', + colProps: { span: 4 } + }, { field: 'countryId', label: '国家', diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index bc5d9ec1..d8e60472 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -1963,7 +1963,7 @@ export function EditShippingBillPartCtn(data) { }) } -// 提单信息删除 +// 提单箱信息删除 export function BatchDelBillManageCtn(data) { return request({ url: '/opApi/SeaExportBillManage/BatchDelBillManageCtn', @@ -1972,6 +1972,15 @@ export function BatchDelBillManageCtn(data) { }) } +// 提单信息删除 +export function BatchDelBillManage(data) { + return request({ + url: '/opApi/SeaExportBillManage/BatchDelBillManage', + method: 'post', + data, + }) +} + // 历史提单信息历史列表 export function GetBillManageHistoryList(data) { return request({ diff --git a/src/views/operation/seaexport/detail/components/container.vue b/src/views/operation/seaexport/detail/components/container.vue index 8210b113..e7d9cb49 100644 --- a/src/views/operation/seaexport/detail/components/container.vue +++ b/src/views/operation/seaexport/detail/components/container.vue @@ -59,6 +59,13 @@ }, setFieldsValue: { type: Function + }, + // 新建的集装箱数据 + ctnInfo: { + type: Array, + default: () => { + return [] + } } }) // 表格ref @@ -334,7 +341,7 @@ queryCondition: JSON.stringify([ { FieldName: 'bsno', - FieldValue: props.id, + FieldValue: props.details.id, ConditionalType: 1, }, ]), @@ -369,7 +376,8 @@ } } }) - GetCtnList() + list.value = props.ctnInfo + hot.loadData(props.ctnInfo) }) defineExpose({ list, diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.vue b/src/views/operation/seaexport/detail/components/ladingInfo.vue index d8e61c87..db0fe19f 100644 --- a/src/views/operation/seaexport/detail/components/ladingInfo.vue +++ b/src/views/operation/seaexport/detail/components/ladingInfo.vue @@ -19,7 +19,7 @@ - + @@ -188,6 +193,7 @@ :reload="init" ref="ladHistory" /> +