Merge remote-tracking branch 'origin/dev' into dev

src/views/distribution/inventory/distributionStockArticleDetails.vue

@@ -826,6 +826,7 @@ export default {
         // console.log(templateData);
         LODOP.PRINT_INITA(1, 1, 900, 660, '测试预览功能');
         LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Godex G500');
+        LODOP.SET_PRINT_STYLEA(0,"TextNeatRow",true);//允许标点溢出，且英文单词拆开
         // // 设置打印整宽且不变形
         LODOP.SET_PRINT_MODE('PRINT_PAGE_PERCENT', 'Auto-Width');
         // // 设置打印后自动关闭