diff --git a/src/api/board.js b/src/api/board.js index 39f0f47..4020f15 100644 --- a/src/api/board.js +++ b/src/api/board.js @@ -13,6 +13,7 @@ export const getPrintsList = data => createAPI(`board/getPrintsList/${data}`,'ge export const getStockPrintList= data => createAPI(`board/getStockPrintList/${data}`,'get',data) // export const getStockPrintListHunlian= data => createAPI(`board/getStockPrintListHunlian/${data}`,'get',data) +export const getStockPrintListHunlianReturn= data => createAPI(`board/getStockPrintListHunlianReturn/${data}`,'get',data) export const updateStockPrintFlag= data => createAPI(`board/updateStockPrintFlag`,'post',data) export const SORoutingBoardForXiuBian= data => createAPI(`board/SORoutingBoardForXiuBian`,'post',data) export const SORoutingBoardForJianYan= data => createAPI(`board/SORoutingBoardForJianYan`,'post',data) diff --git a/src/router/index.js b/src/router/index.js index 320cabc..c9b74d9 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -36,6 +36,7 @@ const globalRoutes = [ { path: '/autoPrintStock', component: _import('modules/autoPrint/autoPrintStock'), name: 'autoPrintStock', meta: { title: '自动打印库存' } }, { path: '/autoPrint', component: _import('modules/autoPrint/autoPrint'), name: 'autoPrint', meta: { title: '自动打印标签' } }, { path: '/autoPrintStockHunlian', component: _import('modules/autoPrint/autoPrintStockHunlian'), name: 'autoPrintStockHunlian', meta: { title: '自动打印混炼胶库存' } }, + { path: '/autoPrintStockHunlianReturn', component: _import('modules/autoPrint/autoPrintStockHunlianReturn'), name: 'autoPrintStockHunlianReturn', meta: { title: '自动打印混炼胶退料' } }, { path: '/SORoutingBoardForXiuBian', component: _import('modules/board/SORoutingBoardForXiuBian'), name: 'SORoutingBoardForXiuBian', meta: { title: '修边工序看板' } }, { path: '/PODetailForW', component: _import('modules/board/PODetailForW'), name: 'PODetailForW', meta: { title: '外购件检验看板' } }, { path: '/transFerBoardForHunlian', component: _import('modules/board/transFerBoardForHunlian'), name: 'transFerBoardForHunlian', meta: { title: '混炼待入库看板' } }, diff --git a/src/views/modules/autoPrint/autoPrintStockHunlian.vue b/src/views/modules/autoPrint/autoPrintStockHunlian.vue index 745329f..08e035b 100644 --- a/src/views/modules/autoPrint/autoPrintStockHunlian.vue +++ b/src/views/modules/autoPrint/autoPrintStockHunlian.vue @@ -70,25 +70,7 @@ } printMaterialLabelPreview(array2); } - if(data.rows8.length>0){ - let array8=[]; - for (let i = 0; i < data.rows8.length; i++) { - for (let j = 0; j { - }) - } - - } } }) }, diff --git a/src/views/modules/autoPrint/autoPrintStockHunlianReturn.vue b/src/views/modules/autoPrint/autoPrintStockHunlianReturn.vue new file mode 100644 index 0000000..7666827 --- /dev/null +++ b/src/views/modules/autoPrint/autoPrintStockHunlianReturn.vue @@ -0,0 +1,91 @@ + + + + + diff --git a/src/views/modules/print/print_inspect_labelForB.js b/src/views/modules/print/print_inspect_labelForB.js index 0f750df..2bc1ced 100644 --- a/src/views/modules/print/print_inspect_labelForB.js +++ b/src/views/modules/print/print_inspect_labelForB.js @@ -74,18 +74,18 @@ export function printInspectLabelForB(printList) { LODOP.ADD_PRINT_TEXT(63,259,100,25,"确认结果:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",0); - LODOP.ADD_PRINT_TEXT(87,208,173,46,printData.remark); - LODOP.SET_PRINT_STYLEA(0,"FontSize",24); - LODOP.SET_PRINT_STYLEA(0,"Alignment",2); - LODOP.SET_PRINT_STYLEA(0,"Bold",1); + // LODOP.ADD_PRINT_TEXT(87,208,173,46,printData.remark); + // LODOP.SET_PRINT_STYLEA(0,"FontSize",24); + // LODOP.SET_PRINT_STYLEA(0,"Alignment",2); + // LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(42,249,93,25,"Inspector:"); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); LODOP.ADD_PRINT_TEXT(42,329,59,25,printData.userId); LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.SET_PRINT_STYLEA(0,"Bold",1); - LODOP.ADD_PRINT_TEXT(133,221,156,44,printData.inspectRemark); - LODOP.SET_PRINT_STYLEA(0,"FontSize",10); + // LODOP.ADD_PRINT_TEXT(133,221,156,44,printData.inspectRemark); + // LODOP.SET_PRINT_STYLEA(0,"FontSize",10); LODOP.ADD_PRINT_TEXT(12,232,128,24,printData.type); LODOP.SET_PRINT_STYLEA(0,"FontSize",12); LODOP.SET_PRINT_STYLEA(0,"Bold",1);