diff --git a/src/option/distribution/arteryDistrilbutionBillLadingList.js b/src/option/distribution/arteryDistrilbutionBillLadingList.js index 99ff4abb..ff98602c 100644 --- a/src/option/distribution/arteryDistrilbutionBillLadingList.js +++ b/src/option/distribution/arteryDistrilbutionBillLadingList.js @@ -618,9 +618,9 @@ export const columnNewList = [ isshowSummary: true, }, { - prop: 'planNum', - label: '计划件数', - type: 6, + prop: 'noBillladingNum', + label: '未入库件数', + type: 1, values: '', width: '130', checkarr: [], diff --git a/src/utils/print.js b/src/utils/print.js index 15609519..9892fea8 100644 --- a/src/utils/print.js +++ b/src/utils/print.js @@ -2,22 +2,22 @@ import { getLodop } from '@/utils/LodopFuncs'; import hwyPrintNew from '@/utils/print/index'; /** 处理标签打印 */ -const handleTitlePrint = (LODOP, templateData)=>{ - LODOP.PRINT_INITA(""); +const handleTitlePrint = (LODOP, templateData) => { + LODOP.PRINT_INITA(''); // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500'); LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出,且英文单词拆开 // LODOP.SET_PRINT_STYLE('FontColor', '#000000'); // // 设置打印整宽且不变形 - LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '60%'); + LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', '95%'); // // 设置打印后自动关闭 LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); - // // data就是一段html文本 - LODOP.ADD_PRINT_HTM('30', '0%', '100%', '100%', templateData); -} + // // data就是一段html文本 + LODOP.ADD_PRINT_HTM('30', '0%', '100%', '100%', templateData); +}; /** 打印配送单 */ -const handleDeliveryPrint = (LODOP, templateData)=>{ - LODOP.PRINT_INITA(""); +const handleDeliveryPrint = (LODOP, templateData) => { + LODOP.PRINT_INITA(''); // LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500'); LODOP.SET_PRINT_STYLEA(0, 'TextNeatRow', true); //允许标点溢出,且英文单词拆开 // LODOP.SET_PRINT_STYLE('FontColor', '#000000'); @@ -27,8 +27,8 @@ const handleDeliveryPrint = (LODOP, templateData)=>{ LODOP.SET_PRINT_MODE('AUTO_CLOSE_PREWINDOW', 1); // // data就是一段html文本 - LODOP.ADD_PRINT_HTM('0', '0%', '100%%', "100%", templateData); -} + LODOP.ADD_PRINT_HTM('0', '0%', '100%%', '100%', templateData); +}; /** * 根据传入的元素列表进行打印 @@ -50,10 +50,8 @@ const print = (nodeList, type = 'deliveryPrint') => { let templateData = orderNode.innerHTML; // let templateData="

1111

" - - - if (type === 'titlePrint') handleTitlePrint(LODOP, templateData) - else handleDeliveryPrint(LODOP, templateData) + if (type === 'titlePrint') handleTitlePrint(LODOP, templateData); + else handleDeliveryPrint(LODOP, templateData); // LODOP.NewPage() // LODOP.PRINT(); //直接打印 LODOP.PRINT_DESIGN(); @@ -74,7 +72,4 @@ const newPrint = nodeName => { hwyPrintNew('.el-dialog__body>div>div>div'); }; - - - export default print; diff --git a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue index 182c13ba..c4497036 100644 --- a/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/addArteryDistrilbutionBillLadingList.vue @@ -305,9 +305,9 @@ @selection="list => selectionChange(list, 1)" >