Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js
===================================================================
diff -u -r24239 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js	(.../rinserView.js)	(revision 24239)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.js	(.../rinserView.js)	(revision 31471)
@@ -74,42 +74,74 @@
 	}
 }
 
+//重新排序
+function setGridSequence(){
+	var orderList = [];
+	grid.getStore().each(function(record,index){
+		var id = record.data.id;
+		orderList[index] = id + '@' + index;
+	});	
+	Ext.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/baseData/rinserAction!orderRinserList.do',
+		params : {
+			orderList : orderList.join(';')
+		},
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			var success = result.success;
+			if (success) {
+				showResult('列表已重新排序');
+				grid.dwrReload();
+			}
+		}
+	});
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
 
 	var columns = [
 	    {header : "名称",width : 120,dataIndex : 'name', renderer : modifyRecord},
 	    {header : "条码",width : 110,dataIndex : 'barcode'}, 
-	    {header : "所属科室",width : 110,dataIndex : 'department'}, 
+		{header : "所属科室",width : 110,dataIndex : 'department'}, 
+		{header : "使用状态",width : 120,dataIndex : 'useStatus'}, 
 	    {header : "联系人",width : 120,dataIndex : 'contact'}, 
 	    {header : "时间重叠",width : 120,dataIndex : 'conCurrent'}, 
 	    {header : "供应商",width : 120,dataIndex : 'supplier',sortable : false, renderer : dealNullObject},
 	    {header : "电话",width : 100,dataIndex : 'phone'},
 	    {header : "购买日期",width : 80,dataIndex : 'purchaseDate',sortable : false,renderer:myDateFormat}, 
 	    {header : "成本",width : 60,dataIndex : 'cost'},
-	    {id : 'cleaningMethod',header : "单价",width : 120,dataIndex : 'price'}
+		{id : 'cleaningMethod',header : "单价",width : 120,dataIndex : 'price'},
+		{
+			header : "序号",
+			width : 80,
+			dataIndex : 'sequence'
+		}
 	];
 		
 	var readerDetail = [
 	    {name : 'id'},
 	    {name : 'name'},
 	    {name : 'barcode'},
-	    {name : 'department'},
+		{name : 'department'},
+		{name : 'useStatus'},
 	    {name : 'contact'},
 	    {name : 'conCurrent'},
 	    {name : 'supplier'},
 	    {name : 'phone'},
 	    {name : 'purchaseDate'},
 	    {name : 'cost'},
-	    {name : 'price'}
+		{name : 'price'},
+		{name : 'sequence'}
 	];
 		
 	var filters = new Ext.grid.GridFilters({
 		filters:[
 			{type: 'string',  dataIndex: 'name'},
 			{type: 'string',  dataIndex: 'barcode'},
 			{type: 'string',  dataIndex: 'department'},
+			{type: 'string',  dataIndex: 'useStatus'},
 			{type: 'string',  dataIndex: 'contact'},
 			{type: 'string',  dataIndex: 'conCurrent'},
 			{type: 'string',  dataIndex: 'supplier.companyName'},
@@ -176,11 +208,13 @@
 		tbar : tbar,
 		pageSize : 20,
 		title : entityName+'列表',
-		defaultSortField : 'id',
+		defaultSortField : 'sequence',
 		defaultSortDirection : 'ASC',
 		isCheckboxSelectionModel : true,
 		isShowSearchField : false,//取消搜索框
 		rememberSelected :false,//取消清除已选
+		enableDragDrop:true,//激活行拖动
+		ddGroup: 'gridDD',
 		columns : columns,
 		plugins : filters,
 		autoExpandColumn : 'cleaningMethod',
@@ -200,6 +234,49 @@
 			items : grid
 		}]
 	});
+
+	//GGSRMYY-133：拖动排序
+	new Ext.dd.DropTarget(grid.getEl(), {
+		ddGroup: 'gridDD',
+		copy    : false,
+		notifyDrop: function (dd, e, data) {
+			//选择行
+			var rows = grid.getSelectionModel().getSelections();
+			//选择行数
+			var count = rows.length;
+			//拖动到几行
+			var dropIndex = dd.getDragData(e).rowIndex;
+			var array=[];
+			if(dropIndex == undefined){
+				return;
+			}
+			if(data.rowIndex < dropIndex){
+				for(var i=0;i<count;i++){
+					grid.getStore().remove(grid.getStore().getById(data.selections[i].id));
+					grid.getStore().insert(dropIndex,data.selections[i]);
+					var index = dropIndex-i;
+					array.unshift(index);
+				}
+			}else {
+				for(var i=0;i<count;i++){
+					grid.getStore().remove(grid.getStore().getById(data.selections[i].id));
+					grid.getStore().insert(dropIndex,data.selections[i]);
+					var index = dropIndex+i;
+					array.push(index);
+				}
+			}
+			grid.getSelectionModel().selectRows(array); 
+			grid.getView().refresh(); 
+			setGridSequence();
+		},
+		notifyEnter:function(dd, e, data){
+			//选择行
+			var rows = grid.getSelectionModel().getSelections();
+			//选择行数
+			var count = rows.length;
+			data.ddel.innerText = count+' 行被选中';
+		}
+	})
 });
 
 function print_rinser(barcode,name,unitName,printType) {
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js
===================================================================
diff -u -r30786 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 30786)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserForm.js	(.../rinserForm.js)	(revision 31471)
@@ -80,6 +80,11 @@
 		fields : [ 'value'],
 		data : [['是'],['否']]
 	});
+
+	var useStatusStore = new Ext.data.SimpleStore( {
+		fields : [ 'value'],
+		data : [['未启用'],['在用'],['停用'],['报废']]
+	});
 	
 	var testItemStore = new Ext.data.SimpleStore({
 		fields : [
@@ -500,7 +505,21 @@
 						id : "promptUploadDevParamPic",
 						anchor : '95%'
 					}]
-				}]
+				},{
+					xtype : 'combo',
+					fieldLabel : '使用状态',
+					name : 'useStatus',
+					id : 'useStatus',
+					valueField : 'value',
+					displayField : 'value',
+					forceSelection : true,
+					editable : false,
+					store : useStatusStore,
+					value:'在用',
+					mode : 'local',
+				   	triggerAction : 'all',
+					anchor : '95%'
+			   	}]
 			}, {
 				columnWidth : 0.5,
 				layout : 'form',
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp
===================================================================
diff -u -r29513 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp	(.../rinserView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/rinser/rinserView.jsp	(.../rinserView.jsp)	(revision 31471)
@@ -71,8 +71,12 @@
 </c:if>
 </script>
 
+<style>
+	.x-grid3-body .x-grid3-row  {
+		cursor: move;
+	}
+</style>
 
-
 <table height="100%;" width="100%" border="0" align="center"
 	cellpadding="0" cellspacing="0">
 	<tr height="100%;">
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp
===================================================================
diff -u -r29513 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp	(.../sterilizerView.jsp)	(revision 29513)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.jsp	(.../sterilizerView.jsp)	(revision 31471)
@@ -98,8 +98,12 @@
 </c:if>
 </script>
 
+<style>
+	.x-grid3-body .x-grid3-row  {
+		cursor: move;
+	}
+</style>
 
-
 <table height="100%;" width="100%" border="0" align="center"
 	cellpadding="0" cellspacing="0">
 	<tr height="100%;">
Index: ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js
===================================================================
diff -u -r31420 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 31420)
+++ ssts-web/src/main/webapp/disinfectsystem/washanddisinfectmanager/washanddisinfectrecord/washAndDisinfectView.js	(.../washAndDisinfectView.js)	(revision 31471)
@@ -280,7 +280,7 @@
 	rinserStore = new Ext.data.SimpleStore({
 		fields : ['rinserName','conCurrent', 'rinserBarcode', 'cleanMethodDataList'],
 		autoLoad : true,
-		url : WWWROOT+ '/disinfectSystem/baseData/rinserAction!getAllRinserListData.do'
+		url : WWWROOT+ '/disinfectSystem/baseData/rinserAction!getAllRinserListData.do?useStatus=' + encodeURI('在用')
 	});
 
 	// 清洗程序
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js
===================================================================
diff -u -r31100 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 31100)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerForm.js	(.../sterilizerForm.js)	(revision 31471)
@@ -954,6 +954,30 @@
 											id : "promptUploadDevParamPic",
 											anchor : '95%'
 										}]
+									},{
+										layout:'form',
+										labelWidth : 100,
+										columnWidth: 0.5,
+										height:38,
+										items:[{
+											columnWidth : 0.5,
+											xtype : 'combo',
+											fieldLabel : '使用状态',
+											name : 'useStatus',
+											id : 'useStatus',
+											valueField : 'value',
+											displayField : 'value',
+											forceSelection : true,
+											editable : false,
+											store : new Ext.data.SimpleStore({
+												fields : ['value'],
+												data : [['未启用'],['在用'],['停用'],['报废']]
+											}),
+											value:'在用',
+											mode : 'local',
+											triggerAction : 'all',
+											anchor : '95%'
+										}]
 									}]
 							}, {
 								columnWidth : 0.4,
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js
===================================================================
diff -u -r24239 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js	(.../sterilizerView.js)	(revision 24239)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/sterilizer/sterilizerView.js	(.../sterilizerView.js)	(revision 31471)
@@ -78,6 +78,29 @@
 	}
 }
 
+//重新排序
+function setGridSequence(){
+	var orderList = [];
+	grid.getStore().each(function(record,index){
+		var id = record.data.id;
+		orderList[index] = id + '@' + index;
+	});	
+	Ext.Ajax.request({
+		url : WWWROOT + '/disinfectSystem/baseData/sterilizerAction!orderSterilizerList.do',
+		params : {
+			orderList : orderList.join(';')
+		},
+		success : function(response, options) {
+			var result = Ext.decode(response.responseText);
+			var success = result.success;
+			if (success) {
+				showResult('列表已重新排序');
+				grid.dwrReload();
+			}
+		}
+	});
+}
+
 Ext.onReady(function() {
 	Ext.QuickTips.init();
 	// 记录cookie（3步）
@@ -100,6 +123,10 @@
 			width : 120,
 			dataIndex : 'isEveryDayReset'
 		},{
+			header : "使用状态",
+			width : 80,
+			dataIndex : 'useStatus'
+		},{
 			header : "联系人",
 			width : 80,
 			dataIndex : 'contact'
@@ -156,6 +183,7 @@
 			{type:'string',dataIndex:'phone'},
 			{type:'date',dataIndex:'purchaseDate'},
 			{type:'string',dataIndex:'email'},
+			{type:'string',dataIndex:'useStatus'},
 			{type:'string',dataIndex:'rapidFurnace'},
 			{type:'string',dataIndex:'isEveryDayReset'},
 			{type:'numeric',dataIndex:'price'},
@@ -194,6 +222,8 @@
 			name : 'sequence'
 		},{
 			name : 'ownGroup'
+		},{
+			name : 'useStatus'
 		}];
 
 		var sign = true;
@@ -254,9 +284,11 @@
 		grid = new Ext.ux.ForgonPageGrid( {
 			tbar : tbar,
 			pageSize : 20,
-			defaultSortField : 'id',
+			defaultSortField : 'sequence',
 			defaultSortDirection : 'ASC',
 			title : '灭菌炉列表',
+			enableDragDrop:true,//激活行拖动
+			ddGroup: 'gridDD',
 			isCheckboxSelectionModel : true,
 			isShowSearchField : false,//取消搜索框
 			rememberSelected :false,//取消清除已选
@@ -279,6 +311,49 @@
 			} ]
 		});
 
+		//GGSRMYY-133：拖动排序
+		new Ext.dd.DropTarget(grid.getEl(), {
+			ddGroup: 'gridDD',
+			copy    : false,
+			notifyDrop: function (dd, e, data) {
+				//选择行
+				var rows = grid.getSelectionModel().getSelections();
+				//选择行数
+				var count = rows.length;
+				//拖动到几行
+				var dropIndex = dd.getDragData(e).rowIndex;
+				var array=[];
+				if(dropIndex == undefined){
+					return;
+				}
+				if(data.rowIndex < dropIndex){
+					for(var i=0;i<count;i++){
+						grid.getStore().remove(grid.getStore().getById(data.selections[i].id));
+						grid.getStore().insert(dropIndex,data.selections[i]);
+						var index = dropIndex-i;
+						array.unshift(index);
+					}
+				}else {
+					for(var i=0;i<count;i++){
+						grid.getStore().remove(grid.getStore().getById(data.selections[i].id));
+						grid.getStore().insert(dropIndex,data.selections[i]);
+						var index = dropIndex+i;
+						array.push(index);
+					}
+				}
+				grid.getSelectionModel().selectRows(array); 
+				grid.getView().refresh(); 
+				setGridSequence();
+			},
+			notifyEnter:function(dd, e, data){
+				//选择行
+				var rows = grid.getSelectionModel().getSelections();
+				//选择行数
+				var count = rows.length;
+				data.ddel.innerText = count+' 行被选中';
+			}
+		})
+
 	});
 function print_sterilizer(barcode,name,unitName,printType) {
 	var obj = {
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js
===================================================================
diff -u -r31458 -r31471
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 31458)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/sterilizationRecordForm.js	(.../sterilizationRecordForm.js)	(revision 31471)
@@ -3171,7 +3171,7 @@
                             displayField: 'sterilizerName',
                             store: new Ext.data.SimpleStore({
                                 fields: ['sterilizerName', 'monitorTousseDisplay'],
-                                url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?ownGroup=' + encodeURI(ownGroup)
+                                url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do?ownGroup=' + encodeURI(ownGroup) + '&useStatus=' + encodeURI('在用')
                             }),
                             triggerAction: 'all',
                             mode: 'remote',