diff --git a/src/api/wms/package/index.ts b/src/api/wms/package/index.ts index 4de2d428a..a69fd81c7 100644 --- a/src/api/wms/package/index.ts +++ b/src/api/wms/package/index.ts @@ -100,7 +100,10 @@ export const createPackageLabel = async (data: PackageVO) => { export const batchPrintingLable = async (data: any) => { return await request.post({ url: `/wms/package/batchPrintingLable`, data }) } - +// 获取标签信息 +export const getPrintingLableId = async (data: any) => { + return await request.put({ url: `/wms/package/getLablesByPackingNumber`, data }) +} // 批量打印标签 export const batchPrintingLableGet = async (params: any) => { return await request.get({ url: `/wms/package/batchPrintingBalanceLable`, params }) diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue index 3275b32c4..d03385eba 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/index.vue @@ -168,7 +168,8 @@ import { PurchasereceiptRequestDetail, PurchasereceiptRequestDetailRules, PurchasereceiptRequestDetailLabel, - PurchasereceiptRequestDetailPackingNumber + PurchasereceiptRequestDetailPackingNumber, + PurchasereceiptRequestPackage } from './purchasereceiptRequestMain.data' import { SupplierdeliverRequestPackage @@ -559,7 +560,7 @@ const labelPrint = async (row) => { const { getList:getListPrint } = tableMethods await getListPrint() tableObject.loading = false - const tableColumns = SupplierdeliverRequestPackage.allSchemas.tableFormColumns + const tableColumns = PurchasereceiptRequestPackage.allSchemas.tableFormColumns tableColumns.forEach((item) => { item.width = item.table?.width }) @@ -580,14 +581,38 @@ const searchTableSuccess1 = async (formField, searchField, val, formRef, type, r return } // window.open(src.value + '&asn_number=' + val.map(item1=>item1.number).join(',')) - - await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { + let array = [] + let array1 = [] + let packingNumbers = [] + val.forEach(item => { + packingNumbers.push(item.number) + if (item.itemType == '可采购') { + array.push(item) + } else if(item.itemType == '可制造') { + array1.push(item) + } + }) + if (array.length>0) { + // window.open('http://www.baidu.com') + // window.open('https://docs.pingcode.com/baike/3720496') + await PackageApi.getPrintingLableId({packingNumbers:packingNumbers}).then(res => { + console.log(res) + window.open(BASE_URL + '/jmreport/view/1016234988731322368?token=' + getAccessToken()+'&id=' + res) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + } + if (array1.length > 0) { + await PackageApi.batchPrintingLable(val.map(item1=>item1.number).join(',')).then(res => { console.log(res) window.open(src.value + '&asn_number=' + res) - }).catch(err => { - console.log(err) - message.error('创建标签失败') - }) + }).catch(err => { + console.log(err) + message.error('创建标签失败') + }) + } + } const updateTableData = (tableList)=>{ diff --git a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts index 976764562..fe14ae1ab 100644 --- a/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/purchasereceipt/purchasereceiptRequestMain/purchasereceiptRequestMain.data.ts @@ -2555,3 +2555,72 @@ export const PurchasereceiptRequestDetailLabel = useCrudSchemas(reactive([ + + { + label: '物料代码', + field: 'itemCode', + sort: 'custom', + isSearch: true, + table: { + }, + tableForm: { + disabled: true + } + }, + { + label: '批次', + field: 'batch', + sort: 'custom', + isSearch: true, + tableForm: { + type: 'FormDate', + format: 'YYYYMMDD', + valueFormat: 'YYYYMMDD', + } + }, + { + label: '包装号', + field: 'number', + sort: 'custom', + isSearch: true, + table: { + }, + tableForm: { + disabled: true + } + }, + { + label: '包装规格', + field: 'packUnit', + sort: 'custom', + tableForm: { + disabled: true + } + }, + { + label: '标包数量', + field: 'packQty', + sort: 'custom', + tableForm: { + disabled: true + } + }, + { + label: '计量单位', + field: 'uom', + sort: 'custom', + dictType: DICT_TYPE.UOM, + dictClass: 'string', // 默认都是字符串类型其他暂不考虑 + form: { + component: 'Select' + }, + table: { + }, + tableForm: { + type: 'Select', + disabled: true + } + }, + +])) diff --git a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts index bfc4ff495..ad3c3c283 100644 --- a/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts +++ b/src/views/wms/purchasereceiptManage/supplierdeliver/supplierdeliverRequestMain/supplierdeliverRequestMain.data.ts @@ -1824,18 +1824,18 @@ export const SupplierdeliverRequestPackage = useCrudSchemas(reactive