diff --git a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue index d510fd7e..fd93e7c6 100644 --- a/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue +++ b/src/views/basicdata/warehouse/goodsAllocation/BasicdataGoodsAllocationtt.vue @@ -593,7 +593,7 @@ export default { let qr = checkcode.join(','); console.log(qr); - getPrintTemplate(qr).then(res => { + getPrintTemplate({ids:qr}).then(res => { // this.orderPackageCode = res.data console.log(res.data); this.html = ''; diff --git a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue index 3517cdca..977fb8cf 100644 --- a/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue +++ b/src/views/basicdata/warehouse/goodsShelf/basicdataGoodsShelf.vue @@ -446,6 +446,7 @@ import { getLodop } from '@/utils/LodopFuncs.js'; import { exportBlob } from '@/api/common'; import { getToken } from '@/utils/auth'; import { downloadXls, setNodeHeight } from '@/utils/util'; +import print from '@/utils/print'; export default { data() { return { @@ -994,10 +995,10 @@ export default { // checkcode.push(item.orderPackageCode) }); - let qr = checkcode.join(','); - console.log(qr); + let ids = checkcode.join(','); + console.log(ids); this.html = ''; - getPrintTemplate(qr).then(res => { + getPrintTemplate({ ids }).then(res => { // this.orderPackageCode = res.data console.log(res.data); this.html = this.getHtmls(res.data.data.dataList, res.data.data.templateHtml); @@ -1179,7 +1180,6 @@ export default { const data = res.data.data; this.areaoption = data; }); - }, handleEdit(row) { this.title = '编辑'; @@ -1355,9 +1355,6 @@ export default { // }) // }, printTemplate() { - let LODOP = getLodop(); - console.log('this.ids>>>>>', this.ids); - console.log('this.ids>>>>>', this.allselectionList); if (this.allselectionList.length === 0) { this.$message.warning('请选择至少一条数据'); return; @@ -1365,26 +1362,7 @@ export default { const nodeList = document.querySelectorAll('.printNode > div'); - // getPrintTemplate(this.ids).then(res => { - // let templateData = res.data.data; - // let templateData = "res.data.data"; - // console.log(templateData); - LODOP.PRINT_INITA('测试预览功能'); - // LODOP.PRINT_INITA("测试预览功能"); - // LODOP.SET_PRINT_PAGESIZE(1, 0, 0, 'A4'); - LODOP.SET_PRINT_MODE('WINDOW_DEFPRINTER', 'Deli DL-888T'); - LODOP.SET_PRINT_PAGESIZE(2, '210mm', '50mm', ''); - LODOP.SET_SHOW_MODE('LANDSCAPE_DEFROTATED', 1); - - // // 设置打印后自动关闭 - LODOP.SET_PRINT_MODE('WINDOW_DEFPAGESIZE', 1); - // // data就是一段html文本 - nodeList.forEach(val => { - LODOP.ADD_PRINT_HTM('0%', '0%', '100%', '100%', val.innerHTML); - LODOP.NewPage(); - }); - LODOP.PREVIEW(); //预览(预览打印无脚标) - // }); + print(nodeList); }, rowDel(row) { this.$confirm('确定将选择数据删除?', { diff --git a/src/views/distribution/inventory/distrilbutionBillLadingList.vue b/src/views/distribution/inventory/distrilbutionBillLadingList.vue index 48575343..11416255 100644 --- a/src/views/distribution/inventory/distrilbutionBillLadingList.vue +++ b/src/views/distribution/inventory/distrilbutionBillLadingList.vue @@ -140,7 +140,7 @@ > - + 打印