|  | @@ -1946,43 +1946,43 @@ console.log("dfds",patientId,times,serialNo)
 | 
	
		
			
				|  |  |   * @param type 1 打印二维码  2 下载pdf
 | 
	
		
			
				|  |  |   */
 | 
	
		
			
				|  |  |  function downOrPrintDzfp(type) {
 | 
	
		
			
				|  |  | -console.log("11111111111111111111111111111")
 | 
	
		
			
				|  |  | -console.log("dfds",dzfp_patientId,dzfp_times,dzfp_serialNo)
 | 
	
		
			
				|  |  | -    downloadDzfp(dzfp_patientId,dzfp_times,dzfp_serialNo)
 | 
	
		
			
				|  |  | +//console.log("11111111111111111111111111111")
 | 
	
		
			
				|  |  | +//console.log("dfds",dzfp_patientId,dzfp_times,dzfp_serialNo)
 | 
	
		
			
				|  |  | +    downloadDzfp(dzfp_patientId,dzfp_times,dzfp_serialNo,type)
 | 
	
		
			
				|  |  |  }
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  
 | 
	
		
			
				|  |  |  //下载电子发票
 | 
	
		
			
				|  |  | -function downloadDzfp(patientId,times,serialNo) {
 | 
	
		
			
				|  |  | +function downloadDzfp(patientId,times,serialNo,type) {
 | 
	
		
			
				|  |  |      setPrint();
 | 
	
		
			
				|  |  |      postAjaxJsonHttpRequst("/thmz/selectDzfpUploadAboutSerialNo",{patientId:patientId,times:times,serialNo:serialNo},true,function (res) {
 | 
	
		
			
				|  |  |          if(res.code == 0){
 | 
	
		
			
				|  |  |              $("#dzfpDownModal").modal("hide");
 | 
	
		
			
				|  |  |              if(res.data.resUrl){
 | 
	
		
			
				|  |  | -                window.open(res.data.resUrl)
 | 
	
		
			
				|  |  | +                if(type == 2 || !stringNotBlank(type)){
 | 
	
		
			
				|  |  | +                    window.open(res.data.resUrl)
 | 
	
		
			
				|  |  | +                }else {
 | 
	
		
			
				|  |  | +                //打印二维码
 | 
	
		
			
				|  |  | +                   let height = "70mm"
 | 
	
		
			
				|  |  | +                   let  bkimgWidth = "110mm"
 | 
	
		
			
				|  |  | +                    LODOP = getLodop();
 | 
	
		
			
				|  |  | +                    LODOP.PRINT_INITA(6, 0, bkimgWidth, height, hospitalName+"门诊电子发票二维码打印");
 | 
	
		
			
				|  |  | +                    //设置默认打印机
 | 
	
		
			
				|  |  | +                    LODOP.SET_PRINTER_INDEX(printIndex);
 | 
	
		
			
				|  |  | +                    LODOP.SET_SHOW_MODE("BKIMG_WIDTH", bkimgWidth);
 | 
	
		
			
				|  |  | +                    LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", height);
 | 
	
		
			
				|  |  | +                    LODOP.SET_PRINT_PAGESIZE(1,bkimgWidth, height, "CreateCustomPage");
 | 
	
		
			
				|  |  | +                    LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊电子发票二维码");//对新建的纸张重命名
 | 
	
		
			
				|  |  | +                    LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
 | 
	
		
			
				|  |  | +                    LODOP.ADD_PRINT_TEXT("6mm", "3mm", "60mm", "3mm", hospitalName+"发票二维码");
 | 
	
		
			
				|  |  | +                    LODOP.ADD_PRINT_IMAGE("10mm", "3mm", "50mm", "50mm", "data:image/png;base64,"+res.data.qrcode);
 | 
	
		
			
				|  |  | +                    LODOP.PRINT();
 | 
	
		
			
				|  |  | +                    // LODOP.PREVIEW();
 | 
	
		
			
				|  |  | +                }
 | 
	
		
			
				|  |  |              } else {
 | 
	
		
			
				|  |  |                  errorMesage("未获取到电子发票,请重新上传发票!");
 | 
	
		
			
				|  |  |              }
 | 
	
		
			
				|  |  | -//            if(type == 2 || !stringNotBlank(type)){
 | 
	
		
			
				|  |  | -//                base64toPDF(res.data.pdfFileStr)
 | 
	
		
			
				|  |  | -//            }else {
 | 
	
		
			
				|  |  | -//            //打印二维码
 | 
	
		
			
				|  |  | -//               let height = "70mm"
 | 
	
		
			
				|  |  | -//               let  bkimgWidth = "110mm"
 | 
	
		
			
				|  |  | -//                LODOP = getLodop();
 | 
	
		
			
				|  |  | -//                LODOP.PRINT_INITA(6, 0, bkimgWidth, height, hospitalName+"门诊电子发票二维码打印");
 | 
	
		
			
				|  |  | -//                //设置默认打印机
 | 
	
		
			
				|  |  | -//                LODOP.SET_PRINTER_INDEX(printIndex);
 | 
	
		
			
				|  |  | -//                LODOP.SET_SHOW_MODE("BKIMG_WIDTH", bkimgWidth);
 | 
	
		
			
				|  |  | -//                LODOP.SET_SHOW_MODE("BKIMG_HEIGHT", height);
 | 
	
		
			
				|  |  | -//                LODOP.SET_PRINT_PAGESIZE(1,bkimgWidth, height, "CreateCustomPage");
 | 
	
		
			
				|  |  | -//                LODOP.SET_PRINT_MODE("CREATE_CUSTOM_PAGE_NAME", "门诊电子发票二维码");//对新建的纸张重命名
 | 
	
		
			
				|  |  | -//                LODOP.SET_PRINT_STYLE("FontSize", 11); //字体大小
 | 
	
		
			
				|  |  | -//                LODOP.ADD_PRINT_TEXT("6mm", "3mm", "60mm", "3mm", hospitalName+"发票二维码");
 | 
	
		
			
				|  |  | -//                LODOP.ADD_PRINT_IMAGE("10mm", "3mm", "50mm", "50mm", "data:image/png;base64,"+res.data.qrcode);
 | 
	
		
			
				|  |  | -//                LODOP.PRINT();
 | 
	
		
			
				|  |  | -//                // LODOP.PREVIEW();
 | 
	
		
			
				|  |  | -//            }
 | 
	
		
			
				|  |  | +
 | 
	
		
			
				|  |  |          }else {
 | 
	
		
			
				|  |  |              errorMesage(res)
 | 
	
		
			
				|  |  |          }
 |