Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js
===================================================================
diff -u -r21617 -r21987
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 21617)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceView.js	(.../invoiceView.js)	(revision 21987)
@@ -1260,7 +1260,19 @@
         }
     });
 }
-
+function isSameRemark(){
+	var records = grid.getSelectionModel().getSelections();
+	var remarkTemp = records[0].data['remark'];
+	if(isUndefinedOrNullOrEmpty(remarkTemp)) //第一个为空也不显示备注
+		return false;
+	for ( var i = 1, len = records.length; i < len; i++) {
+		if(isUndefinedOrNullOrEmpty(records[i].data['remark']))//有为空为null则不显示备注
+			return false;
+		if(records[i].data['remark'] != remarkTemp)//有不相同的则不显示备注
+			return false;
+	}		
+	return true;
+}
 function getSelectedIds(){
 	var records = grid.getSelectionModel().getSelections();
 	if (records.length == 0) {
@@ -1300,6 +1312,9 @@
           return;
       }
   }
+  //如果选中的发货单备注记录不相同（或者有单为空）则不显示备注
+  if(!isSameRemark())
+	  remark = '';
   
   var ids = getSelectedIds();
 //  for ( var i = 0, len = records.length; i < len; i++) {