瀏覽代碼

Merge branch 'develop_yh23' of http://git.chelingzhu.com/jianguan-web/jg-ocs-html into develop_cuxiao

# Conflicts:
#	src/libs/JGPrint.js
lilei 1 年之前
父節點
當前提交
9c0f2fb5fc
共有 2 個文件被更改,包括 2 次插入2 次删除
  1. 1 1
      public/version.json
  2. 1 1
      src/libs/JGPrint.js

+ 1 - 1
public/version.json

@@ -1,4 +1,4 @@
 {
 {
-    "version": "2.2.42",
+    "version": "2.2.45",
     "message": "发现有新版本发布,确定更新系统?"
     "message": "发现有新版本发布,确定更新系统?"
 }
 }

+ 1 - 1
src/libs/JGPrint.js

@@ -397,7 +397,7 @@ export const jGPrintPdf = function (data, type, taskName, printLogParams, callba
       }
       }
     }
     }
     LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', dataurl.replace('data:application/pdf;base64,', ''))
     LODOP.ADD_PRINT_PDF(0, 0, '100%', '100%', dataurl.replace('data:application/pdf;base64,', ''))
- 
+
     if (type == 'preview') { //  预览
     if (type == 'preview') { //  预览
       LODOP.PREVIEW()
       LODOP.PREVIEW()
     } else if (type == 'print') { //  打印
     } else if (type == 'print') { //  打印