Index: ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js =================================================================== diff -u -r25185 -r25186 --- ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 25185) +++ ssts-web/src/main/webapp/disinfectsystem/config/gzszyy/print/printConfig.js (.../printConfig.js) (revision 25186) @@ -1361,7 +1361,7 @@ var operationTime = printSummaryObj.operationTime?new Date(printSummaryObj.operationTime.time).Format('yyyy-MM-dd hh:mm'):""; var firstPrintTime = printSummaryObj.firstPrintTime?new Date(printSummaryObj.firstPrintTime.time).Format('yyyy-MM-dd hh:mm'):""; var tableHtml ="
"; - tableHtml += "申请科室: | "+printSummaryObj.depart + " | "; @@ -1419,31 +1419,31 @@ var printHtml = tableHtml; var goods = supplierGoods[supplier]; //printHtml += "|||||||||
供应商 | "+getDefaultString(supplier,' ')+" | |||||||||
物品名称 | 生产厂家 | 规格型号 | 数量 | 生产批号 | 注册证号 | 失效日期 | ||||
物品名称 | 生产厂家 | 规格型号 | 数量 | 生产批号 | 注册证号 | 失效日期 | ||||
" + getDefaultString(gds.tousseName,' ') + " | "; + printHtml += "" + getDefaultString(gds.tousseName,' ') + " | "; printHtml += "" + getDefaultString(gds.supplierName,' ') + " | "; printHtml += "" + getDefaultString(gds.expensiveGoodsModelName,' ') + " | "; printHtml += "" + getDefaultString(gds.amount,' ') + " | "; printHtml += "" + getDefaultString(gds.batchNumber,' ') + " | "; - printHtml += "" + getDefaultString(gds.registration,' ') + " | "; + printHtml += "" + getDefaultString(gds.registration,' ') + " | "; printHtml += "" + (gds.invalidDate?new Date(gds.invalidDate.time).Format('yyyy-MM-dd hh:mm'):" ") + " | "; printHtml += "||
"; printHtml += " | "; printHtml += " | "; printHtml += " | "; printHtml += " | "; + printHtml += " | "; printHtml += " | "; - printHtml += " | "; - printHtml += " | "; printHtml += " |