Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js
===================================================================
diff -u -r31340 -r32792
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js	(.../materialTypeWorkloadReportView.js)	(revision 31340)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/materialTypeWorkloadReportView.js	(.../materialTypeWorkloadReportView.js)	(revision 32792)
@@ -117,7 +117,7 @@
 	var supplyRoomStore = new Ext.data.SimpleStore({
 		fields: ['departCode', 'name']
 	});
-
+	var currentOrgUnitIsSupplyRoom = false;
 	var supplyRoomRemoteStore = new Ext.data.Store({
 		proxy: new Ext.data.HttpProxy({
 			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do',
@@ -140,7 +140,6 @@
 			},
 			load: function (thiz, records, options) {
 				loadMask.hide();
-				var currentOrgUnitIsSupplyRoom = false;
 				if (records && records.length > 0) {
 					for (var i = 0; i < records.length; i++) {
 						var supplyRoomData = records[i].data;
@@ -183,8 +182,18 @@
 		}
 		if (timeType == '年月') {
 			yearSearch = ''
+			if(monthSearch == ''){
+				showResult("请选择年月");
+				Ext.getCmp('monthSearch').focus();
+				return;
+			}
 		} else {
 			monthSearch = '';
+			if(yearSearch == ''){
+				showResult("请选择年份");
+				Ext.getCmp('yearSearch').focus();
+				return;
+			}
 		}
 
 		myMask = new Ext.LoadMask(Ext.getBody(), {
@@ -210,6 +219,15 @@
 				if (!result.success || result.data.dataList.length == 0) {
 					document.getElementById('thisIframe').contentWindow.document.getElementById("table").innerHTML = "";
 					document.getElementById('thisIframe').contentWindow.document.getElementById("echartJs").style.display = "none";
+					if(!result.success){
+						if(result.message != ''){
+							showResult(result.message);
+						}else{
+							showResult('查询异常');
+						}
+						myMask.hide();
+						return;
+					}
 				}
 				var dayOfMonthMap = {};
 				var header = [];
@@ -423,9 +441,15 @@
 			minWidth: 70,
 			iconCls: 'icon_set',
 			handler: function () {
-				Ext.getCmp('yearSearch').setValue('');
-				Ext.getCmp('monthSearch').setValue('');
-				Ext.getCmp('querySupplyRoom').setValue('');
+				Ext.getCmp('yearSearch').setValue(new Date());
+				Ext.getCmp('monthSearch').setValue( new Date());
+				Ext.getCmp('timeType').setValue('年月');
+				Ext.getCmp('yearSearch_id').hide();
+				Ext.getCmp('monthSearch_id').show();
+				//最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
+				if (currentOrgUnitIsSupplyRoom) {
+					Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding);
+				}
 			}
 		}]
 	});