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