Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js
===================================================================
diff -u -r15838 -r16046
--- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 15838)
+++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedView.js	(.../invoicePlanExtractedView.js)	(revision 16046)
@@ -134,6 +134,30 @@
 	};
 	return ext2CompUtil.getComboBuilder().getCombo(comboConfig);
 }
+
+/**
+ *  请求服务器，生成时间筛选对应的值
+ * @returns {[*,*,*,*,*]}
+ */
+function getTimeComboData() {
+    var dateHelper = new DateHelper();
+    var applyDateDataArray = [['全部', '']];
+    var format = sstsConfig.timeSearchFmt ? 'yyyy-MM-dd HH:mm' : 'yyyy-MM-dd';
+    var url = WWWROOT + '/system/serverTimeAction!getInvoicePlanComboTime.do';
+    dateHelper.getServerTimeByJQ(format, Ext, url, function (result) {
+        var time = result.time;
+        //花都区人民医院要求:时间选择增加今天上午和下午
+        if (sstsConfig.showMorAndAf){
+            applyDateDataArray.push(['今天上午', time.todayMorningTodayTime]);
+            applyDateDataArray.push(['今天下午', time.todayAfternoonTodayTime]);
+        }
+        applyDateDataArray.push(['今天', time.todayTime]);
+        applyDateDataArray.push(['昨天', time.yesterdayTodayTime]);
+        applyDateDataArray.push(['近三天', time.threeDayBeforeTodayTime]);
+        applyDateDataArray.push(['近一周', time.thisWeekTodayTime]);
+    });
+    return applyDateDataArray;
+}
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	
@@ -243,7 +267,7 @@
 					emptyText:'请选择申请单日期',
 					mode:'local',
 					store : new Ext.data.SimpleStore({
-						data:applyDateDataArray,
+						data: getTimeComboData(),
 						fields:['key','value']
 					}),
 					forceSelection : true,
@@ -257,27 +281,26 @@
 				},{
 					text : '开始日期:'
 				},{
-					xtype : 'datefield',
+					xtype : sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
 					fieldLabel : '开始日期',
 					name : 'startDate',
+					format : sstsConfig.timeSearchFmt || 'Y-m-d',
 					id : 'startDate',
 					readOnly : false,
 					editable : false,
-					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-					format : 'Y-m-d',
-					width:100
+					width : sstsConfig.timeSearchFmt ? 150 : 100
 				},{
 					text : '结束日期:'
 				},{
-					xtype : 'datefield',
+            		xtype : sstsConfig.timeSearchFmt ? 'datefieldWithMin' : 'datefield',
 					fieldLabel : '结束日期',
 					name : 'endDate',
 					id : 'endDate',
 					readOnly : false,
 					editable : false,
-					altFormats:'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
-					format : 'Y-m-d',
-					width:100
+					// altFormats: sstsConfig.timeSearchFmt || 'Y-m-d|Y-n-j|y-n-j|y-m-j|y-m-d|y-n-d|Y-n-d|Y-m-j|Ymd|Ynj|ynj|ymj|ymd|ynd|Ynd|Ymj|Y/m/d|Y/n/j|y/n/j|y/m/j|y/m/d|y/n/d|Y/n/d|Y/m/j',
+            		format : sstsConfig.timeSearchFmt || 'Y-m-d',
+            		width : sstsConfig.timeSearchFmt ? 150 : 100
 				}, {
 					text : '物品类型:'
 				},{