Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js
===================================================================
diff -u -r24893 -r24897
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js (.../slickWash.js) (revision 24893)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/washingApplication/slickWash.js (.../slickWash.js) (revision 24897)
@@ -331,17 +331,17 @@
// console.log(value);
// return spacer + " +" + value;
// }
- console.log("value:"+value+";"+"indent:"+dataContext.indent);
+// console.log("value:"+value+";"+"indent:"+dataContext.indent);
if(dataContext.indent==0){
if(dataContext._collapsed==true){
- return spacer + " " + value;
+ return spacer + " " + value;
}
else{
- return spacer + " " + value;
+ return spacer + " " + value;
}
}
else{
- return value;
+ return spacer + "" + value;
}
}
@@ -631,7 +631,8 @@
type:"post",
data:{barcode:$("#addCleanGetCode").val()},
success:function(res){
- addItem = {
+ addItem = res;
+ /* {
id:"new"+(Math.round(Math.random()*10000)),
name : res.name,
amount : res.amount,
@@ -642,7 +643,7 @@
recyclingTime : res.recyclingTime,
content : res.content,
};
-
+ */
BasketData.push(addItem);
addCleanBaskets(BasketData);
$("#addCleanGetCodeArr").val(JSON.stringify(BasketData));