lilei 3 år sedan
förälder
incheckning
9692ba7cee
2 ändrade filer med 19 tillägg och 9 borttagningar
  1. 8 4
      src/api/sales.js
  2. 11 5
      src/views/salesManagement/salesQuery/detail.vue

+ 8 - 4
src/api/sales.js

@@ -133,11 +133,15 @@ export const supperCodeByVin = (params) => {
 }
 }
 // 销售 详情  打印
 // 销售 详情  打印
 export const salesDetailPrint = params => {
 export const salesDetailPrint = params => {
-  return axios.request({
+  const data = {
     url: `/sales/print/${params.sn}/${params.type}`,
     url: `/sales/print/${params.sn}/${params.type}`,
-    method: 'get',
-    // responseType: 'blob'
-  })
+    method: 'get'
+  }
+  // 喷墨打印
+  if(params.type=='INK'){
+    data.responseType = 'blob'
+  }
+  return axios.request(data)
 }
 }
 // 销售 详情  导出
 // 销售 详情  导出
 export const salesDetailExport = params => {
 export const salesDetailExport = params => {

+ 11 - 5
src/views/salesManagement/salesQuery/detail.vue

@@ -216,10 +216,8 @@ export default {
       if (!data) {
       if (!data) {
         return
         return
       }
       }
-      const url = window.URL.createObjectURL(new Blob([data], { type: 'application/pdf' }))
-      document.getElementById('print').innerHTML = '<iframe id="printfsqd" name="printfsqd" src="' + url + '" hidden></iframe>'
-
-      if ((type == 'preview' || type == 'print') && this.printerType == 'NEEDLE') {
+      // 针式打印
+      if (this.printerType == 'NEEDLE') {
         const LODOP = getLodop()
         const LODOP = getLodop()
         const rx = /<body[^>]*>([\s\S]+?)<\/body>/i///
         const rx = /<body[^>]*>([\s\S]+?)<\/body>/i///
         let m = rx.exec(data)
         let m = rx.exec(data)
@@ -228,8 +226,16 @@ export default {
         LODOP.SET_PRINT_PAGESIZE(3, '2140', '45', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;45表示页底空白4.5mm
         LODOP.SET_PRINT_PAGESIZE(3, '2140', '45', '') // 这里3表示纵向打印且纸高“按内容的高度”;2140表示纸宽214.0mm;45表示页底空白4.5mm
         LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', m)
         LODOP.ADD_PRINT_HTM(0, 0, '100%', '100%', m)
         // LODOP.ADD_PRINT_TABLE(0, 0, '100%', '100%', m)
         // LODOP.ADD_PRINT_TABLE(0, 0, '100%', '100%', m)
-        LODOP.PREVIEW()
+        if (type == 'preview') {
+          LODOP.PREVIEW()
+        }
+        if (type == 'print') {
+          LODOP.PRINT()
+        }
       } else {
       } else {
+        const url = window.URL.createObjectURL(new Blob([data], { type: 'application/pdf' }))
+        document.getElementById('print').innerHTML = '<iframe id="printfsqd" name="printfsqd" src="' + url + '" hidden></iframe>'
+        // 喷墨打印
         if (type == 'preview') { //  预览
         if (type == 'preview') { //  预览
           window.open(url)
           window.open(url)
         } else if (type == 'print') { //  打印
         } else if (type == 'print') { //  打印