Index: ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java =================================================================== diff -u -r16647 -r16650 --- ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 16647) +++ ssts-recyclingrecord/src/main/java/com/forgon/disinfectsystem/recyclingrecord/action/RecyclingRecordAction.java (.../RecyclingRecordAction.java) (revision 16650) @@ -2435,6 +2435,7 @@ for (ClassifiedItem ci : basket.getClassfiedItems()) { JSONObject data = new JSONObject(); data.put("goodsName", ci.getName()); + data.put("department", ci.getOrgUnitName()); data.put("amount", ci.getAmount()); data.put("type", ci.getItemType()); result.add(data); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/basketLoadGoodsViewStyle.css =================================================================== diff -u -r16647 -r16650 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/basketLoadGoodsViewStyle.css (.../basketLoadGoodsViewStyle.css) (revision 16647) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/1980/images/basketLoadGoodsViewStyle.css (.../basketLoadGoodsViewStyle.css) (revision 16650) @@ -128,9 +128,10 @@ .clds-box .box{height:765px; overflow-y:scroll; background:#fff; overflow-x:hidden,text-align:left; float:left} .clds-box .box table{ margin:0 auto; width:1280px} .clds-box .box table td{ border-right:1px solid #ddd; border-bottom:1px solid #ddd; text-align:center; font-size:26px; color:#2e6271; padding:8px 0} -.clds-box .box .w1{ width:260px;} -.clds-box .box .w2{ width:195px} -.clds-box .box .w3{ width:190px;} +.clds-box .box .w1{ width:310px;} +.clds-box .box .w2{ width:150px} +.clds-box .box .w3{ width:150px;} +.clds-box .box .w3{ width:150px;} .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-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp =================================================================== diff -u -r16649 -r16650 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp (.../basketLoadGoodsView.jsp) (revision 16649) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/basketLoadGoodsView.jsp (.../basketLoadGoodsView.jsp) (revision 16650) @@ -39,6 +39,7 @@ var materialElement = $('' + '' + msg[i].goodsName + '' + '' + msg[i].amount + '' + + '' + msg[i].department + '' + '' + msg[i].type + '' + ''); $("#basketItemTable").append(materialElement); @@ -57,8 +58,9 @@ - - + + +
物品名称数量类型数量科室类型