Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r28771 -r28969
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28771)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 28969)
@@ -331,56 +331,16 @@
 }
 
 
-function addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-		taskStatus,department,tousseType, packageType, packageSize,
-		sterilingMethod,recyclingTime,isTraceable,isPrint,isReview,errors,
-		damages,replenishMaterils,taskType,supplierName,haveIDCard,urgentAmount,idCardBarcode,
-		allowModifyPackageType,errorRemark,damageRemark,urgentLevel,serialNum,recyclingItemRemark,cleaned,note,urgentLevelObj,colorCode){
+function addTaskNode(params){
 	var leaf = false;
-	if(taskId != ''){
+	if(params.taskId != ''){
 		leaf = true;
 	}
-	var node = Ext4.create('cModel',{
-		taskId : taskId,
-		tousseID : td_id,
-		invoicePlanId : invoicePlanId,
-		tousseName : tousseName,
-		amount : amount,
-		urgentAmount : urgentAmount,
-		urgentLevel : urgentLevel,
-		unPackingAmount:amount,
-		washTime : washTime,
-		basketBarcode : basketBarcode,
-		basketName : basketName,
-		status : taskStatus,
-		department : department,
-		tousseType : tousseType,
-		packageType : packageType,
-		packageSize : packageSize,
-		sterilingMethod : sterilingMethod,
-		dateTime : recyclingTime,
-		isTraceable : isTraceable,
-		isPrint : isPrint,
-		isReview : isReview,
-		errors : errors,
-		damages : damages,
-		taskType : taskType,
-		supplierName : supplierName,
-		leaf : leaf,
-		replenishMaterils : replenishMaterils,
-		haveIDCard:haveIDCard,
-		uuid_vedioNames : videoNames,
-		allowModifyPackageType : allowModifyPackageType,
-		idCardBarcode : idCardBarcode,
-		errorRemark:errorRemark,
-		damageRemark:damageRemark,
-		serialNumber:serialNum,
-		recyclingItemRemark:recyclingItemRemark,
-		cleaned: cleaned,
-		note: note,
-		urgentLevelObj:urgentLevelObj,
-		colorCode:colorCode
-	});
+
+	var newParams = params;
+
+	newParams.tousseType = params.tousseType1;
+	var node = Ext4.create('cModel',newParams);
 	if(!leaf){
 		node.set("checked" ,false);
 	}
@@ -607,7 +567,6 @@
     		var tousseName = result.idCard.tousseDefinition.name;
     		var taskList = result.idCard.packingTaskInfo;
     		var existTask = findIDCardPackingTask(basketStore,result.idCard);
-    		
     		// 在待装配任务里面选择标识牌的包可以装配
     		if(!existTask){
     			existTask = findIDCardPackingTask(waitPackingTaskStore,result.idCard);
@@ -645,6 +604,8 @@
 
 	var tousseName = result.idCard.tousseDefinition.name;
 	var taskList = result.idCard.packingTaskInfo;
+	var errorDamageRemark = result.idCard.errorDamageRemark || '';
+	var errorDamageRemarkId = result.idCard.errorDamageRemarkId || '';
 	if(!existTask){
 		existTask = findIDCardPackingTask(basketStore,result.idCard);
 	}
@@ -681,6 +642,7 @@
 		showPackButton(isPrint,isReview,tousseType);
 		
 	}
+	console.log(idCardTaskNode)
 	// 取消选中所有的装配任务，只选中该标识牌的
 	uncheckAllExceptCurrentIDCardPackingTask();
 	currentIDCardInfo = result.idCard;
@@ -697,6 +659,9 @@
 	
 	Ext4.getCmp('packageType').setValue(packageType);
 	Ext4.getCmp('sterilingType').setValue(sterilingType);
+	Ext4.getCmp('remark').setValue(errorDamageRemark);
+	Ext4.getCmp('errorDamageRemark').setValue(errorDamageRemark);
+	Ext4.getCmp('errorDamageRemarkId').setValue(errorDamageRemarkId);
 	//根据灭菌程序设置灭菌方式的值
 	setSterilingModeValueBySterilingType(sterilingType);
 	
@@ -2041,12 +2006,20 @@
 		componentCls:'formItemMgn',
 		id : 'remark',
 		name : 'remark',
-		maxLength : '30',
+		maxLength : '1000',
 		labelWidth:90,
 		anchor : '95%',
 		allowBlank : true,
 		labelAlign:'right'
 	},{
+		xtype:'hidden',
+		id:'errorDamageRemarkId',
+		name:'errorDamageRemarkId'
+	},{
+		xtype:'hidden',
+		id:'errorDamageRemarkInfo',
+		name:'errorDamageRemarkInfo'
+	},{
 		columnWidth :.99,
 		xtype : 'textfield',
 		fieldLabel : '丢失材料',
@@ -2759,6 +2732,76 @@
 	}
 }
 
+function refreshRemarks(record){
+	if(record){
+		if(record.data.children){
+			var children = record.data.children;
+			var damagesArr = [];
+			var errorsArr = [];
+			var k = 0;
+			var z = 0;
+			for(var i=0;i<children.length;i++){
+				if(children[i].damages.length > 0){
+					var damages = children[i].damages;
+					for(var j=0;j<damages.length;j++){
+						var materialName = damages[j].materialName;
+						var amount = damages[j].amount;
+						var specification = damages[j].specification || '';
+						var unit = damages[j].unit || '';
+						if(specification !== ''){
+							damagesArr[k] = materialName+'['+specification+']x'+amount+'×'+unit;
+						}else {
+							damagesArr[k] = materialName+'x'+amount;
+						}
+						k++;
+					}
+				}
+				if(children[i].errors.length > 0){
+					var errors = children[i].errors;
+					for(var j=0;j<errors.length;j++){
+						var materialName = errors[j].materialName;
+						var amount = errors[j].amount;
+						var specification = errors[j].specification || '';
+						var unit = errors[j].unit || '';
+						if(specification !== ''){
+							errorsArr[z] = materialName+'['+specification+']x'+amount+'×'+unit;
+						}else {
+							errorsArr[z] = materialName+'x'+amount;
+						}
+						z++;
+					}
+				}
+			}
+		}else {
+			var damagesArr = [];
+			var errorsArr = [];
+			if(record.data.damages.length > 0){
+				var damages = record.data.damages;
+				for(var j=0;j<damages.length;j++){
+					var materialName = damages[j].materialName;
+					var amount = damages[j].amount;
+					var specification = damages[j].specification || '';
+					var unit = damages[j].unit || '';
+					if(specification !== ''){
+						damagesArr[j] = materialName+'['+specification+']x'+amount+'×'+unit;
+					}else {
+						damagesArr[j] = materialName+'x'+amount;
+					}
+				}
+			}
+		}
+		if(record.data.damages.length == 0 && record.data.errors.length == 0){
+			Ext4.getCmp('remark').setValue('');
+			Ext4.getCmp('errorDamageRemarkId').setValue('');
+			Ext4.getCmp('errorDamageRemarkInfo').setValue('');
+		}else {
+			Ext4.getCmp('remark').setValue(record.raw.errorDamageRemarkInfo);
+			Ext4.getCmp('errorDamageRemarkId').setValue(record.raw.errorDamageRemarkId);
+			Ext4.getCmp('errorDamageRemarkInfo').setValue(record.raw.errorDamageRemarkInfo);
+		}
+	}
+}
+
 function refreshRecyclingItemRemark(record){
 	if(record){
 		var recyclingItemRemark  = record.get("recyclingItemRemark");
@@ -3508,11 +3551,11 @@
 		showScanIDCardBarcode();
 	 }else{
 		//不回收的物品
-       var isShow = Ext4.getCmp('save_print').isVisible();
+	   var isShow = Ext4.getCmp('save_print').isVisible();
        if(isShow){
            	//选择统计的敷料包选项全打印
            	var selNodes = waitPackingTreeGrid.getView().getChecked();
-           	var selLength = selNodes.length;
+			var selLength = selNodes.length;
        		Ext4.each(selNodes, function(pNode) {
        			if(pNode.get('taskType') == taskType_recyclingRecord){
        				return true;//在each(jquery、ext都如此)循环中,return true表示continue,return false表示break
@@ -3605,7 +3648,6 @@
 		return false;
 	}
 	var tousseWeight = Ext4.getCmp('tousseWeight').getValue();
-	
     //是否消毒物品
     var validatepass = true;
     DWREngine.setAsync(false);
@@ -3667,7 +3709,9 @@
     		return false;
     	}
     }
-    var remark = Ext4.getCmp('remark').getValue();
+	var remark = Ext4.getCmp('remark').getValue();
+	var errorDamageRemarkId = Ext4.getCmp('errorDamageRemarkId').getValue() || '';
+	var errorDamageRemarkInfo = Ext4.getCmp('errorDamageRemarkInfo').getValue() || '';
     var params = {
     		taskIds: taskIds,
     		inspector: inspector,
@@ -3696,8 +3740,13 @@
 			urgentAmount: urgentAmount,
 			tousseWeight: tousseWeight,
 			remark: remark,
+			errorDamageRemarkInfo:errorDamageRemarkInfo,
 			websocketSessionId : getWebsocketSessionId()
 	}
+	if(errorDamageRemarkId !== '' && errorDamageRemarkId !== 0){
+		params.errorDamageRemarkId = errorDamageRemarkId;
+	}
+	
 //    DWREngine.setAsync(false);
 //    // 调用服务端的装配器械包的代码
 //    PackingTableManager.packingTousse2(JSON.stringify(params),function(rs){
@@ -3740,7 +3789,6 @@
 //        }
 //    });
 //    DWREngine.setAsync(true);
-    
     // 改为不用dwr
     Ext4.Ajax.request({
 		//async: !isFirstOnLoad,
@@ -3749,8 +3797,8 @@
 		url: WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml",
 		params : {packingParams : JSON.stringify(params)},
 		success: function(rs) {
-            var result = Ext4.decode(rs.responseText);
-        	var showName = tousseName;
+			var result = Ext4.decode(rs.responseText);
+			var showName = tousseName;
     		if (result.success){
     			processAfterPacking(printImmediately,result, showName, packAmount);
     			//保存装配视频监控
@@ -3907,7 +3955,6 @@
 //	showResult(packAmount + "个" + showName + "装配完成");
 	var printGroupType = Ext4.getCmp('printGroupType').getValue();
 	var cfg = createPrintLabelsConfig(printGroupType);
-	
 	if(tousseesToPrint.length > 0){
 //		if(!Ext4.isIE){
 //			showResult("目前只支持IE浏览器进行打印!" , null , sstsConfig.messagePauseTimeOnPackingPage);
@@ -4095,7 +4142,8 @@
        		if(idCardBarcodeTemp != ""){
        			loadIdCardByBarcode(idCardBarcodeTemp,false);
        		}
-       		refreshErrorAndDamageRemark(record);
+			refreshErrorAndDamageRemark(record);
+			refreshRemarks(record);
        		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
@@ -4107,7 +4155,36 @@
            		return false;
            	}
            	
-       },
+	   },
+	   load: {
+		fn: function(store){
+			var root = basketStore.getRootNode();
+			var tousseNameMaxLenArray = [];
+			var basketNameMaxLenArray = [];
+			var k = 0;
+			for(var i=0;i<root.childNodes.length;i++){
+				var parentNode = root.childNodes[i];
+				var tousseName = parentNode.data.tousseName;
+				tousseNameMaxLenArray[i] = textSize(fontSize+"px","宋体",tousseName).width || 0;
+				for(var j=0;j<parentNode.childNodes.length;j++){
+					var childNode = parentNode.childNodes[j];
+					var basketName = childNode.data.basketName;
+					basketNameMaxLenArray[k] = textSize(fontSize+"px","宋体",basketName).width || 0;
+					k++;
+				}
+			}
+			if(tousseNameMaxLenArray.length > 0){
+				var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
+				this.headerCt.getGridColumns()[0].setWidth(tousseNameMaxLenght+90);
+			}
+			if(basketNameMaxLenArray.length > 0){
+				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
+				if(basketNameMaxLenght !== 0){
+					this.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
+				}
+			}
+		}
+	},
       checkchange:function( node, checked, eOpts ){
     	  	 showNoteWindow(node, checked); 	  
         	 resetScanIDCardBarcodeVisibility(node);
@@ -4204,10 +4281,48 @@
 										if(n == 0){
 											checked = true;
 										}
-										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.cleaned,taskVO.note,taskVO.urgentLevelObj,taskVO.colorCode);
+										var params = {
+											taskId:'',
+											td_id:td_id,
+											invoicePlanId:'',
+											videoNames:videoNames,
+											tousseName:tousseName,
+											amount:0,
+											washTime:'',
+											basketBarcode:'',
+											basketName:'',
+											taskStatus:'',
+											department:'',
+											tousseType1:tousseType,
+											packageType:packageType,
+											packageSize:'',
+											sterilingMethod:sterilingMethod,
+											dateTime:'',
+											isTraceable:isTraceable,
+											isPrint:isPrint,
+											isReview:isReview,
+											errors:'',
+											damages:'',
+											replenishMaterils:rMaterils,
+											taskType:'',
+											supplierName:'',
+											haveIDCard:haveIDCard,
+											childUrgentAmount:urgentAmount,
+											idCardBarcode:taskVO.idCardBarcode,
+											allowModifyPackageType:taskVO.allowModifyPackageType,
+											errorRemark:taskVO.errorRemark,
+											damageRemark:taskVO.damageRemark,
+											urgentLevel:taskVO.urgentLevel,
+											serialNumber:'',
+											recyclingItemRemark:'',
+											cleaned:taskVO.cleaned,
+											note:taskVO.note,
+											urgentLevelObj:taskVO.urgentLevelObj,
+											colorCode:taskVO.colorCode,
+											errorDamageRemarkId:'',
+											errorDamageRemarkInfo:''
+										}
+										parentNode = addTaskNode(params);
 										newParentNode = true;
 									}else{
 										var uamountStr = parentNode.get('urgentAmount');
@@ -4252,8 +4367,7 @@
 										var replenishMaterils = task.replenishMaterils;
 										var taskType = task.taskType;
 										var supplierName = task.supplierName;
-										var packageSize = task.packageSize;								
-										
+										var packageSize = task.packageSize;	
 										if(task.tousseType == '外来器械包'){
 											haveForeignTousseNode = true;
 										}
@@ -4277,10 +4391,12 @@
 											}
 			            				}
 										if(sigle){
-											var childNode =	addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-													taskStatus,department,tousseType, packageType,packageSize,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.recyclingItemRemark,task.cleaned,task.note,task.urgentLevelObj,task.colorCode);
+											task.td_id = td_id;
+											task.videoNames = videoNames;
+											task.tousseType1 = tousseType;
+											task.packageType = packageType;
+											task.sterilingMethod = sterilingMethod;
+											var childNode =	addTaskNode(task);
 											parentNode.appendChild(childNode);
 											var pNewAmount = parentNode.get('amount') + amount;
 											parentNode.set('amount',pNewAmount);
@@ -4299,6 +4415,31 @@
 										Ext4.getCmp('basketBarcodeInput').focus('', 10);
 									}
 								}
+								var root = basketStore.getRootNode();
+								var tousseNameMaxLenArray = [];
+								var basketNameMaxLenArray = [];
+								var k = 0;
+								for(var i=0;i<root.childNodes.length;i++){
+									var parentNode = root.childNodes[i];
+									var tousseName = parentNode.data.tousseName;
+									tousseNameMaxLenArray[i] = textSize(fontSize+"px","宋体",tousseName).width || 0;
+									for(var j=0;j<parentNode.childNodes.length;j++){
+										var childNode = parentNode.childNodes[j];
+										var basketName = childNode.data.basketName;
+										basketNameMaxLenArray[k] = textSize(fontSize+"px","宋体",basketName).width || 0;
+										k++;
+									}
+								}
+								if(tousseNameMaxLenArray.length > 0){
+									var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
+									basketColumnTreeGrid.headerCt.getGridColumns()[0].setWidth(tousseNameMaxLenght+90);
+								}
+								if(basketNameMaxLenArray.length > 0){
+									var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
+									if(basketNameMaxLenght !== 0){
+										basketColumnTreeGrid.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
+									}
+								}
 	                        	speakBasket.speakContent();
 	                        },
 	                        failure : function(){myMask.hide();}
@@ -4475,7 +4616,8 @@
        		}
        		// 显示丢失报损按钮
        		showOrHideErrorAndDamageBtn();
-       		refreshErrorAndDamageRemark(record);
+			refreshErrorAndDamageRemark(record);
+			refreshRemarks(record);
        		refreshRecyclingItemRemark(record);
            	var isLeaf = record.get('leaf');
            	if(!isLeaf){
@@ -5089,10 +5231,48 @@
 							if(n == 0){
 								checked = true;
 							}
-							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.cleaned,taskVO.note,taskVO.urgentLevelObj,taskVO.colorCode);
+							var params = {
+								taskId:'',
+								td_id:td_id,
+								invoicePlanId:'',
+								videoNames:videoNames,
+								tousseName:tousseName,
+								amount:0,
+								washTime:'',
+								basketBarcode:'',
+								basketName:'',
+								taskStatus:'',
+								department:'',
+								tousseType1:tousseType,
+								packageType:packageType,
+								packageSize:'',
+								sterilingMethod:sterilingMethod,
+								dateTime:'',
+								isTraceable:isTraceable,
+								isPrint:isPrint,
+								isReview:isReview,
+								errors:'',
+								damages:'',
+								replenishMaterils:rMaterils,
+								taskType:'',
+								supplierName:'',
+								haveIDCard:haveIDCard,
+								childUrgentAmount:urgentAmount,
+								idCardBarcode:taskVO.idCardBarcode,
+								allowModifyPackageType:taskVO.allowModifyPackageType,
+								errorRemark:taskVO.errorRemark,
+								damageRemark:taskVO.damageRemark,
+								urgentLevel:taskVO.urgentLevel,
+								serialNumber:'',
+								recyclingItemRemark:'',
+								cleaned:taskVO.cleaned,
+								note:taskVO.note,
+								urgentLevelObj:taskVO.urgentLevelObj,
+								colorCode:taskVO.colorCode,
+								errorDamageRemarkId:'',
+								errorDamageRemarkInfo:''
+							}
+							parentNode = addTaskNode(params);
 							newParentNode = true;
 						}else{
 							var uamountStr = parentNode.get('urgentAmount');
@@ -5162,10 +5342,13 @@
 								}
 							}
 							if(sigle){
-								var childNode =	addTaskNode(taskId,td_id,invoicePlanId,videoNames,tousseName,amount,washTime,basketBarcode,basketName,
-										taskStatus,department,tousseType, packageType,packageSize,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.recyclingItemRemark,task.cleaned,task.note,task.urgentLevelObj,task.colorCode);
+								task.td_id = td_id;
+								task.videoNames = videoNames;
+								task.tousseType1 = tousseType;
+								task.packageType = packageType;
+								task.sterilingMethod = sterilingMethod;
+
+								var childNode =	addTaskNode(task);
 								parentNode.appendChild(childNode);
 								var pNewAmount = parentNode.get('amount') + amount;
 								parentNode.set('amount',pNewAmount);