Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r23581 -r23871 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 23581) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 23871) @@ -4,6 +4,8 @@ var PRINT_FORM_TYPE_DISINFECT_GOODS_APPLICATION = "disinfectGoodsApplication"; // 消毒物品申请单 var PRINT_FORM_TYPE_RECYCLINGRECORD = "recycling"; // 回收单 var PRINT_FORM_TYPE_BORROW = "borrow"; // 借物单 +//simon-add-test +var PRINT_FORM_TYPE_BORROW_CHARGE = "borrowCharge"; // 借物收费单 var PRINT_FORM_TYPE_INVOICE = "invoice"; // 发货单 var paperType = 1; @@ -210,6 +212,8 @@ } return style; } + + //根据配置的表单打印信息，以及从服务器取到的物品信息数据，打印表单 function print2(printSummaryObj){ doGetLodop(); @@ -2215,19 +2219,26 @@ tableHtml += "数量"; tableHtml += "
器械名称
"; tableHtml += "数量"; + //simon-add + tableHtml += "
器械名称
"; + tableHtml += "数量"; tableHtml += ""; var materials = []; if(!isUndefinedOrNullOrEmpty(tousseDefinition) && !isUndefinedOrNullOrEmpty(tousseDefinition.materialInstances)){ materials = tousseDefinition.materialInstances; } var total = materials.length; - var isEven = true; //判断材料的数量是奇数还是偶数 - if(total%2 != 0){ - isEven = false; + var remainder = 0; //simon-edit:计算总数除以3的余数 + if(total%3 == 1){ + remainder = 1; + total=total+2; + }else if(total%3 == 2){ + remainder = 2; total++; } - total /= 2; + //simon-edit:现在要分成三部分 + total /= 3; var amount = 0; //之所以用这种方式是因为用户习惯从上往下清点材料，而不是从左往右 for(var i=0;i"; - - if(i==total-1 && !isEven){ - tableHtml += ""; - tableHtml += "
"; + tableHtml += ""+materialName; + tableHtml += "
"+count+"
"; + //simon-edit:更新判断条件：遍历到最后一个并且当总数/3的余数为2时才再最后面增加一个空 + if(i==total-1&& (remainder!=0)){ + //simon:添加第二部分的内容 + var record2 = materials[total+i]; + var materialName2 = record2.materialDefinition.name; + var specification2 = record2.materialDefinition.specification; + var type2 = record2.materialDefinition.type; + if(specification2 != 'null' && specification2 != ""){ + materialName2 += "["+specification2+"]"; + } + var count2 = record2.count; + if(type2 != '一次性物品'){ + amount += parseInt(count2); + } + tableHtml += ""+materialName2; + tableHtml += "
"+count2+"
"; + tableHtml += ""; + + tableHtml += ""; + tableHtml += "
"; + }else if(i==total-2&&(remainder == 1)){ + //simon:添加第二部分的内容 + var record2 = materials[total+i]; + var materialName2 = record2.materialDefinition.name; + var specification2 = record2.materialDefinition.specification; + var type2 = record2.materialDefinition.type; + if(specification2 != 'null' && specification2 != ""){ + materialName2 += "["+specification2+"]"; + } + var count2 = record2.count; + if(type2 != '一次性物品'){ + amount += parseInt(count2); + } + tableHtml += ""+materialName2; + tableHtml += "
"+count2+"
"; + tableHtml += ""; + + tableHtml += ""; + tableHtml += "
"; }else{ - var record2 = materials[i+total]; + //simon:添加第二部分的内容 + var record2 = materials[total+i]; var materialName2 = record2.materialDefinition.name; var specification2 = record2.materialDefinition.specification; var type2 = record2.materialDefinition.type; @@ -2263,9 +2310,26 @@ if(type2 != '一次性物品'){ amount += parseInt(count2); } - tableHtml += ""+materialName2; - tableHtml += "
"+count2+"
"; + tableHtml += ""+materialName2; + tableHtml += "
"+count2+"
"; tableHtml += ""; + + //simon-add:添加第三部分的内容 + var record3 = materials[i+total*2]; + var materialName3 = record3.materialDefinition.name; + var specification3 = record3.materialDefinition.specification; + var type3 = record3.materialDefinition.type; + if(specification3 != 'null' && specification3 != ""){ + materialName3 += "["+specification3+"]"; + } + var count3 = record3.count; + if(type3 != '一次性物品'){ + amount += parseInt(count3); + } + tableHtml += ""+materialName3; + tableHtml += "
"+count3+"
"; + tableHtml += ""; + } tableHtml += ""; @@ -2391,13 +2455,13 @@ var tableHtml = ret.tableHtml + ""; tableHtml += ""; - tableHtml += ""; tableHtml += ""; //告警语(已注释不打印,经省医护长与封枫、关总确认 since 2016-01-25 SYF) tableHtml += ""; - tableHtml += ""; + tableHtml += ""; tableHtml += ""; tableHtml += "
器械总数量:"+ret.amount+"件"; + tableHtml += "器械总数量:"+ret.amount+"件"; tableHtml += "
***需要回收，切勿丢失***
***需要回收，切勿丢失***
";