Index: ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js
===================================================================
diff -u -r24874 -r25700
--- ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 24874)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/splitForeignTousseView.js	(.../splitForeignTousseView.js)	(revision 25700)
@@ -38,7 +38,7 @@
 		return false;
 	}
 	var index = splitedMaterialStore.findExact("materialName", materialName);
-	if (index == -1){
+	if (index == -1){//未找到返回-1
 		var addItem = [{
 			materialName : materialName,
 			materialAmount : materialAmount,
@@ -208,6 +208,7 @@
         tousse.tousseName = tousseName;
         tousse.materialNames = record.get('materialNames');
         tousse.materialsJsonArray = record.get('materialsJsonArray');
+		tousse.weight = record.get('weight');
         tousse.bigPackage = record.get('bigPackage');
         tousse.packingType = record.get('packingType');
         tousse.toolAmount = record.get('toolAmount');
@@ -418,6 +419,7 @@
         	fields : [
         	    {name : 'tousseName',mapping : 'tousseName'}, 
         	    {name : 'bigPackage',mapping : 'bigPackage'}, 
+				//{name : 'weight',mapping : 'weight'}, 
         	    {name : 'packingType',mapping : 'packingType'}, 
         	    {name : 'materialNames',mapping : 'materialNames'}, 
         	    {name : 'toolAmount',mapping : 'toolAmount'},
@@ -443,6 +445,17 @@
 	            store: isBigPackageStore
 	        })
 	    },{
+            header : "重量(公斤)",
+			hidden:!sstsConfig.foreignTousseAddWeight,
+            dataIndex : 'weight',
+            width : 80,
+            editor : new top.Ext4.form.NumberField({
+                allowBlank: false,
+                allowNegative: false, // 不允许负数 
+                allowDecimals: true, // 允许小数点 
+                minValue:0
+            })
+        },{
 	        header : "包装类型",
 	        dataIndex : 'packingType',
 	        width : 120,
@@ -472,6 +485,7 @@
 	    }]
 	});
     
+    //是否显示默认配包者(外来器械拆分小包界面)
     var isShowDefaultPackerOfSplitForeignTousse = getBoolValueFromJs("sstsConfig.isShowDefaultPackerOfSplitForeignTousse",true);
     var foreignToussePanel = new top.Ext4.form.Panel( {
     	id : 'foreignToussePanel',
@@ -777,6 +791,19 @@
             allowBlank : true,
             anchor : '80%',
             readOnly: true
+        },{
+            xtype : 'textfield',
+            columnWidth : .33,
+            labelWidth : 70,
+            fieldLabel : "重量",
+            name : "weight",
+			hidden:!sstsConfig.foreignTousseAddWeight,
+            id : "weight",
+            labelAlign:'right',
+            margin :'5 0 0 0',
+            allowBlank : true,
+            anchor : '80%',
+            readOnly: true
         }],
         buttons : [{
             text : packingBtnText,
@@ -892,6 +919,7 @@
             top.Ext4.getCmp("patient2").setValue(foreignTousseAppInfo.patient);
             top.Ext4.getCmp("supplierName2").setValue(foreignTousseAppInfo.supplierName);
             top.Ext4.getCmp("hospitalNumber2").setValue(foreignTousseAppInfo.hospitalNumber);
+			top.Ext4.getCmp("weight").setValue(foreignTousseAppInfo.weight);
             
         }
     });