From 958f2e4691739a7f472bcc61922c84cc08e96f19 Mon Sep 17 00:00:00 2001 From: zhang_li Date: Thu, 17 Apr 2025 14:37:20 +0800 Subject: [PATCH] =?UTF-8?q?YT-2369=E3=80=8A=E5=8F=B7=E5=8F=A3=E5=93=81?= =?UTF-8?q?=E7=94=9F=E4=BA=A7=E7=94=B3=E8=AF=B7=E3=80=8B=E4=B8=AD=E7=9A=84?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=A0=87=E7=AD=BE=E9=A1=B5=E9=9D=A2=EF=BC=8C?= =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E7=AD=9B=E9=80=89=E5=8A=9F=E8=83=BD=EF=BC=8C?= =?UTF-8?q?=E5=8F=AF=E4=BB=A5=E7=AD=9B=E9=80=89=E5=93=81=E7=95=AA=E3=80=81?= =?UTF-8?q?=E5=93=81=E5=90=8D=E3=80=81=E8=83=8C=E7=95=AA=E3=80=81=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E5=8F=B7=E3=80=81=E6=89=B9=E6=AC=A1=E3=80=81=E5=8C=85?= =?UTF-8?q?=E8=A3=85=E8=A7=84=E6=A0=BC=E3=80=81=E8=AE=A1=E9=87=8F=E5=8D=95?= =?UTF-8?q?=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/wms/package/index.ts | 9 +++++- .../productreceiptRequestMain/index.vue | 30 ++++++++++--------- .../index.vue | 29 +++++++++--------- .../supplierdeliverRequestMain.data.ts | 1 + 4 files changed, 40 insertions(+), 29 deletions(-) diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 52fa6a9c2..e6f4942f1 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -135,7 +135,14 @@ export const getLabel = async (id: number) => { // 打印标签获取包装列表 export const getLabelDetailPage = async (params) => { - return await request.get({ url: `/wms/package/getLabelDetailPage`,params}) + // return await request.get({ url: `/wms/package/getLabelDetailPage`, params }) + if (params.isSearch) { + delete params.isSearch + const data = { ...params } + return await request.post({ url: '/wms/package/getLabelDetailSenior', data }) + } else { + return await request.get({ url: `/wms/package/getLabelDetailPage`, params }) + } } export const getLabelDetailPageByRecordId = async (params) => { return await request.get({ url: `/wms/package/getLabelDetailPageByRecordId`,params}) diff --git a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue index 2cf8f1218..f7c6a612f 100644 --- a/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceipt/productreceiptRequestMain/index.vue @@ -964,22 +964,24 @@ const handlePoint = async (row) => { const searchTableRef = ref() // const labelPrint = async (row) => { - tableObject.loading = true + // tableObject.loading = true const defaultParams = { moduleName: 'productreceipt_predict', recordNumber: row.number } - const { tableObject: tableObjectPrint, tableMethods } = useTable({ - defaultParams, - getListApi: PackageApi.getLabelDetailPage // 分页接口 - }) + // const { tableObject: tableObjectPrint, tableMethods } = useTable({ + // defaultParams, + // getListApi: PackageApi.getLabelDetailPage // 分页接口 + // }) - // 获得表格的各种操作 - const { getList: getListPrint } = tableMethods - await getListPrint() - tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns - tableColumns.forEach((item) => { - item.width = item.table?.width || 150 - }) - searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true) + // // 获得表格的各种操作 + // const { getList: getListPrint } = tableMethods + // await getListPrint() + // tableObject.loading = false + // const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns + // tableColumns.forEach((item) => { + // item.width = item.table?.width || 150 + // }) + // searchTableRef.value.openData('标签信息', tableObjectPrint, { tableColumns }, true) + + searchTableRef.value.open('标签信息', SupplierdeliverRequestPackage2.allSchemas, PackageApi.getLabelDetailPage , null, null,true, null,row,defaultParams) } // 批量打印--预生产收货 diff --git a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue index c621bedc5..471af50a7 100644 --- a/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue +++ b/src/views/wms/productionManage/productreceiptAssemble/productreceiptAssembleRequestMain/index.vue @@ -823,22 +823,23 @@ const handlePoint = async (row) => { const searchTableRef = ref() // const labelPrint = async (row) => { - tableObject.loading = true + // tableObject.loading = true const defaultParams = {'moduleName':'productreceipt_assemble','recordNumber':row.number} - const {tableObject:tableObjectPrint ,tableMethods} = useTable({ - defaultParams, - getListApi: PackageApi.getLabelDetailPage // 分页接口 - }) + // const {tableObject:tableObjectPrint ,tableMethods} = useTable({ + // defaultParams, + // getListApi: PackageApi.getLabelDetailPage // 分页接口 + // }) - // 获得表格的各种操作 - const { getList:getListPrint } = tableMethods - await getListPrint() - tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns - tableColumns.forEach((item) => { - item.width = item.table?.width || 150 - }) - searchTableRef.value.openData("标签信息",tableObjectPrint,{tableColumns},true) + // // 获得表格的各种操作 + // const { getList:getListPrint } = tableMethods + // await getListPrint() + // tableObject.loading = false + // const tableColumns = SupplierdeliverRequestPackage2.allSchemas.tableFormColumns + // tableColumns.forEach((item) => { + // item.width = item.table?.width || 150 + // }) + // searchTableRef.value.openData("标签信息", tableObjectPrint, { tableColumns }, true) + searchTableRef.value.open('标签信息', SupplierdeliverRequestPackage2.allSchemas, PackageApi.getLabelDetailPage , null, null,true, null,row,defaultParams) } diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index eb2524715..60303914b 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -2133,6 +2133,7 @@ export const SupplierdeliverRequestPackage2 = useCrudSchemas(reactive