Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
===================================================================
diff -u -r26948 -r26950
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 26948)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 26950)
@@ -19,12 +19,13 @@
         applyDateDataArray.push(['今天', time.todayTime]);
         applyDateDataArray.push(['近二天', time.twoDayBeforeTodayTime]);
         applyDateDataArray.push(['近三天', time.threeDayBeforeTodayTime]);
-        applyDateDataArray.push(['全部', "all"]);
+        applyDateDataArray.push(['所有日期', ""]);
     });
     return applyDateDataArray;
 }
 
 var sendoutTimeArr = getTimeComboData();
+var sendoutTimeArrSplit = sendoutTimeArr[1][1].split(";");
 
 function getDefaultAmount(v,p,record){
 	if (v == null || v.length <= 0){
@@ -215,7 +216,7 @@
 							var tousseName = record.get('tousseName');
 							if(tousseName == result.arr[0].tousseName && record.get('signAmount') == 0){
 								waitInvoiceSignGoodsStore.remove(record);
-								showResult(result.arr[0].tousseName + "包的待签收数量为0，将从待签收列表删除"  , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
+								showResult(result.arr[0].tousseName + "的待签收数量为0，将从待签收列表删除"  , null , sstsConfig.messagePauseTimeOnInvoiceplanPage);
 								break;
 							}
 						}
@@ -293,10 +294,14 @@
 		   {name : 'signTime'}
 		])
 	});
-	waitInvoiceSignGoodsStore.on("beforeload", function(thiz, options) {	
-		//	waitInvoiceSignGoodsStore.baseParams['endDate'] = timeArr[1];
+	
+	//默认传近2天
+	waitInvoiceSignGoodsStore.load({
+		params : { 
+			beginDate:sendoutTimeArrSplit[0],
+			endDate:sendoutTimeArrSplit[1]
+		}
 	});
-	waitInvoiceSignGoodsStore.load();
 	
 	var	waitInvoiceSignCm = new Ext.grid.ColumnModel([
 		{header : "物品名称",dataIndex : 'tousseName',width : 150,menuDisabled: true},
@@ -322,7 +327,7 @@
 	var cm = new Ext.grid.ColumnModel([
 		{header : "物品名称",dataIndex : 'tousseName',width:200,menuDisabled: true},
 		{header : "条码",dataIndex : 'tousseBarcode',width : 90,menuDisabled: true},
-		{header : "灭菌日期",dataIndex : 'sterialTime',width : 130,menuDisabled: true},
+		{header : "灭菌日期",dataIndex : 'sterialTime',width : 130,menuDisabled: true,renderer : myDateFormat},
 		{header : "数量",dataIndex : 'count',width : 50,menuDisabled: true,id:"count"}
 	]);