Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/draftList.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/draftList.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/draftList.js	(revision 27233)
@@ -0,0 +1,215 @@
+Ext.onReady(function() {
+	var content_width = parseInt(Ext.get("gridDiv").getComputedWidth()) - 80;
+
+	initList();
+
+	function initList() {
+		Ext.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/customizedReports/reportController/getAllReportDefinitions.mhtml',
+			params: {
+				isDraft: 1
+			},
+			success: function(response, options) {
+				var result = response.responseText;
+
+				if(result != "" && result != "{}") {
+					var res = Ext.util.JSON.decode(result);
+					var rows = res.rows || [];
+
+					var arr = [];
+
+					for(var i = 0; i < rows.length; i++) {
+						var itemArr = [];
+						var z = 0;
+
+						for(var key in rows[i]) {
+							itemArr[z] = rows[i][key];
+							z++
+						}
+
+						arr[i] = itemArr;
+					}
+
+					getAllReportDefinitions(arr);
+				} else {
+					getAllReportDefinitions([]);
+				}
+			}
+		});
+	};
+
+	//更新报表
+	function updateReport() {
+		var records = grid.getSelectionModel().getSelections();
+
+		if(records.length == 0) {
+			showResult("请选择要删除的草稿！");
+			return false;
+		}
+
+		if(records.length > 1) {
+			showResult("只能选择一条草稿！");
+			return false;
+		}
+
+		var reportId = records[0].data.reportId;
+
+		var reportIdData = {
+			reportId: reportId
+		}
+
+		sessionStorage.setItem('reportData', JSON.stringify(reportIdData));
+
+		var url = WWWROOT + '/disinfectsystem/customizedreports/reportUpdate.jsp';
+
+		var recyclingWindow = openFullSizeWindowWithName(url,'yes',"recyclingWindow");
+	};
+
+	//删除报表
+	function deleteReport(grid) {
+		var records = grid.getSelectionModel().getSelections();
+
+		if(records.length == 0) {
+			showResult("请选择要删除的草稿！");
+			return false;
+		}
+
+		if(records.length > 1) {
+			showResult("只能选择一条草稿！");
+			return false;
+		}
+
+		var reportId = records[0].data.reportId;
+
+
+		Ext.MessageBox.confirm("请确认", "是否确定要删除选中的草稿？",
+			function(button, text) {
+				if("yes" == button) {
+					Ext.Ajax.request({
+						url: WWWROOT + '/disinfectSystem/customizedReports/reportController/deleteReportDefinition.mhtml',
+						params: {
+							id: reportId
+						},
+						success: function(response, options) {
+							showResult('删除成功');
+
+							reloadList();
+						},
+						failure: function(response, options) {
+							var result = Ext.decode(response.responseText);
+							showResult('删除失败');
+						}
+					});
+				}
+			}
+		);
+	};
+
+	//显示报表
+	function getAllReportDefinitions(rows) {
+		var store = new Ext.data.SimpleStore({
+			data: rows,
+			fields: ["reportId", "reportName", "creatorName", "isDraft", 'createdTime', 'reportDescription', 'folderName', 'folderId']
+		});
+
+		var sm = new Ext.grid.CheckboxSelectionModel();
+
+		var cm = new Ext.grid.ColumnModel([
+			new Ext.grid.RowNumberer(), sm,
+			{
+				header: "报表名称",
+				dataIndex: "reportName",
+				width: content_width * 0.2
+			}, {
+				header: "报表描述",
+				dataIndex: "reportDescription",
+				width: content_width * 0.2
+			}, {
+				header: "文件夹名称",
+				dataIndex: "folderName",
+				width: content_width * 0.2
+			}, {
+				header: "创建人",
+				dataIndex: "creatorName",
+				width: content_width * 0.2
+			}, {
+				header: "创建时间",
+				dataIndex: "createdTime",
+				width: content_width * 0.2
+			}
+		]);
+
+		var tbar = [{
+			text: '编辑草稿',
+			iconCls: 'btn_ext_application_edit',
+			handler: function() {
+				updateReport();
+			}
+		}, '-', {
+			text: '删除草稿',
+			iconCls: 'btn_ext_application_del',
+			handler: function() {
+				deleteReport(grid);
+			}
+		}, '-', {
+			text: '返回',
+			iconCls: 'btn_ext_refresh',
+			handler: function() {
+				window.history.back();
+			}
+		}];
+
+		grid = new Ext.grid.GridPanel({
+			renderTo: "gridDiv",
+			title: "草稿箱定义",
+			tbar: tbar,
+			cm: cm,
+			sm: sm,
+			store: store
+		});
+
+		var viewport = new Ext.Viewport({
+			layout: 'border',
+			items: [{
+				region: 'center',
+				margins: '0 0 0 0',
+				layout: 'fit',
+				items: grid
+			}]
+		});
+	};
+
+	//重新渲染
+	function reloadList(){
+		Ext.Ajax.request({
+			url: WWWROOT + '/disinfectSystem/customizedReports/reportController/getAllReportDefinitions.mhtml',
+			params: {
+				isDraft:1
+			},
+			success: function(response, options) {
+				var result = response.responseText;
+
+				if(result != "" && result != "{}") {
+					var res = Ext.util.JSON.decode(result);
+					var rows = res.rows || [];
+
+					var arr = [];
+
+					for(var i = 0; i < rows.length; i++) {
+						var itemArr = [];
+						var z = 0;
+
+						for(var key in rows[i]) {
+							itemArr[z] = rows[i][key];
+							z++
+						}
+
+						arr[i] = itemArr;
+					}
+
+					grid.store.loadData(arr);
+				}
+			}
+		});
+	}
+});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/draftList.jsp
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/draftList.jsp	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/draftList.jsp	(revision 27233)
@@ -0,0 +1,26 @@
+<%@ page contentType="text/html; charset=UTF-8"%>
+<%@ include file="/common/taglibs.jsp"%>
+
+<%
+    request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
+%>
+<!DOCTYPE>
+<html>
+
+	<head>
+		<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
+		<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+		<title>草稿箱定义</title>
+	</head>
+
+	<body>
+		<%@ include file="/common/includeExtJsAndCss.jsp"%>
+
+		<script type="text/javascript" src="/js/common.js"></script>
+		<script type="text/javascript" src="draftList.js"></script>
+
+		<div id="gridDiv" style="height: 100%;"></div>
+
+	</body>
+
+</html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList.js
===================================================================
diff -u -r27203 -r27233
--- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList.js	(.../reportList.js)	(revision 27203)
+++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList.js	(.../reportList.js)	(revision 27233)
@@ -282,6 +282,12 @@
 			handler: function() {
 				previewReport(grid);
 			}
+		}, '-', {
+			text: '草稿箱',
+			iconCls: 'btn_ext_add_foreignTousse',
+			handler: function() {
+				draftList();
+			}
 		}];
 
 		grid = new Ext.grid.GridPanel({
@@ -304,6 +310,11 @@
 		});
 	};
 
+	//草稿箱
+	function draftList(){
+		window.location.href = '/disinfectsystem/customizedreports/draftList.jsp';
+	};
+
 	//重新渲染
 	function reloadList(){
 		Ext.Ajax.request({