| 
					
				 | 
			
			
				@@ -110,26 +110,31 @@ export const jGPrint = function (data, type, callback, printLogParams, printPage 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   // 执行该语句之后,PRINT指令不再返回那个所谓“打印成功”,才能获取到打印状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  // LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   // TaskID:任务id,Value:job代码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   LODOP.On_Return = function (TaskID, Value) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    console.log(TaskID, Value) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    console.log(TaskID, Value, printLogParams) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 已打印 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    if (Value && printLogParams) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      console.log('已打印,统计打印次数') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      printLog(printLogParams, callback) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    if (Value) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      if(printLogParams){ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        console.log('已打印,统计打印次数') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        printLog(printLogParams, callback) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      }else{ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+        callback({status:200,message:'已打印'}) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      // 取消打印 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       callback() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   if (printPageSize) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    LODOP.ADD_PRINT_HTM(0, 0, '100%', '99%', data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     LODOP.SET_PRINT_PAGESIZE(3, '210mm', 100, '') 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } else { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    LODOP.SET_PRINT_PAGESIZE(1,'210mm','297mm',""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    LODOP.ADD_PRINT_HTM(0, 0, '100%', '99%', data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     LODOP.SET_SHOW_MODE('BKIMG_PRINT', 0) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    LODOP.SET_PRINT_PAGESIZE(1,'210mm','297mm',""); 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  LODOP.ADD_PRINT_HTM(0, 0, '100%', '99%', data) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+ 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   if (type == 'preview') { //  预览 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     LODOP.PREVIEW() 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } else if (type == 'print') { //  打印 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -138,7 +143,7 @@ export const jGPrint = function (data, type, callback, printLogParams, printPage 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				  
			 | 
		
	
		
			
				 | 
				 | 
			
			
				 // 批量打印销售收款单html 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-export const jGPlPrint = function (data, type, callback, printLogParams, orginData) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+export const jGPlPrint = function (data, type, callback, printLogParams, taskName) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   if (!data) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -161,12 +166,13 @@ export const jGPlPrint = function (data, type, callback, printLogParams, orginDa 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     }) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     return 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  LODOP.PRINT_INIT(taskName) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   // 执行该语句之后,PRINT指令不再返回那个所谓“打印成功”,才能获取到打印状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-  LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+  // LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   // TaskID:任务id,Value:job代码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				   LODOP.On_Return = function (TaskID, Value) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    console.log(TaskID, Value) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    console.log(TaskID, Value, printLogParams) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 已打印 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     if (Value) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if(printLogParams){ 
			 | 
		
	
	
		
			
				| 
					
				 | 
			
			
				@@ -292,14 +298,14 @@ export const jGPrintPdf = function (data, type, taskName, printLogParams, callba 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     LODOP.PRINT_INIT(taskName) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     LODOP.SET_SHOW_MODE('HIDE_PAPER_BOARD', 1) //  隐藏底图上有模拟走纸板的条纹线 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 执行该语句之后,PRINT指令不再返回那个所谓“打印成功”,才能获取到打印状态 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-    LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+    // LODOP.SET_PRINT_MODE('CATCH_PRINT_STATUS', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // 隐藏打印按钮 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     if (hidePrint) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       LODOP.SET_SHOW_MODE('HIDE_PBUTTIN_PREVIEW', true) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     } 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     // TaskID:任务id,Value:job代码 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				     LODOP.On_Return = function (TaskID, Value) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				-      console.log(TaskID, Value) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				+      console.log(TaskID, Value, printLogParams) 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       // 已打印 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				       if (Value && printLogParams) { 
			 | 
		
	
		
			
				 | 
				 | 
			
			
				         console.log('已打印,统计打印次数') 
			 |