Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp
===================================================================
diff -u -r25867 -r25954
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp (.../toussePictures.jsp) (revision 25867)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.jsp (.../toussePictures.jsp) (revision 25954)
@@ -54,8 +54,6 @@
-
-
Index: ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js
===================================================================
diff -u -r25864 -r25954
--- ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js (.../toussePictures.js) (revision 25864)
+++ ssts-web/src/main/webapp/disinfectsystem/toussePictures/toussePictures.js (.../toussePictures.js) (revision 25954)
@@ -24,6 +24,10 @@
var jsonObj = Ext4.JSON.decode(result.responseText);
var tousseDefinitionID = jsonObj.data.tousseDefinitionId;
var tousseName = escapeText(jsonObj.data.name);
+ if(tousseDefinitionID == "" || tousseName == ""){
+ showResult('请扫描正确的条码!' , null , sstsConfig.messagePauseTimeOnPackingPage);
+ return;
+ }
window.open(WWWROOT + "/disinfectsystem/touchScreen/recycle/tousseImage.jsp" +
"?resolution=1980" +
"&tousseDefinitionID=" + tousseDefinitionID +
@@ -80,18 +84,34 @@
minWidth : 70,
iconCls : 'icon_set',
handler : function() {
- var name = document.getElementById("materialNameWithAmount").value;
- var amount = document.getElementById("materialNameWithAmount").getAttribute("amount");
- var showModals = true;
- materialCountRecords = [];
- var data = {
- "name":name,
- "amount":amount
+ var showModals = true;
+ var dataAll = [];
+ var childIframe = window.frames["tousseImages"].document.getElementById("materialTable");
+ var childTr = childIframe.getElementsByTagName("tr");//所有tr
+ if(childTr.length > 0){
+ for(var i = 0;i < childTr.length;i++){
+ var tds = childTr[i].getElementsByTagName("td");
+ for(var j = 0;j < tds.length;j++){
+ var checkInput = tds[j].getElementsByTagName("input");
+ for(var m = 0;m < checkInput.length;m++){
+ if(checkInput[m].checked){
+ var name = checkInput[m].value;
+ var amount =checkInput[m].getAttribute("amount");
+ var data = {
+ "name":name,
+ "count":amount
+ }
+ var datas = {
+ data:data
+ }
+ dataAll.push(datas);
+ }
+ }
+
+ }
+ }
+ materialCountRecords = dataAll;
}
- var datas = {
- data:data
- }
- materialCountRecords.push(datas);
addQualityMonitoringByResponPart('清洗消毒');
}
}],
@@ -153,11 +173,11 @@
var reportForm = new Ext.Panel({
- frame:false,//渲染面板
- autoScroll:true,//自动显示滚动条
- collapsible:true,//允许展开和收缩
- bodyPadding:5,
- html:''
+ frame:false,//渲染面板
+ autoScroll:true,//自动显示滚动条
+ collapsible:true,//允许展开和收缩
+ bodyPadding:5,
+ html:''
});