Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp
===================================================================
diff -u -r35297 -r35304
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 35297)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 35304)
@@ -85,6 +85,7 @@
     <input type="hidden" id="parm_s_firstRecyclingTimeEnd" name="parm_s_firstRecyclingTimeEnd">
     <input type="hidden" id="parm_s_lostDateStart" name="parm_s_lostDateStart">
     <input type="hidden" id="parm_s_lostDateEnd" name="parm_s_lostDateEnd">
+    <input type="hidden" id="parm_s_isDisable" name="parm_s_isDisable">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js
===================================================================
diff -u -r35297 -r35304
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 35297)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 35304)
@@ -8,6 +8,7 @@
 	var IDCardStatus = Ext.getCmp('IDCardStatus').getValue();
 	var assetsBelongCode = Ext.getCmp('assetsBelongCode').getValue();
 	var tousseGroupID = Ext.getCmp('tousseGroupID').getValue();
+	var isDisable = Ext.getCmp('isDisable').getValue();
 	if (queryMode == '精确查询') {
 		$Id('parm_s_tousseName').value = tousseName;
 		$Id('parm_s_tousseNameFuzzy').value = '';
@@ -36,6 +37,7 @@
 	$Id('parm_s_firstRecyclingTimeEnd').value = Ext.getCmp('firstRecyclingTimeEnd').getRawValue();
 	$Id('parm_s_lostDateStart').value = Ext.getCmp('lostDateStart').getRawValue();
 	$Id('parm_s_lostDateEnd').value = Ext.getCmp('lostDateEnd').getRawValue();
+	$Id('parm_s_isDisable').value = Ext.getCmp('isDisable').getRawValue();
 	grid.dwrReload();
 }
 
@@ -207,7 +209,6 @@
 					displayField: 'name',
 					minChars: 0,
 					listWidth: 260,
-					allowBlank: true,
 					editable: false,
 					store: supplyRoomStore,
 					forceSelection: false,
@@ -307,7 +308,6 @@
 					}),
 					mode: 'local',
 					forceSelection: false,
-					allowBlank: true,
 					editable: false,
 					anchor: '95%'
 				}]
@@ -321,7 +321,6 @@
 					id: "IDCardStatus",
 					valueField: 'value',
 					displayField: 'value',
-					allowBlank: false,
 					editable: false,
 					store: new Ext.data.SimpleStore({
 						fields: ['value'],
@@ -350,7 +349,6 @@
 					lazyInit: true,
 					triggerAction: 'all',
 					typeAhead: false,
-					allowBlank: true,
 					anchor: '95%'
 				}]
 			}, {
@@ -362,13 +360,33 @@
 					name: 'tousseGroupID',
 					valueField: 'id',
 					displayField: 'tousseGroupName',
-					allowBlank: true,
 					editable: false,
 					fieldLabel: '器械包分组',
 					triggerAction: 'all',
 					store: tousseGroupStore,
 					anchor: '95%'
 				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
+				items: [{
+					xtype: 'combo',
+					id: 'isDisable',
+					name: 'isDisable',
+					valueField: 'value',
+					displayField: 'value',
+					fieldLabel: '是否查询停用器械包',
+					mode: 'local',
+					readOnly: true,
+					value: '否',
+					triggerAction: 'all',
+					forceSelection: true,
+					store: new Ext.data.SimpleStore({
+						fields: ['value'],
+						data: [['是'], ['否']]
+					}),
+					anchor: '95%'
+				}]
 			}]
 		}, {
 			layout: 'column',
@@ -385,7 +403,6 @@
 					editable: false,
 					format: 'Y-m-d H:i',
 					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',
-					allowBlank: false,
 					anchor: '95%'
 				}]
 			}, {
@@ -402,7 +419,6 @@
 					editable: false,
 					format: 'Y-m-d H:i',
 					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',
-					allowBlank: false,
 					anchor: '95%'
 				}]
 			}, {
@@ -416,7 +432,6 @@
 					editable: false,
 					format: 'Y-m-d H:i',
 					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',
-					allowBlank: false,
 					anchor: '95%'
 				}]
 			}, {
@@ -433,7 +448,6 @@
 					editable: false,
 					format: 'Y-m-d H:i',
 					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',
-					allowBlank: false,
 					anchor: '95%'
 				}]
 			}]
@@ -451,9 +465,10 @@
 				$Id('tousseName').value = "";
 				$Id('queryMode').value = "模糊查询";
 				$Id('tousseStatus').value = "";
-				$Id('IDCardStatus').value = "";
+				$Id('IDCardStatus').value = "全部";
 				$Id('assetsBelongCode').value = "";
 				$Id('tousseGroupID').value = "";
+				$Id('isDisable').value = "否";
 				$Id('firstRecyclingTimeStart').value = "";
 				$Id('firstRecyclingTimeEnd').value = "";
 				$Id('lostDateStart').value = "";