From 15925549878a49caa1ea7c37f8abeea2b987ca68 Mon Sep 17 00:00:00 2001 From: lijingjia Date: Wed, 17 Jul 2024 16:02:31 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B4=B9=E7=94=A8=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/ConfigForm/index.vue | 2 +- src/components/CostEntry/actionBar.vue | 59 ++++++++-- .../operation/seaexport/api/BookingLedger.js | 17 +++ .../seaexport/components/SelectTextArea.vue | 4 + .../seaexport/components/tableActionBar.vue | 56 ---------- .../components/tableActionBarRight.vue | 25 ++--- .../detail/components/ladingHistory.vue | 103 ++++++++++++++++++ .../detail/components/ladingInfo.tsx | 72 +++++++++++- .../detail/components/ladingInfo.vue | 16 ++- .../operation/seaexport/detail/index.vue | 2 +- .../seaexport/detail/modules/goodsTable.vue | 25 ++++- .../seaexport/detail/modules/rightContent.vue | 8 +- 12 files changed, 294 insertions(+), 95 deletions(-) create mode 100644 src/views/operation/seaexport/detail/components/ladingHistory.vue diff --git a/src/components/ConfigForm/index.vue b/src/components/ConfigForm/index.vue index 33fdc79c..ec176551 100644 --- a/src/components/ConfigForm/index.vue +++ b/src/components/ConfigForm/index.vue @@ -24,7 +24,7 @@ import { editCodeGoodsType } from '/@/views/baseinfo/formset/api' // 引入表格权限信息（包含id和name） import { permissionsInfo } from '/@/hooks/web/usePermission' - // 引入提升信息 + // 引入提示信息 import { useMessage } from '/@/hooks/web/useMessage' // 默认图标 import { DiffOutlined } from '@ant-design/icons-vue' diff --git a/src/components/CostEntry/actionBar.vue b/src/components/CostEntry/actionBar.vue index c25727e3..94fa11a9 100644 --- a/src/components/CostEntry/actionBar.vue +++ b/src/components/CostEntry/actionBar.vue @@ -74,13 +74,13 @@ @@ -454,6 +454,48 @@ const dsPrint = ref(null) // 打印费用 const printFee = async (type) => { + const selectRow = props.data.filter(item => { + return item.selected + }) + if (type == 1) { + if (!selectRow.length) { + return createMessage.warning('请勾选要打印的费用！') + } + dsPrint.value.init(selectRow) + } else if (type == 2) { + if (!selectRow.length) { + return createMessage.warning('请勾选要打印的费用！') + } + let customerNames = selectRow.map(item => { + return item.customerName + }) + if (customerNames.length) { + customerNames = Array.from(new Set(customerNames)) + const arr = [] + props.data.forEach(res => { + customerNames.forEach(item => { + if (res.customerName == item) { + arr.push(res) + } + }) + }) + dsPrint.value.init(arr) + } + } else { + // 所有打印 + dsPrint.value.init(props.data) + } + // const ids = props.data.map(item => { + // return item.id + // }) + // GetPrintInfo({ businessType: 1, ids }).then(res => { + // console.log(res.data.details) + // const data = res?.data?.details + // dsPrint.value.init(data) + // }) + } + // 核算单打印 + const printAccount = async () => { const ids = props.data.map(item => { return item.id }) @@ -462,11 +504,6 @@ const data = res?.data?.details dsPrint.value.init(data) }) - return - dsPrint.value.init() - const p = await GetOpenPrintModuleList() - console.log(p) - return } diff --git a/src/views/operation/seaexport/api/BookingLedger.js b/src/views/operation/seaexport/api/BookingLedger.js index bb6c65cf..ab6f1002 100644 --- a/src/views/operation/seaexport/api/BookingLedger.js +++ b/src/views/operation/seaexport/api/BookingLedger.js @@ -1953,3 +1953,20 @@ export function BatchDelBillManageCtn(data) { }) } +// 历史提单信息历史列表 +export function GetBillManageHistoryList(data) { + return request({ + url: '/opApi/SeaExportBillManage/GetBillManageHistoryList', + method: 'post', + data + }) +} + +// 历史引入提单信息 +export function ImportBillManageHistory(data) { + return request({ + url: '/opApi/SeaExportBillManage/ImportBillManageHistory', + method: 'post', + data + }) +} diff --git a/src/views/operation/seaexport/components/SelectTextArea.vue b/src/views/operation/seaexport/components/SelectTextArea.vue index 7c21a295..1edfa6ec 100644 --- a/src/views/operation/seaexport/components/SelectTextArea.vue +++ b/src/views/operation/seaexport/components/SelectTextArea.vue @@ -414,6 +414,7 @@ font-size: 12px; position: relative; top: 3px; + white-space: nowrap; } .ant-select-arrow { top: 14px; @@ -446,6 +447,9 @@ margin-bottom: 4px; cursor: pointer; } + .right { + white-space: nowrap; + } .line-count { position: absolute; right: -15px; diff --git a/src/views/operation/seaexport/components/tableActionBar.vue b/src/views/operation/seaexport/components/tableActionBar.vue index ea4a3aa2..38d22b47 100644 --- a/src/views/operation/seaexport/components/tableActionBar.vue +++ b/src/views/operation/seaexport/components/tableActionBar.vue @@ -13,34 +13,6 @@ 小票状态 - - - { - return item.id - }) - if (pkIdArr.length === 0 || pkIdArr.length > 1) { - createMessage.warning('请仅选择一条数据！') - return false - } - copyMoreFlag.value = true - } - function handleSubmitCopyMore(e) { - const select = props.selectRow() - const pkIdArr = select.map((item) => { - return item.id - }) - for (let index = 0; index < copyMoreForm.number; index++) { - setTimeout(() => { - console.log(`/?id=${pkIdArr[0]}&isCopy=${true}©Id=${index}`) - router.push({ - path: '/BookingDetail', - query: { id: pkIdArr[0], isCopy: true, copyId: index }, - }) - }, 100) - } - copyMoreFlag.value = false - } // 批量编辑 弹窗 const [registerModal, { openModal }] = useModal() // 批量编辑开关 diff --git a/src/views/operation/seaexport/components/tableActionBarRight.vue b/src/views/operation/seaexport/components/tableActionBarRight.vue index 8ed07e60..2da47ff2 100644 --- a/src/views/operation/seaexport/components/tableActionBarRight.vue +++ b/src/views/operation/seaexport/components/tableActionBarRight.vue @@ -38,6 +38,7 @@ @@ -58,9 +60,9 @@ > - +
确定 - +
@@ -72,7 +74,7 @@ import { useMessage } from '/@/hooks/web/useMessage' import { useRouter } from 'vue-router' import { useModal } from '/@/components/Modal' - import { SeaExportBatchDel, SaveBookingTxxp } from '../api/BookingLedger.js' + import { SeaExportBatchDel, SaveBookingTxxp, SeaExportCopy } from '../api/BookingLedger.js' import BatchModification from '../modules/BatchModification.vue' const router = useRouter() const { createMessage } = useMessage() @@ -106,19 +108,12 @@ } copyMoreFlag.value = true } - function handleSubmitCopyMore(e) { + function handleSubmitCopyMore() { const select = props.selectRow() - const pkIdArr = select.map((item) => { - return item.id - }) - for (let index = 0; index < copyMoreForm.number; index++) { - setTimeout(() => { - console.log(`/?id=${pkIdArr[0]}&isCopy=${true}©Id=${index}`) - router.push({ - path: '/BookingDetail', - query: { id: pkIdArr[0], isCopy: true, copyId: index }, - }) - }, 100) + for (var i = 0; i < copyMoreForm.number; i++) { + SeaExportCopy({ id: select[0].id }).then(res => { + props.reload() + }) } copyMoreFlag.value = false } diff --git a/src/views/operation/seaexport/detail/components/ladingHistory.vue b/src/views/operation/seaexport/detail/components/ladingHistory.vue new file mode 100644 index 00000000..d78e89be --- /dev/null +++ b/src/views/operation/seaexport/detail/components/ladingHistory.vue @@ -0,0 +1,103 @@ + + + + + + \ No newline at end of file diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.tsx b/src/views/operation/seaexport/detail/components/ladingInfo.tsx index 2d796dec..5708bca4 100644 --- a/src/views/operation/seaexport/detail/components/ladingInfo.tsx +++ b/src/views/operation/seaexport/detail/components/ladingInfo.tsx @@ -1,4 +1,4 @@ -import { FormSchema } from '/@/components/Table' +import { FormSchema, BasicColumn } from '/@/components/Table' import SelectTextArea from '/@/views/operation/seaexport/components/SelectTextArea.vue' import { useOptionsStore } from '/@/store/modules/options' import { GetPackageSelectList } from '/@/views/operation/seaexport/api/BookingLedger' @@ -914,4 +914,72 @@ export const formSchema5: FormSchema[] = [ defaultValue: '', colProps: { span: 12 } } -] \ No newline at end of file +] + +// 历史提单表格 +export const columns: BasicColumn[] = [ + { + title: '主提单号', + dataIndex: 'mblno', + width: 150, + }, + { + title: '船名', + dataIndex: 'vessel', + width: 150, + }, + { + title: '航次', + dataIndex: 'voyno', + width: 110, + }, + { + title: '开船日期', + dataIndex: 'etd', + width: 120, + }, + { + title: '装货港', + dataIndex: 'loadPort', + width: 140, + }, + { + title: '卸货港', + dataIndex: 'dischargePort', + width: 140, + }, + { + title: '发货人内容', + dataIndex: 'shipperContent', + width: 140, + }, + { + title: '收货人内容', + dataIndex: 'consigneeContent', + width: 140, + }, + { + title: '代理内容', + dataIndex: 'agentContent', + width: 140, + }, +] +export const searchFormSchema: FormSchema[] = [ + { + field: 'mblno', + label: '主提单号', + component: 'Input', + colProps: { span: 6 }, + }, + { + field: 'etd', + label: '开船日期', + component: 'RangePicker', + required: false, + dynamicDisabled: false, + colProps: { span: 6 }, + componentProps: { + allowClear: true + } + } +] diff --git a/src/views/operation/seaexport/detail/components/ladingInfo.vue b/src/views/operation/seaexport/detail/components/ladingInfo.vue index c3fba4e1..13d43504 100644 --- a/src/views/operation/seaexport/detail/components/ladingInfo.vue +++ b/src/views/operation/seaexport/detail/components/ladingInfo.vue @@ -13,7 +13,7 @@ 调入主单信息 - + 历史引入 @@ -159,6 +159,11 @@ +