Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r30323 -r30333
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30323)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 30333)
@@ -941,6 +941,30 @@
 		        }  
 		    }
 		},{
+			header: '拆包',
+			width : 60,
+			align:'center',
+			sortable: false,
+			renderer: function(v,p,record,rowIndex, columnIndex, store){
+				var str = '<div style="width:50px;height: 20px;">';
+				if(record.get('leaf') && record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
+					var taskid = record.get('taskid');
+					var tousseName = record.get('tousseName');
+					var supplierName = record.get('supplierName');
+					var basketBarcode = record.get('basketBarcode');
+					var amount = record.get('amount');
+					var showName = tousseName;
+					var invoicePlanId = record.get('invoicePlanId');
+					var packageType = record.get('packageType');
+					var sterilingMethod = record.get('sterilingMethod');
+					if(!allowForeignToussePartiallyPacking){
+						str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+invoicePlanId + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"') \">";
+					}
+				}
+				str += '</div>';
+		        return str;
+			}
+		},{
 			header: '加急数量',
 			width : 80,
 			align:'center',
@@ -1085,18 +1109,6 @@
 			            	str += "<input type='button' style='height:20px; width:40px;' value='报损' onclick=\"onErrorDamageBtnClick('"+type_damage+"','"+taskid+"')\" >";
 			            }
 			        }
-			        if(record.get('tousseType') == '外来器械包' && treeId == 'basketTreeGrid'){
-			            var supplierName = record.get('supplierName');
-			           
-			            var basketBarcode = record.get('basketBarcode');
-			            var showName = tousseName;
-			            var invoicePlanId = record.get('invoicePlanId');
-			            var packageType = record.get('packageType');
-			            var sterilingMethod = record.get('sterilingMethod');
-			            if(!allowForeignToussePartiallyPacking){
-			            	str += "<input type='button' style='height:20px; width:40px;' value='拆包' onclick=\"splitForeignTousse(" + taskid + ",'" + tousseName+ "','"+showName+ "','"+invoicePlanId + "','"+amount+"','"+supplierName+"','"+basketBarcode+"','"+packageType+"','"+sterilingMethod+"') \">";
-			            }
-			        }
 				}
 				str += '</div>';
 		        return str;
@@ -4584,7 +4596,7 @@
 			if(basketNameMaxLenArray.length > 0){
 				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
 				if(basketNameMaxLenght !== 0){
-					basketColumnTreeGrid.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
+					basketColumnTreeGrid.headerCt.getGridColumns()[5].setWidth(basketNameMaxLenght+30);
 				}
 			}
 			speakBasket.speakContent();
@@ -4723,7 +4735,7 @@
 			if(basketNameMaxLenArray.length > 0){
 				var basketNameMaxLenght = Math.max.apply(null,basketNameMaxLenArray);
 				if(basketNameMaxLenght !== 0){
-					this.headerCt.getGridColumns()[4].setWidth(basketNameMaxLenght+30);
+					this.headerCt.getGridColumns()[5].setWidth(basketNameMaxLenght+30);
 				}
 			}
 		}