Index: ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js
===================================================================
diff -u -r22201 -r22202
--- ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 22201)
+++ ssts-web/src/main/webapp/disinfectsystem/config/zsyy/print/printConfig.js (.../printConfig.js) (revision 22202)
@@ -1480,7 +1480,8 @@
var surgery = printSummaryObj.surgery?printSummaryObj.surgery:" ";
var applicationTime = printSummaryObj.applicationTime?printSummaryObj.applicationTime.substring(0,10):" ";
var doctor = printSummaryObj.doctor?printSummaryObj.doctor:" ";
-
+ var remark = printSummaryObj.remark?printSummaryObj.remark:" ";
+ var amount = printSummaryObj.amount?printSummaryObj.amount:" ";
var tousse = printSummaryObj.tousses && printSummaryObj.tousses.length > 0?printSummaryObj.tousses[0]:{};
var tousseName = tousse.tousseName?tousse.tousseName:" ";
var splitNumber = tousse.splitNumber?tousse.splitNumber:" ";
@@ -1490,7 +1491,7 @@
var goods = [];
for(var i = 0; i < materials.length;++i){
if(materials[i].tousseName && materials[i].amount > 0){ //tousseName是 undefined、false、''， 都是false
- goods.push(materials[i].tousseName);
+ goods.push(materials[i].tousseName+ 'x' + materials[i].amount);
}
}
var details = goods.length > 0?goods.join("、"):" ";
@@ -1504,7 +1505,9 @@
+ ".t{width:18%;}"
+ ".label2{width:22%;}"
+ ".label4{width:20%;}"
- + ".label5{width:40%;}"
+ + ".label5{width:50%;}"
+ + ".label6{width:70%;}"
+ + ".label9{width:5%;}"
+ ".label3{width:15%;}";
var tableHtml = "";
@@ -1515,7 +1518,8 @@
tableHtml += "器械名称:
"+tousseName+"
";
tableHtml += "手术名称:
"+surgery+"
";
tableHtml += "接收时间:
"+applicationTime+"
医生:
"+doctor+"
";
- tableHtml += "包含物:
"+details+"
包份数:
"+splitNumber+"
";
+ tableHtml += "包含物:
"+details+"
包份数:
"+splitNumber+"
";
+ tableHtml += "备注:
"+remark+"
";
tableHtml += "";
tableHtml += "