From 67c9100e2f4d14d90bd4cfa5e69ba5876acda146 Mon Sep 17 00:00:00 2001 From: zhang_li <2235006734@qqq.com> Date: Thu, 28 Nov 2024 14:56:30 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E5=88=92=E5=A4=96=E5=85=A5=E5=BA=93?= =?UTF-8?q?=E7=94=B3=E8=AF=B7=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/unplannedreceiptRequestDetail/index.ts | 6 ++++++ .../unplannedreceiptRequestMain/index.vue | 14 +++++++++++++- 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/src/api/wms/unplannedreceiptRequestDetail/index.ts b/src/api/wms/unplannedreceiptRequestDetail/index.ts index f9268afab..99ab181a3 100644 --- a/src/api/wms/unplannedreceiptRequestDetail/index.ts +++ b/src/api/wms/unplannedreceiptRequestDetail/index.ts @@ -118,3 +118,9 @@ export const importTemplate = () => { export const updateDetailPackingNumber = async (id: number, number) => { return await request.put({ url: '/wms/unplannedreceipt-request-detail/updateDetailPackingNumber?id=' + id + '&number=' + number }) } + +// 创建包装信息后更新子表数据packingNumber +export const getDetailList = async (masterId: number) => { + return await request.get({ url: '/wms/unplannedreceipt-request-detail/listForLables?masterId=' + masterId }) +} + diff --git a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue index d16b26a6e..bf9aa2d13 100644 --- a/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue +++ b/src/views/wms/inventoryjobManage/unplannedreceipt/unplannedreceiptRequestMain/index.vue @@ -926,7 +926,19 @@ const tableFormSelectOnBlur = (field, val, row, index) => { const BASE_URL = getJmreportBaseUrl() const src = ref(BASE_URL + '/jmreport/view/936912164754612224?token=' + getAccessToken()) const labelPrint = async (row) => { - window.open(src.value + '&request_number=' + row.number) + await UnplannedreceiptRequestDetailApi.getDetailList(row.masterId).then((res) => { + if (res.length > 0) { + const itemType = res.some(item=>item.itemType == '可采购') + const itemType1 = res.some(item => item.itemType == '可制造') + if (itemType) { + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + row.masterId) + } + if (itemType1) { + window.open(src.value + '&request_number=' + row.number) + } + } + }) + // window.open(src.value + '&request_number=' + row.number) } /** 初始化 **/