Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js
===================================================================
diff -u -r36281 -r36392
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 36281)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoiceSignFormVersion2.js	(.../invoiceSignFormVersion2.js)	(revision 36392)
@@ -20,6 +20,7 @@
         applyDateDataArray.push(['近二天', time.twoDayBeforeTodayTime]);
         applyDateDataArray.push(['近三天', time.threeDayBeforeTodayTime]);
         applyDateDataArray.push(['所有日期', ""]);
+		applyDateDataArray.push(['指定日期', "指定日期"]);
     });
     return applyDateDataArray;
 }
@@ -69,6 +70,12 @@
 	var newAmount = Number(count) + Number(signAmount);
 	record.set('signAmount',newAmount);//计算待签收数量
 	record.set('amount',waitSignAmount);//获取已签收数量
+	if((record.data.urgentLevel || '') !== ''){
+		var urgentAmount = Number(record.get('urgentAmount')) - 1;
+		var signUrgentAmount = Number(record.get('signUrgentAmount')) + Number(1);
+		record.set('urgentAmount',urgentAmount);
+		record.set('signUrgentAmount',signUrgentAmount);
+	}
 	return false;
 	
 }
@@ -148,6 +155,9 @@
 function addInvoiceSignGoodsGrid(goods){
 	// 一次性物品签收时，后台会返回数量；器械包签收时，不返回数量
 	var count = goods.amount ? goods.amount : 1;// 此次的签收数量
+	var urgentAmount = 0;
+	var signUrgentAmount = 0;
+	var urgentLevel;
 	//扫描的包和待签收物品明细的包判断是否是同一个，是就返回待签收物品明细的包的信息
 	var record = findScanGoodsWithWaitInvoiceSignGoods(goods);
 	var newRecord = new addGridItem({
@@ -163,10 +173,18 @@
 		updateWaitInvoiceSignAmount(record,count,waitSignAmount);
 		resortWaitInvoiceSign(record);
 	}else{
+		if((goods.urgentLevel || '') !== ''){
+			urgentAmount = goods.urgentAmount || 0;
+			urgentLevel = goods.urgentLevel;
+			signUrgentAmount = parseInt(record.data.signUrgentAmount || 0) + 1;
+		}
 		var newWaitRecord = new waitGridItem({
 			tousseName : goods.tousseName,
 			amount : waitSignAmount,
-			signAmount : count
+			signAmount : count,
+			urgentAmount : urgentAmount,
+			urgentLevel : record.data.urgentLevel,
+			signUrgentAmount : signUrgentAmount
 		});
 		waitInvoiceSignGoodsStore.insert(0,newWaitRecord);
 	}
@@ -321,9 +339,11 @@
 			root : 'data'
 		}, [
 		   {name : 'tousseName'},
+		   {name : 'urgentAmount'},
 		   {name : 'amount'}, 
 		   {name : 'signAmount'},
-		   {name : 'signTime'}
+		   {name : 'urgentLevel'},
+		   {name : 'signUrgentAmount'}
 		])
 	});
 	
@@ -345,9 +365,20 @@
 	}
 	
 	var	waitInvoiceSignCm = new Ext.grid.ColumnModel([
-		{header : "物品名称",dataIndex : 'tousseName',width : 130,menuDisabled: true},
+		{header : "物品名称",dataIndex : 'tousseName',width : 130,menuDisabled: true,renderer:function(v,p,record){
+			var urgentLevel = record.data.urgentLevel || '';
+			if(sstsConfig.enableUrgentFunction && urgentLevel !== '' ){
+				var colorCode = record.data.urgentLevel.colorCode;
+				cell = "<div><img src='"+WWWROOT+"/images/web/urgent-white.png' style='vertical-align: middle;width:18px;height:18px;margin-right:5px;background:"+colorCode+"'/>"+v+"</div>";
+			}else{
+				cell = v;
+			}
+			return cell
+		}},
+		{header : "待签收加急",dataIndex : 'urgentAmount',width : 120,menuDisabled: true,hidden:!sstsConfig.enableUrgentFunction},
 		{header : "待签收",dataIndex : 'amount',width : 60,menuDisabled: true},
-		{header : "已签收",dataIndex : 'signAmount',width : 60, value:0,menuDisabled: true,renderer:getDefaultAmount}
+		{header : "已签收",dataIndex : 'signAmount',width : 60, value:0,menuDisabled: true,renderer:getDefaultAmount},
+		{header : "已签收加急",dataIndex : 'signUrgentAmount',width : 120,menuDisabled: true,hidden:!sstsConfig.enableUrgentFunction,renderer:getDefaultAmount},
 	]);
 	
 
@@ -417,7 +448,7 @@
 					layout:'column',
 					items:[{
 					layout : 'fit',
-					width:top.screen.width > 1200 ? 500 : 400,
+					width:top.screen.width > 1200 ? 400 : 300,
 					items:[
 						new top.Ext.grid.EditorGridPanel({
 							id : 'scanGoods',
@@ -480,7 +511,7 @@
 					)]		
 				},{
 					layout : 'fit',
-					width:top.screen.width > 1200 ? 300 : 220,
+					width:top.screen.width > 1200 ? 500 : 420,
 					items:[new top.Ext.grid.EditorGridPanel({
 					id : 'waitInvoiceSignGoods',
 					title : '待签收物品明细',
@@ -512,11 +543,54 @@
 						listeners : {
 							select : function(combo, record, index){
 								var value = combo.getValue();
-								var timeArr = value.split(";");
-								waitInvoiceSignGoodsStore.baseParams['beginDate'] = timeArr[0];
-								waitInvoiceSignGoodsStore.baseParams['endDate'] = timeArr[1];
-								waitInvoiceSignGoodsStore.load();
-								scanGoodsStore.removeAll();
+								if(value == '指定日期'){
+									var searchTbar = [{
+										text : '开始日期:'
+									},{
+										xtype :'datefield',
+										name : 'startDate',
+										format :'Y-m-d',
+										id : 'startDate',
+										readOnly : false,
+										editable : false
+									},{
+										text : '结束日期:'
+									},{
+										xtype :'datefield',
+										name : 'endDate',
+										id : 'endDate',
+										readOnly : false,
+										editable : false,
+										format :'Y-m-d'
+									},{
+										xtype : 'button',
+										text : '查询',
+										minWidth : 70,
+										iconCls : 'icon_search',
+										handler : function() {
+											var startDate = top.Ext.getCmp('startDate').getRawValue();
+											var endDate = top.Ext.getCmp('endDate').getRawValue();
+											waitInvoiceSignGoodsStore.baseParams['beginDate'] = startDate;
+											waitInvoiceSignGoodsStore.baseParams['endDate'] = endDate;
+											waitInvoiceSignGoodsStore.load();
+										}
+									}]
+									var tbItem = top.Ext.getCmp('waitInvoiceSignGoods');
+									var t = new top.Ext.Toolbar({items: searchTbar})
+            						t.render(tbItem.tbar); 
+									getServerTime('yyyy-MM-dd', top.Ext, 'startDate');
+									getServerTime('yyyy-MM-dd', top.Ext, 'endDate');
+								}else {
+									var timeArr = value.split(";");
+									waitInvoiceSignGoodsStore.baseParams['beginDate'] = timeArr[0];
+									waitInvoiceSignGoodsStore.baseParams['endDate'] = timeArr[1];
+									waitInvoiceSignGoodsStore.load();
+									scanGoodsStore.removeAll();
+									var tbItem = top.Ext.getCmp('waitInvoiceSignGoods');
+									if(tbItem.tbar.dom.children.length > 1){
+										tbItem.tbar.dom.children[1].remove()
+									}
+								}
 							}
 						},
 						anchor : '95%'
@@ -555,7 +629,7 @@
 				})]
 			},{
 				layout : 'fit',
-				width:top.screen.width > 1200 ? 415 : 340,
+				width:top.screen.width > 1200 ? 315 : 240,
 				items : [ invoiceSignAbnormalDetail ]
 			}]
 		}],