Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r30377 -r30477
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30377)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30477)
@@ -863,6 +863,14 @@
 	{name : 'washRecordId'}
 ]});
 
+var basketWidth = 70;
+if(!sstsConfig.disableIdCard){
+	basketWidth += 70;
+}
+if(sstsConfig.showBarcodeOfWashBasketInPackingTaskList){
+	basketWidth += 70;
+}
+
 function buildColumnTreeColumns(treeId){
 	var columns = [
 		{
@@ -1025,19 +1033,33 @@
 			}
 		},{
 			header: '清洗篮筐',
-			width : 80,
+			width : basketWidth,
 			align:'center',
 		    sortable: true,
 			dataIndex: 'basketName',
+			id:'basketName',
 		    renderer:function (value, metaData, record, rowIdx, colIdx, store){
 				var html = value;
 				var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || '';
 				if(classifiedItemAmountInfo !== '' && record.get('tousseType') == '外来器械包'){
 					html = classifiedItemAmountInfo;
 				}
-				metaData.style='word-wrap: break-word !important;';
-		        metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容.  
-		        return value;  
+				metaData.style='white-space: normal !important;';
+				metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容.  
+				if(value !== '' && record.get('basketBarcode') !== '' && sstsConfig.showBarcodeOfWashBasketInPackingTaskList){
+					if(value.split(';').length > 1){
+						var resultValue = []
+						var basketBarcodes = record.get('basketBarcode');
+						for(var i=0;i<value.split(';').length;i++){
+							resultValue[i] =  value.split(';')[i] + '('+basketBarcodes.split(';')[i]+')';  
+						}
+						return resultValue.join(';');
+					}else {
+						return value+'('+record.get('basketBarcode')+')';  
+					}
+				}else {
+					return value;
+				}
 		      } 
 		},{
 			header: '申请科室',
@@ -4572,16 +4594,13 @@
 			}
 			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;
 					childNode.set("checked", false);
 					if(parentNode.get("checked") == true){
 						childNode.set("checked", true);
@@ -4593,12 +4612,6 @@
 				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()[5].setWidth(basketNameMaxLenght+30);
-				}
-			}
 			speakBasket.speakContent();
 		},
 		failure : function(){myMask.hide();}
@@ -4718,26 +4731,17 @@
 		fn: function(store){
 			var root = basketStore.getRootNode();
 			var tousseNameMaxLenArray = [];
-			var basketNameMaxLenArray = [];
 			Ext4.each(root.childNodes, function(pNode){
 				var tousseName = pNode.data.tousseName;
 				tousseNameMaxLenArray.push(textSize(fontSize+"px","宋体",tousseName).width || 0);
 				Ext4.each(pNode.childNodes, function(lastNode){
-					var basketName = lastNode.data.basketName;
-					basketNameMaxLenArray.push(textSize(fontSize+"px","宋体",basketName).width || 0)
 					lastNode.set("checked", false);
 				});
 			});
 			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()[5].setWidth(basketNameMaxLenght+30);
-				}
-			}
 		}
 	},
       checkchange:function( node, checked, eOpts ){
@@ -4943,13 +4947,10 @@
 			fn: function(store){
 				var root = waitPackingTaskStore.getRootNode();
 				var tousseNameMaxLenArray = [];
-				var basketNameMaxLenArray = [];
 				Ext4.each(root.childNodes, function(pNode){
 					var tousseName = pNode.data.tousseName;
 					tousseNameMaxLenArray.push(textSize(fontSize+"px","宋体",tousseName).width || 0);
 					Ext4.each(pNode.childNodes, function(lastNode){
-						var basketName = lastNode.data.basketName;
-						basketNameMaxLenArray.push(textSize(fontSize+"px","宋体",basketName).width || 0)
 						lastNode.set("checked", false);
 					});
 				});
@@ -4958,12 +4959,6 @@
 					var tousseNameMaxLenght = Math.max.apply(null,tousseNameMaxLenArray);
 					waitPackingTreeGrid.headerCt.getGridColumns()[0].setWidth(tousseNameMaxLenght+90);
 				}
-				if(basketNameMaxLenArray.length > 0){
-					var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
-					if(basketNameMaxLenght !== 0){
-						waitPackingTreeGrid.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
-					}
-				}
 			}
 		},
         checkchange:function( node, checked, eOpts ){
Index: ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js
===================================================================
diff -u -r30101 -r30477
--- ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 30101)
+++ ssts-web/src/main/webapp/disinfectsystem/config/szsykyy/config.js	(.../config.js)	(revision 30477)
@@ -123,6 +123,8 @@
 	saveButtonNameOfSterilizationFormRecord: '开始灭菌',
 	//发货界面的按钮中保存文字的别名
 	aliasNameOfSaveKeywordInInvoiceForm: '发放',
+	//待装配任务列表的清洗篮筐显示篮筐条码
+	showBarcodeOfWashBasketInPackingTaskList:true,
 	//清洗消毒记录列表的自动刷新时间间隔,建议设置为60
 	autoRefreshWashAndDisinfectRecordListIntervalSeconds:5
 }
\ No newline at end of file