Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r19295 -r19570
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19295)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 19570)
@@ -375,6 +375,7 @@
 	{name : 'isTimeout'},
 	{name : 'allowModifyPackageType'},
 	{name : 'errorRemark'},
+	{name : 'recyclingItemRemark'},
 	{name : 'damageRemark'},
 	{name : 'urgentLevel'},
 	{name : 'idCardBarcode'},
@@ -1368,6 +1369,21 @@
 		labelAlign:'right'
 	},{
 		columnWidth :.99,
+		xtype : 'textfield',
+		fieldLabel : '回收备注',
+		componentCls:'formItemMgn',
+		id : 'recyclingItemRemark',
+		name : 'recyclingItemRemark',
+		maxLength : '250',
+		labelWidth:90,
+		anchor : '95%',
+		allowBlank : true,
+		readOnly : true,
+		hidden:!sstsConfig.enableRecyclingItemRemark,
+        cls : 'fieldReadOnlyNoRemove',
+		labelAlign:'right'
+	},{
+		columnWidth :.99,
 		xtype : 'panel',
 		border: false,
 		layout: {
@@ -1759,7 +1775,7 @@
 		taskStatus,department,tousseType, packageType, 
 		sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
 		damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
-		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum){
+		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark){
 	var leaf = false;
 	if(taskId != ''){
 		leaf = true;
@@ -1796,7 +1812,8 @@
 		idCardBarcode : idCardBarcode,
 		errorRemark:errorRemark,
 		damageRemark:damageRemark,
-		serialNumber:serialNum
+		serialNumber:serialNum,
+		recyclingItemRemark:recyclingItemRemark
 	});
 	if(!leaf){
 		node.set("checked" ,false);
@@ -1942,6 +1959,17 @@
 	}
 }
 
+function refreshRecyclingItemRemark(record){
+	if(record){
+		var recyclingItemRemark  = record.get("recyclingItemRemark");
+		
+		if(!recyclingItemRemark){
+			recyclingItemRemark = '';
+		}
+		Ext4.getCmp('recyclingItemRemark').setValue(recyclingItemRemark);
+	}
+}
+
 // 重新设置标识牌的可见状态 装配任务选择包的时候
 function resetScanIDCardBarcodeVisibilityWaitPacking(node){
 	var waitPackingTree = Ext4.getCmp('waitPackingTreeGrid');
@@ -3009,6 +3037,7 @@
        			loadIdCardByBarcode(idCardBarcodeTemp);
        		}
        		refreshErrorAndDamageRemark(record);
+       		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
                	if(record.get('checked') == false){
@@ -3103,7 +3132,7 @@
 										parentNode = addTaskNode('',td_id,videoNames,tousseName,0,'','','',
 												'','',tousseType, packageType, 
 												sterilingMethod,'',isTraceable,isPrint,isReview,'','',rMaterils,'','',haveIDCard,urgentAmount,
-												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'');
+												taskVO.idCardBarcode,taskVO.allowModifyPackageType,taskVO.errorRemark,taskVO.damageRemark,taskVO.urgentLevel,'','');
 										newParentNode = true;
 									}else{
 										var uamountStr = parentNode.get('urgentAmount');
@@ -3165,7 +3194,7 @@
 											var childNode =	addTaskNode(taskId,td_id,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
 													taskStatus,department,tousseType, packageType,sterilingMethod,dateTime,isTraceable,isPrint,isReview,
 													errors,damages,replenishMaterils,taskType,supplierName,task.haveIDCard,childUrgentAmount,task.idCardBarcode,
-													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber);
+													task.allowModifyPackageType,task.errorRemark,task.damageRemark,task.urgentLevel,task.serialNumber,task.recyclingItemRemark);
 											parentNode.appendChild(childNode);
 											var pNewAmount = parentNode.get('amount') + amount;
 											parentNode.set('amount',pNewAmount);
@@ -3310,6 +3339,7 @@
        			Ext4.getCmp('idCardUseAmount').setValue("");
        		}
        		refreshErrorAndDamageRemark(record);
+       		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
            		if(record.get('checked') == false){