|
@@ -85,7 +85,7 @@ export const blobToBaseByPdf = function(data,callback){
|
|
|
}
|
|
|
|
|
|
// 打印html
|
|
|
-export const jGPrint = function (data, type, printLogParams, callback) {
|
|
|
+export const jGPrint = function (data, type, callback, printLogParams) {
|
|
|
if (!data) {
|
|
|
return
|
|
|
}
|
|
@@ -115,7 +115,7 @@ export const jGPrint = function (data, type, printLogParams, callback) {
|
|
|
LODOP.On_Return=function(TaskID,Value){
|
|
|
console.log(TaskID,Value)
|
|
|
// 已打印
|
|
|
- if(Value){
|
|
|
+ if(Value&&printLogParams){
|
|
|
console.log('已打印,统计打印次数')
|
|
|
printLog(printLogParams,callback)
|
|
|
}
|
|
@@ -130,7 +130,7 @@ export const jGPrint = function (data, type, printLogParams, callback) {
|
|
|
}
|
|
|
|
|
|
// 打印
|
|
|
-export const printFun = function(url,params,type,taskName,printLogParams,callback){
|
|
|
+export const printFun = function(url,params,type,taskName,callback,printLogParams){
|
|
|
url(params).then(res => {
|
|
|
if (res.type == 'application/json') {
|
|
|
var reader = new FileReader()
|
|
@@ -197,7 +197,7 @@ export const jGPrintPdf = function (data, type, taskName, printLogParams,callbac
|
|
|
LODOP.On_Return=function(TaskID,Value){
|
|
|
console.log(TaskID,Value)
|
|
|
// 已打印
|
|
|
- if(Value){
|
|
|
+ if(Value&&printLogParams){
|
|
|
console.log('已打印,统计打印次数')
|
|
|
printLog(printLogParams,callback)
|
|
|
}
|