Index: ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/print/printConfig.js
===================================================================
diff -u -r27553 -r34273
--- ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/print/printConfig.js (.../printConfig.js) (revision 27553)
+++ ssts-web/src/main/webapp/disinfectsystem/config/standardProjectTemplate/print/printConfig.js (.../printConfig.js) (revision 34273)
@@ -1090,26 +1090,50 @@
return;
}
doGetLodop();
+ //材料明细表格的默认位置定义
+ var tableTop = 0;
+ var tableLeft = 21;
+ var tableWidth = "95%";
+ var tableHeight = "100%";
+ //设置idcard的自定义打印格式,包括打印的logo图片。logo图片的宽和高要事先调整好,打印函数不能对图片进行大小的控制
+ var idCardPrintConfig = printConfig["idcardPrintConfig"];
+ var hidePackageType = false;
+ var hideSterilingMethod = false;
+ if(!isUndefinedOrNullOrEmpty(idCardPrintConfig)){
+ // 设置纸张类型为连续纸,纸张宽度为100mm,打印完毕后的下边距为20mm
+ if(idCardPrintConfig.pageSize){
+ LODOP.SET_PRINT_PAGESIZE(idCardPrintConfig.pageSize[0],idCardPrintConfig.pageSize[1],idCardPrintConfig.pageSize[2],idCardPrintConfig.pageSize[3]);
+ }
+ // 打印图片logo,前面4个参数控制图片的位置,分别为上边距,左边距,图片宽度,图片高度
+ if(idCardPrintConfig.logoFileName && idCardPrintConfig.logoPosition){
+ var url = WWWROOT+"/disinfectsystem/config/"+ projectName + "/img/" + idCardPrintConfig.logoFileName;
+ LODOP.ADD_PRINT_IMAGE(idCardPrintConfig.logoPosition[0],idCardPrintConfig.logoPosition[1],idCardPrintConfig.logoPosition[2],idCardPrintConfig.logoPosition[3],"")
+ }
+ //材料明细表格的位置
+ if(idCardPrintConfig.tablePosition){
+ tableTop = idCardPrintConfig.tablePosition[0];
+ tableLeft = idCardPrintConfig.tablePosition[1];
+ tableWidth = idCardPrintConfig.tablePosition[2];
+ tableHeight = idCardPrintConfig.tablePosition[3];
+ }
+ }
var ret = buildTousseDefinitionMeterialTable(tousseDefinitionObj,tousseDefinitionObj.unit);
var barcode = tousseDefinitionObj.barcode?tousseDefinitionObj.barcode:'';
- var tableHtml = ret.tableHtml + "
"+barcode; + //tableHtml += " "+barcode; tableHtml += " | ";
tableHtml += "器械总数量:"+ret.amount+"件"; tableHtml += " | "; tableHtml += "||||||