Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css
===================================================================
diff -u -r14508 -r21589
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css (.../foreignTousseStyle.css) (revision 14508)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/foreignTousseStyle.css (.../foreignTousseStyle.css) (revision 21589)
@@ -142,13 +142,13 @@
.clds-box .box .w55{ width:475px}
.clds-box .box .w66{ width:171px}
-.clds-box .box .w111{ width:400px;}
-.clds-box .box .w222{ width:400px;height:60px;}
-.clds-box .box .w333{ width:190px;}
-.clds-box .box .w444{ width:190px}
-.clds-box .box .w555{ width:190px}
-.clds-box .box .w666{ width:190px}
-.clds-box .box .w777{ width:190px}
+.clds-box .box .w111{ width:230px;}
+.clds-box .box .w222{ width:243px;height:60px;}
+.clds-box .box .w333{ width:115px;}
+.clds-box .box .w444{ width:99px;}
+.clds-box .box .w555{ width:115px;}
+.clds-box .box .w666{ width:115px;}
+.clds-box .box .w777{ width:115px;}
.clds-box .add{background:url(pic_bg.jpg) no-repeat 0 -691px; width:59px; height:58px; display:inline-block; margin-right:10px; line-height:200px; overflow:hidden }
.clds-box .add:hover{ background-position:0 -751px; }
Index: ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java
===================================================================
diff -u -r20589 -r21589
--- ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 20589)
+++ ssts-recyclingapplication/src/main/java/com/forgon/disinfectsystem/foreigntousseapplication/action/ForeignTousseApplicationAction.java (.../ForeignTousseApplicationAction.java) (revision 21589)
@@ -418,7 +418,6 @@
String foreignTousseInfo = StrutsParamUtils.getPraramValue("foreignTousseInfo", "");
SupplyRoomConfig config = supplyRoomConfigManager.getSystemParamsObj();
JSONArray jsonArray = JSONArray.fromObject(foreignTousseInfo);
- JSONObject jsonObject = new JSONObject();
boolean success = false;
String msg = "保存成功！";
try {
@@ -427,9 +426,7 @@
success = false;
msg = e.getMessage();
}
- jsonObject.put("success",success);
- jsonObject.put("message",msg);
- StrutsResponseUtils.output(jsonObject);
+ StrutsResponseUtils.output(success,msg);
}
/**
Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp
===================================================================
diff -u -r18159 -r21589
--- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 18159)
+++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/setForeignTousseDefinition.jsp (.../setForeignTousseDefinition.jsp) (revision 21589)
@@ -76,7 +76,8 @@
var materialName = $(this).find("td:nth-child(3)").html();
var includeImplant = $(this).find("td:nth-child(4)").html();
var amount = parseInt($(this).find("td:nth-child(6)").html(),10);
- var usedAmountOfIncludeImplant = $(this).find("td:nth-child(8)").html();
+ var minDismantleAmount = $(this).find("td:nth-child(8)").html();
+ var usedAmountOfIncludeImplant = $(this).find("td:nth-child(9)").html();
if(materialName == ""){
msg = "外来器械材料必须填写名称！";
@@ -91,6 +92,7 @@
materialName : materialName,
amount : amount,
includeImplant : includeImplant,
+ minDismantleAmount : minDismantleAmount,
usedAmountOfIncludeImplant : usedAmountOfIncludeImplant
});
}
@@ -130,11 +132,12 @@
+ '| | '
+ ' | '
+ '否 | '
- + '0 | '
- + '0 | '
- + ' | '
- + ' | '
- + '- | '
+ + '0 | '
+ + '0 | '
+ + ' | '
+ + ' | '
+ + ' | '
+ + '- | '
+ '');
$("#recyclingErrorTable").append(materialElement);
}
@@ -219,11 +222,12 @@
+ ''+supplierName+' | '
+ '' + tousseName + ' | '
+ ' | '
- + '' + amount + ' | '
- + ' | '
- + ''+price+' | '
- + ' | '
- + '+ | '
+ + '' + amount + ' | '
+ + ' | '
+ + ''+price+' | '
+ + ' | '
+ + ' | '
+ + '+ | '
+ '');
$("#recyclingErrorTable").append(tousseElement);
@@ -236,6 +240,7 @@
var applyAmount = materialItem.amount;
var recycleAmount = materialItem.recycleAmount;
+ var minDismantleAmount = materialItem.minDismantleAmount?materialItem.minDismantleAmount:'';
if(isForeignTousseReceiveRecord || (recyclingStatus == "待接收" || recyclingStatus == "已接收")){
recycleAmount = materialItem.amount;
}else{
@@ -252,13 +257,14 @@
+ '' + materialItem.tousseName + ' | '
+ '' + materialItem.includeImplant
+ ' | '
- + '' + applyAmount + ' | '
- + '' + recycleAmount + ' | '
- + ' | '
- + ''
+ + ' | ' + applyAmount + ' | '
+ + '' + recycleAmount + ' | '
+ + ' | '
+ + ''+minDismantleAmount+' | '
+ + ''
+ materialItem.usedAmountOfIncludeImplant
+ ' | '
- + '- | '
+ + '- | '
+ '');
totalRecycleAmount += recycleAmount;
@@ -302,14 +308,15 @@
- | 供应商 |
- 包/材料名称 |
- 是否植入物 |
- 申请数量 |
- 回收数量 |
- 单价 |
- 植入物使用数量 |
- 操作 |
+ 供应商 |
+ 包/材料名称 |
+ 是否植入物 |
+ 申请数量 |
+ 回收数量 |
+ 单价 |
+ 可拆卸数量 |
+ 植入物使用数量 |
+ 操作 |