Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js
===================================================================
diff -u -r17728 -r17776
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js	(.../returnDisposableGoodsByInvoicePlan.js)	(revision 17728)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnDisposableGoodsByInvoicePlan.js	(.../returnDisposableGoodsByInvoicePlan.js)	(revision 17776)
@@ -99,7 +99,7 @@
 var priceStore = null;
 var PriceRecord = null;
 
-//校验退货人科室是否有问题
+//校验退货科室是否有问题
 function isDepartValid(r){
 	var v = true;
 	var departs = [];
@@ -137,7 +137,7 @@
 				return false;
 			}
 		}
-		// 是否和退货人科室一致
+		// 是否和退货科室一致
 		var curDepartCoding = top.Ext.getCmp('departCoding').getValue();
 		var curDepart = top.Ext.getCmp('depart').getValue();
 		if(curDepartCoding != firstDepart){
@@ -148,7 +148,7 @@
 	return v;
 }
 
-// 设置退货人科室为只读
+// 设置退货科室为只读
 function setDepartReadOnly(r){
 	return;
 	var dp = form.getForm().findField("depart"); 
@@ -859,7 +859,7 @@
 						name : 'depart',
 						disabled:!editableConfig.editable,
 						queryParam : 'spell',
-						fieldLabel : '退货人科室',
+						fieldLabel : '退货科室',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'name',
@@ -1108,7 +1108,7 @@
     DWREngine.setAsync(true);
 }
 
-// 器械包,科室退货人为空时才能更改退货人科室
+// 器械包,科室退货人为空时才能更改退货科室
 function loadPeopleByStaffNum(staffNumField){
 	var staffNum = staffNumField.getValue();
 	if(staffNum){
@@ -1383,7 +1383,7 @@
 //	if(curDepartCoding != '' ){
 //		//alert(departCoding)
 //		if((curDepartCoding != undefined && curDepartCoding != null && curDepartCoding != '') && (curDepartCoding != tousseInstance.location)){
-//			showResult("器械包科室和退货人科室不一致!");
+//			showResult("器械包科室和退货科室不一致!");
 //			return false;
 //		}
 //	}else{
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js
===================================================================
diff -u -r17305 -r17776
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 17305)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnGoodsRecordForm.js	(.../returnGoodsRecordForm.js)	(revision 17776)
@@ -93,7 +93,7 @@
 var priceStore = null;
 var PriceRecord = null;
 
-//校验退货人科室是否有问题
+//校验退货科室是否有问题
 function isDepartValid(r){
 	var v = true;
 	var departs = [];
@@ -131,7 +131,7 @@
 				return false;
 			}
 		}
-		// 是否和退货人科室一致
+		// 是否和退货科室一致
 		var curDepartCoding = top.Ext.getCmp('departCoding').getValue();
 		var curDepart = top.Ext.getCmp('depart').getValue();
 		if(curDepartCoding != firstDepart){
@@ -142,7 +142,7 @@
 	return v;
 }
 
-// 设置退货人科室为只读
+// 设置退货科室为只读
 function setDepartReadOnly(r){
 	return;
 	var dp = form.getForm().findField("depart"); 
@@ -844,7 +844,7 @@
 						name : 'depart',
 						disabled:!editableConfig.editable,
 						queryParam : 'spell',
-						fieldLabel : '退货人科室',
+						fieldLabel : '退货科室',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'name',
@@ -1246,7 +1246,7 @@
 	});
 	win.show();
 }
-// 器械包,科室退货人为空时才能更改退货人科室
+// 器械包,科室退货人为空时才能更改退货科室
 function loadPeopleByStaffNum(staffNumField){
 	var staffNum = staffNumField.getValue();
 	if(staffNum){
@@ -1849,7 +1849,7 @@
 						name : 'depart',
 						disabled:!editableConfig.editable,
 						queryParam : 'spell',
-						fieldLabel : '退货人科室',
+						fieldLabel : '退货科室',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'id',
@@ -1942,9 +1942,9 @@
 							showResult('请正确填写表单各值');
 							return false;
 						}
-						// 校验退货人科室是否有问题
+						// 校验退货科室是否有问题
 						if(!isDepartValid()){
-							showResult('退货人科室不一致！');
+							showResult('退货科室不一致！');
 							return false;
 						}
 //						if(top.Ext.getCmp('returnOfPeople').getValue().length<1){
@@ -2059,7 +2059,7 @@
 //	if(curDepartCoding != '' ){
 //		//alert(departCoding)
 //		if((curDepartCoding != undefined && curDepartCoding != null && curDepartCoding != '') && (curDepartCoding != tousseInstance.location)){
-//			showResult("器械包科室和退货人科室不一致!");
+//			showResult("器械包科室和退货科室不一致!");
 //			return false;
 //		}
 //	}else{
Index: ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js
===================================================================
diff -u -r17728 -r17776
--- ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js	(.../returnTousseByInvoicePlan.js)	(revision 17728)
+++ ssts-web/src/main/webapp/disinfectsystem/returnGoodsRecord/returnTousseByInvoicePlan.js	(.../returnTousseByInvoicePlan.js)	(revision 17776)
@@ -99,7 +99,7 @@
 var priceStore = null;
 var PriceRecord = null;
 
-//校验退货人科室是否有问题
+//校验退货科室是否有问题
 function isDepartValid(r){
 	var v = true;
 	var departs = [];
@@ -137,7 +137,7 @@
 				return false;
 			}
 		}
-		// 是否和退货人科室一致
+		// 是否和退货科室一致
 		var curDepartCoding = top.Ext.getCmp('departCoding').getValue();
 		var curDepart = top.Ext.getCmp('depart').getValue();
 		if(curDepartCoding != firstDepart){
@@ -148,7 +148,7 @@
 	return v;
 }
 
-// 设置退货人科室为只读
+// 设置退货科室为只读
 function setDepartReadOnly(r){
 	return;
 	var dp = form.getForm().findField("depart"); 
@@ -830,7 +830,7 @@
 						name : 'depart',
 						disabled:!editableConfig.editable,
 						queryParam : 'spell',
-						fieldLabel : '退货人科室',
+						fieldLabel : '退货科室',
 						queryParam : 'spell',
 						minChars : 0,
 						valueField : 'id',
@@ -923,9 +923,9 @@
 							showResult('请正确填写表单各值');
 							return false;
 						}
-						// 校验退货人科室是否有问题
+						// 校验退货科室是否有问题
 						if(!isDepartValid()){
-							showResult('退货人科室不一致！');
+							showResult('退货科室不一致！');
 							return false;
 						}
 //						if(top.Ext.getCmp('returnOfPeople').getValue().length<1){
@@ -1009,7 +1009,7 @@
 }
 
 
-// 器械包,科室退货人为空时才能更改退货人科室
+// 器械包,科室退货人为空时才能更改退货科室
 function loadPeopleByStaffNum(staffNumField){
 	var staffNum = staffNumField.getValue();
 	if(staffNum){
@@ -1284,7 +1284,7 @@
 //	if(curDepartCoding != '' ){
 //		//alert(departCoding)
 //		if((curDepartCoding != undefined && curDepartCoding != null && curDepartCoding != '') && (curDepartCoding != tousseInstance.location)){
-//			showResult("器械包科室和退货人科室不一致!");
+//			showResult("器械包科室和退货科室不一致!");
 //			return false;
 //		}
 //	}else{