diff --git a/src/api/shopOrder/workOrderDetailsAlloc.js b/src/api/shopOrder/workOrderDetailsAlloc.js new file mode 100644 index 0000000..14d0177 --- /dev/null +++ b/src/api/shopOrder/workOrderDetailsAlloc.js @@ -0,0 +1,31 @@ +import { createAPI } from '@/utils/httpRequest.js' + +// -------------工单明细数据汇总-------------- + +/** + * 分页查询工单明细汇总主信息 + * @param {Object} data 查询条件 + */ +export const searchWorkOrderDetailsForAlloc = data => + createAPI(`/shopOrder/workOrderDetailsAlloc/searchWorkOrderDetails`, 'post', data) + +/** + * 根据allocType查询工单汇总数据 + * @param {Object} data 查询条件 + */ +export const selectWorkOrderDetailsByAllocType = data => + createAPI(`/shopOrder/workOrderDetailsAlloc/list`, 'post', data) + +/** + * 执行工单明细数据汇总（调用存储过程） + * @param {Object} data 请求参数 + */ +export const executeWorkOrderDetailsAlloc = data => + createAPI(`/shopOrder/workOrderDetailsAlloc/executeAlloc`, 'post', data) + +/** + * 执行工单数据回传（调用U8接口） + * @param {Object} data 请求参数 + */ +export const executeWorkOrderDetailsSync = data => + createAPI(`/shopOrder/workOrderDetailsAlloc/executeSync`, 'post', data) diff --git a/src/mixins/labelPrintTemplates.js b/src/mixins/labelPrintTemplates.js index 8780075..a058730 100644 --- a/src/mixins/labelPrintTemplates.js +++ b/src/mixins/labelPrintTemplates.js @@ -173,13 +173,15 @@ export default { const lineHeight = '3.5mm'; // 行高（避免同字号时看起来偏小） // 第1行：编码（左） + Packing List（右） + // 优化点：Packing List 最长5位，区域缩小到12mm，No.区域扩展到36mm。 const packingList = printData.packingList || printData.PackingList || printData.packinglist || ''; - // 第一行总可用宽度约 48mm：No 区 28mm，Packing List 区 20mm - const text1 = LODOP.ADD_PRINT_TEXT('2.8mm', startX, '28mm', lineHeight, `No.:${printData.partNo || ''}`); - LODOP.SET_PRINT_STYLEA(text1, "FontName", "Microsoft YaHei"); // 使用Arial，比微软雅黑窄 + const noLineWidth = '36mm'; + const packingStartX = '56mm'; + const packingWidth = '12mm'; + const text1 = LODOP.ADD_PRINT_TEXT('2.8mm', startX, noLineWidth, lineHeight, `No.:${printData.partNo || ''}`); + LODOP.SET_PRINT_STYLEA(text1, "FontName", "Microsoft YaHei"); LODOP.SET_PRINT_STYLEA(text1, "FontSize", fontSize); - // 右侧从48mm开始，宽20mm，结束于68mm，不会超出边框 - const text1Right = LODOP.ADD_PRINT_TEXT('2.8mm', '48mm', '20mm', lineHeight, `${packingList}`); + const text1Right = LODOP.ADD_PRINT_TEXT('2.8mm', packingStartX, packingWidth, lineHeight, `${packingList}`); LODOP.SET_PRINT_STYLEA(text1Right, "FontName", "Microsoft YaHei"); LODOP.SET_PRINT_STYLEA(text1Right, "FontSize", packingFontSize); LODOP.SET_PRINT_STYLEA(text1Right, "Alignment", 1); @@ -316,13 +318,15 @@ export default { const lineHeight = '4mm'; // 行高 // 第1行：编码（左） + Packing List（右） + // 优化点：Packing List 最长5位，区域缩小到12mm，No.区域扩展到36mm。 const packingList = printData.packingList || printData.PackingList || printData.packinglist || ''; - // 第一行总可用宽度约 48mm：No 区 28mm，Packing List 区 20mm - const text1 = LODOP.ADD_PRINT_TEXT('3.5mm', startX, '28mm', lineHeight, `No.:${printData.partNo || ''}`); + const noLineWidth = '36mm'; + const packingStartX = '56mm'; + const packingWidth = '12mm'; + const text1 = LODOP.ADD_PRINT_TEXT('3.5mm', startX, noLineWidth, lineHeight, `No.:${printData.partNo || ''}`); LODOP.SET_PRINT_STYLEA(text1, "FontName", "Microsoft YaHei"); LODOP.SET_PRINT_STYLEA(text1, "FontSize", fontSize); - // 右侧从48mm开始，宽20mm，结束于68mm，不会超出边框 - const text1Right = LODOP.ADD_PRINT_TEXT('3.5mm', '48mm', '20mm', lineHeight, `${packingList}`); + const text1Right = LODOP.ADD_PRINT_TEXT('3.5mm', packingStartX, packingWidth, lineHeight, `${packingList}`); LODOP.SET_PRINT_STYLEA(text1Right, "FontName", "Microsoft YaHei"); LODOP.SET_PRINT_STYLEA(text1Right, "FontSize", packingFontSize); LODOP.SET_PRINT_STYLEA(text1Right, "Alignment", 1); diff --git a/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue b/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue new file mode 100644 index 0000000..a066bba --- /dev/null +++ b/src/views/modules/shopOrder/workOrderAlloc/searchWorkOrderDetailsAlloc.vue @@ -0,0 +1,963 @@ + + + + +