Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r30073 -r31432
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 30073)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 31432)
@@ -1756,6 +1756,7 @@
 			root: 'data'
 		}, [{ name: 'id', mapping: 'id' },
 		{ name: 'spelling', mapping: 'spelling' },
+		{ name: 'type', mapping: 'type' },
 		{ name: 'name', mapping: 'name' },
 		{ name: 'displayName', mapping: 'displayName' },
 		{ name: 'amount', mapping: 'amount' }]
@@ -1785,6 +1786,9 @@
 		width: 70,
 		dataIndex: 'isDelivery',
 		renderer: function (v, p, record) {
+			if(!record.leaf && record.type == '外部代理灭菌包'){
+				return;
+			}
 			var str = v;
 			if (!record.recordId) {
 				var id = record.id;
@@ -1806,6 +1810,9 @@
 		width: 70,
 		dataIndex: 'isPacking',
 		renderer: function (v, p, record) {
+			if(!record.leaf && record.type == '外部代理灭菌包'){
+				return;
+			}
 			var str = v;
 			if (!record.recordId) {
 				var id = record.id;
@@ -1875,6 +1882,9 @@
 						}
 					}
 				}]
+			},{
+				xtype:'hidden',
+				id:"hiddenTousseType"
 			}, {
 				xtype: 'toolbar',
 				items: [{
@@ -1903,6 +1913,7 @@
 					listeners: {
 						select: function (combo, record, index) {
 							top.Ext.getCmp('package1').setValue(record.data.name);
+							top.Ext.getCmp('hiddenTousseType').setValue(record.data.type);
 						},
 						specialkey: function (field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
@@ -1926,6 +1937,7 @@
 						specialkey: function (field, ee) {
 							if (ee.getKey() == Ext.EventObject.ENTER) {
 								var tousseName = top.Ext.getCmp("package1").getValue();
+								var hiddenTousseType = top.Ext.getCmp("hiddenTousseType").getValue();
 								var toussePrice = 0.00;
 								DWREngine.setAsync(false);
 								ReturnGoodsRecordTableManager.getToussePrice(tousseName, function (price) {
@@ -1934,9 +1946,10 @@
 									}
 								});
 								DWREngine.setAsync(true);
-								if (addReturnTousseItemToTree('', tousseName, top.Ext.getCmp("count1").getValue(), toussePrice)) {
+								if (addReturnTousseItemToTree('', tousseName, top.Ext.getCmp("count1").getValue(), toussePrice, hiddenTousseType)) {
 									top.Ext.getCmp("package1").setValue('');
 									top.Ext.getCmp("count1").setValue('');
+									top.Ext.getCmp("hiddenTousseType").setValue('');
 								}
 							}
 						}
@@ -1948,16 +1961,18 @@
 					handler: function () {
 						var tousseName = top.Ext.getCmp("package1").getValue();
 						var toussePrice = 0.00;
+						var hiddenTousseType = top.Ext.getCmp("hiddenTousseType").getValue();
 						DWREngine.setAsync(false);
 						ReturnGoodsRecordTableManager.getToussePrice(tousseName, function (price) {
 							if (price != null) {
 								toussePrice = price;
 							}
 						});
 						DWREngine.setAsync(true);
-						if (addReturnTousseItemToTree('', tousseName, top.Ext.getCmp("count1").getValue(), toussePrice)) {
+						if (addReturnTousseItemToTree('', tousseName, top.Ext.getCmp("count1").getValue(), toussePrice, hiddenTousseType)) {
 							top.Ext.getCmp("package1").setValue('');
 							top.Ext.getCmp("count1").setValue('');
+							top.Ext.getCmp("hiddenTousseType").setValue('');
 						}
 					}
 				}]
@@ -2357,7 +2372,7 @@
 	// 如果是固定条码
 	var tousseFixedBarcode = tousseInstance.tousseFixedBarcode;
 	if (!isUndefinedOrNull(tousseFixedBarcode) && tousseFixedBarcode) {
-		addReturnTousseItemToTree('', tousseName, 1, price);
+		addReturnTousseItemToTree('', tousseName, 1, price, tousseInstance.type);
 		return;
 	}
 	var departCoding = tousseInstance.location_2;
@@ -2428,7 +2443,7 @@
 		amount = 1;
 	}
 
-	var tousseNode = createParentNode(0, tousseName, amount, price, '否', '否');
+	var tousseNode = createParentNode(0, tousseName, amount, price, '否', '否', tousseInstance.type);
 
 	if (isTousseInstance) {
 		//tousseInstanceNode = createChildNode(barcode);
@@ -2457,12 +2472,11 @@
 	return exist;
 }
 //把器械包添加到tree中
-function addReturnTousseItemToTree(barcode, tousseName, amount, price, departCoding, depart) {
+function addReturnTousseItemToTree(barcode, tousseName, amount, price, type) {
 	if (!tousseName) {
 		showResult("请输入器械包名称!");
 		return false;
 	}
-
 	if (amount == "" || amount < 1) {
 		showResult("请输入数量且不能小于0!");
 		return false;
@@ -2497,7 +2511,7 @@
 	}
 
 
-	var tousseNode = createParentNode(0, tousseName, amount, price, '否', '否');
+	var tousseNode = createParentNode(0, tousseName, amount, price, '否', '否', type);
 
 	if (isTousseInstance) {
 		tousseInstanceNode = createChildNode(barcode);
@@ -2540,8 +2554,8 @@
 /**
  * 创建父节点 public
  */
-function createParentNode(recordId, tousseName, amount, price, isDelivery, isPacking) {
-	return createNodeByParam(true, recordId, tousseName, amount, price, '', isDelivery, isPacking);
+function createParentNode(recordId, tousseName, amount, price, isDelivery, isPacking, type) {
+	return createNodeByParam(true, recordId, tousseName, amount, price, '', isDelivery, isPacking, type);
 }
 function createParentNodeFrom(pNode) {
 	//alert(111)
@@ -2570,7 +2584,7 @@
 	return node;
 }
 //private
-function createNodeByParam(isParentNode, recordId, tousseName, amount, price, barcode, isDelivery, isPacking) {
+function createNodeByParam(isParentNode, recordId, tousseName, amount, price, barcode, isDelivery, isPacking, type) {
 	var node;
 	if (isParentNode == true) {
 		// 创建父节点
@@ -2581,6 +2595,7 @@
 			iconCls: 'task-folder',
 			uiProvider: Ext.tree.ColumnNodeUI,
 			leaf: false,
+			type:type,
 			expanded: true
 		});
 		node.attributes.amount = amount;