Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp
===================================================================
diff -u -r34326 -r35297
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 34326)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 35297)
@@ -45,7 +45,6 @@
 <link rel="stylesheet" type="text/css" href="${ctx }/ext/ext_datefield/datetime.css?version=${svnRevision}"></link>
 <script type="text/javascript" src="${ctx }/ext/ext_datefield/Datetime.js?version=${svnRevision}"></script>
 
-
 <script type="text/javascript" src="${ctx}/disinfectsystem/useRecord/tabs/tousseInstanceInfoTab.js?version=${svnRevision}"></script>
 <script type="text/javascript" src="idCardInstanceView.js?version=${svnRevision}"></script>
 <title>标识牌信息</title>
@@ -54,6 +53,14 @@
 <script>
     var fontSize = '${fontSize}';
     var userName = '${loginUserData.userFullName}';
+    var ALL = '全部';
+    //当前用户所在的当前科室
+	var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>';
+	//查看所有供应室报表的权限
+	var SSTS_View_All_Supply_Room_Report = true;
+	<operation:authorize ifAnyGranted="SSTS_View_All_Supply_Room_Report">
+		SSTS_View_All_Supply_Room_Report = false;
+	</operation:authorize>
 </script>
 <object id="LODOP" classid="clsid:2105C259-1E0C-4534-8141-A753534CB4CA" width=0 height=0>
     <embed id="LODOP_EM" type="application/x-print-lodop" width=0 height=0></embed>
@@ -67,12 +74,17 @@
 	</tr>
 </table>
 <form name="parametersFrm">
+    <input type="hidden" id="parm_s_handlerDepartCode" name="parm_s_handlerDepartCode">
     <input type="hidden" id="parm_s_tousseName" name="parm_s_tousseName">
+    <input type="hidden" id="parm_s_tousseNameFuzzy" name="parm_s_tousseNameFuzzy">
+    <input type="hidden" id="parm_s_tousseStatus" name="parm_s_tousseStatus">
     <input type="hidden" id="parm_s_status" name="parm_s_status">
+    <input type="hidden" id="parm_s_assetsBelongCode" name="parm_s_assetsBelongCode">
+    <input type="hidden" id="parm_s_tousseGroupID" name="parm_s_tousseGroupID">
     <input type="hidden" id="parm_s_firstRecyclingTimeStart" name="parm_s_firstRecyclingTimeStart">
     <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_lostDateEnd" name="parm_s_lostDateEnd">
 </form>
 </body>
 </html>
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js
===================================================================
diff -u -r34340 -r35297
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 34340)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 35297)
@@ -1,13 +1,41 @@
 var grid;
 
 function queryTable() {
-	$Id('parm_s_tousseName').value = Ext.getCmp('tousseName').getRawValue();
-	$Id('parm_s_status').value = Ext.getCmp('status').getRawValue() == '全部' ? '' : Ext.getCmp('status').getRawValue();
+	var handlerDepartCode = Ext.getCmp('handlerDepartCode').getValue();
+	var queryMode = Ext.getCmp('queryMode').getValue();
+	var tousseName = Ext.getCmp('tousseName').getRawValue();
+	var tousseStatus = Ext.getCmp('tousseStatus').getValue();
+	var IDCardStatus = Ext.getCmp('IDCardStatus').getValue();
+	var assetsBelongCode = Ext.getCmp('assetsBelongCode').getValue();
+	var tousseGroupID = Ext.getCmp('tousseGroupID').getValue();
+	if (queryMode == '精确查询') {
+		$Id('parm_s_tousseName').value = tousseName;
+		$Id('parm_s_tousseNameFuzzy').value = '';
+	} else {
+		$Id('parm_s_tousseName').value = '';
+		$Id('parm_s_tousseNameFuzzy').value = tousseName;
+	}
+	if (handlerDepartCode !== '' && handlerDepartCode.indexOf('全部') >= 0) {
+		$Id('parm_s_handlerDepartCode').value = '';
+	} else {
+		$Id('parm_s_handlerDepartCode').value = handlerDepartCode;
+	}
+	if (tousseStatus !== '' && tousseStatus.indexOf('全部') >= 0) {
+		$Id('parm_s_tousseStatus').value = '';
+	} else {
+		$Id('parm_s_tousseStatus').value = tousseStatus;
+	}
+	if (tousseGroupID !== '' && tousseGroupID.indexOf('-1') >= 0) {
+		$Id('parm_s_tousseGroupID').value = '';
+	} else {
+		$Id('parm_s_tousseGroupID').value = tousseGroupID;
+	}
+	$Id('parm_s_status').value = (IDCardStatus == '全部') ? '' : IDCardStatus;
+	$Id('parm_s_assetsBelongCode').value = assetsBelongCode;
 	$Id('parm_s_firstRecyclingTimeStart').value = Ext.getCmp('firstRecyclingTimeStart').getRawValue();
 	$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();
-	grid.getStore().lastOptions.params['start'] = 0;
 	grid.dwrReload();
 }
 
@@ -39,23 +67,57 @@
 }
 
 Ext.onReady(function () {
+	var supplyRoomStore = getSupplyRoomStore('handlerDepartCode');
+
+	var assetsBelongStore = new Ext.data.Store({
+		proxy: new Ext.data.HttpProxy({
+			url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do?showDisableOrgUnit=false',
+			method: 'POST'
+		}),
+		reader: new Ext.data.JsonReader({
+			root: 'data'
+		}, [
+			{ name: 'id', mapping: 'id' },
+			{ name: 'name', mapping: 'name' },
+			{ name: 'orgUnitName', mapping: 'orgUnitName' }
+		]
+		)
+	});
+
+	//器械包分组combo的store
+	var tousseGroupStore = new Ext.data.JsonStore({
+		url: WWWROOT + '/disinfectSystem/baseData/tousseGroupAction!getAllTousseGroup.do',
+		fields: ['tousseGroupName', 'id'],
+		listeners: {
+			beforeload: function (_this, options) {
+				_this.baseParams.needAll = '是';
+			}
+		}
+	});
+
 	var columns = new Array();
 	columns.push(
 		{ header: "器械包名称", width: 180, dataIndex: 'tousseName' },
-		{ header: "条码", width: 70, dataIndex: 'barcode' },
-		{ header: "状态", width: 80, dataIndex: 'status' },
+		{ header: "标识牌条码", width: 100, dataIndex: 'barcode' },
+		{ header: "器械包状态", width: 100, dataIndex: 'tousseInstanceStatus' },
+		{ header: "标识牌状态", width: 100, dataIndex: 'status' },
 		{ header: "使用次数", width: 80, dataIndex: 'useAmount' },
-		{ header: "最后打印时间", width: 150, dataIndex: 'printDate', renderer: myDateFormatBySecond },
-		{ header: "第一次回收时间", width: 150, dataIndex: 'firstRecyclingTime', renderer: myDateFormatBySecond },
-		{ header: "丢失时间", width: 150, dataIndex: 'lostDate', renderer: myDateFormatBySecond }
+		{ header: "标识牌编号", width: 100, dataIndex: 'idNumber' },
+		{ header: "位置", width: 100, dataIndex: 'locationForDisplay' },
+		{ header: "最后打印时间", width: 170, dataIndex: 'printDate', renderer: myDateFormatBySecond },
+		{ header: "第一次回收时间", width: 170, dataIndex: 'firstRecyclingTime', renderer: myDateFormatBySecond },
+		{ header: "丢失时间", width: 170, dataIndex: 'lostDate', renderer: myDateFormatBySecond }
 	);
 
 	var readerDetail = [
 		{ name: 'id' },
 		{ name: 'tousseName' },
 		{ name: 'barcode' },
+		{ name: 'tousseInstanceStatus' },
 		{ name: 'status' },
 		{ name: 'useAmount' },
+		{ name: 'idNumber' },
+		{ name: 'locationForDisplay' },
 		{ name: 'printDate' },
 		{ name: 'idCardDefinitionID' },
 		{ name: 'firstRecyclingTime' },
@@ -74,6 +136,7 @@
 
 	var tbar = [{
 		text: '打印标识牌',
+		iconCls: 'icon_print',
 		handler: function () {
 			var selectionModel = grid.getSelectionModel();
 			var selections = selectionModel.getSelections();
@@ -110,67 +173,152 @@
 		IdCardInstanceTableManager.getIdCardInstanceTableList,
 		null
 	);
-	var width = parseInt(Ext.getBody().dom.clientWidth / 4);
-	var height = 130;
-	var labelWidth = 100;
+
+	var labelAlign = 100;
 	if (fontSize == 15) {
-		height = 140;
+		labelAlign = 120;
 	}
 
-	var form = new Ext.Panel({
-		title: '标识牌信息列表',
+	var form = new Ext.form.FormPanel({
+		title: '标识牌查询条件',
 		region: 'north',
 		buttonAlign: 'center',
 		collapsible: true,
 		collapseMode: 'mini',
+		split: true,
+		border: 0,
 		frame: true,
-		height: height,
+		bodyStyle: 'padding:0px auto;margin:0px',
+		labelWidth: labelAlign,
+		height: 160,
 		items: [{
 			layout: 'column',
+			height: 50,
+			labelAlign: 'right',
 			items: [{
+				columnWidth: .25,
 				layout: 'form',
-				width: width,
-				labelWidth: labelWidth,
-				labelAlign: 'right',
 				items: [{
+					xtype: 'multiSelect',
+					fieldLabel: '选择供应室',
+					id: 'handlerDepartCode',
+					name: 'handlerDepartCode',
+					valueField: 'departCode',
+					displayField: 'name',
+					minChars: 0,
+					listWidth: 260,
+					allowBlank: true,
+					editable: false,
+					store: supplyRoomStore,
+					forceSelection: false,
+					mode: 'local',
+					triggerAction: 'all',
+					lazyInit: true,
+					typeAhead: false,
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
+				items: [{
 					xtype: 'combo',
 					id: 'tousseName',
 					name: 'tousseName',
 					fieldLabel: '器械包名称',
 					queryParam: 'spell',
 					minChars: 0,
-					valueField: 'id',
-					displayField: 'name',
+					valueField: 'name',
+					displayField: 'displayName',
+					listWidth: 300,
 					store: new Ext.data.Store({
 						proxy: new Ext.data.HttpProxy({
-							url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseByTypeArr.do',
+							url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getAllTousseDefinitionData.do',
 							method: 'POST'
 						}),
 						reader: new Ext.data.JsonReader({
 							totalProperty: 'totalCount',
 							root: 'data'
 						}, [
 							{ name: 'id', mapping: 'id' },
-							{ name: 'name', mapping: 'name' }]
+							{ name: 'spelling', mapping: 'spelling' },
+							{ name: 'name', mapping: 'name' },
+							{ name: 'displayName', mapping: 'displayName' },
+							{ name: 'amount', mapping: 'amount' }]
 						)
 					}),
-					forceSelection: true,
+					forceSelection: false,
 					lazyInit: true,
 					triggerAction: 'all',
 					hideTrigger: true,
 					typeAhead: false,
 					anchor: '95%'
 				}]
 			}, {
+				columnWidth: .25,
 				layout: 'form',
-				width: width,
-				labelWidth: labelWidth,
-				labelAlign: 'right',
 				items: [{
 					xtype: 'combo',
+					id: 'queryMode',
+					name: 'queryMode',
+					valueField: 'queryMode',
+					displayField: 'queryMode',
+					fieldLabel: '器械包查询模式',
+					mode: 'local',
+					readOnly: true,
+					value: '模糊查询',
+					triggerAction: 'all',
+					forceSelection: true,
+					store: new Ext.data.SimpleStore({
+						fields: ['queryMode'],
+						data: [['精确查询'], ['模糊查询']]//精确查询
+					}),
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
+				items: [{
+					xtype: 'multiSelect',
+					triggerAction: 'all',
+					fieldLabel: '器械包状态',
+					id: 'tousseStatus',
+					name: 'tousseStatus',
+					valueField: 'tousseStatus',
+					displayField: 'tousseStatus',
+					store: new Ext.data.SimpleStore({
+						fields: ['tousseStatus'],
+						data: [['全部'],
+						['已装配'],
+						['已审核'],
+						['已灭菌'],
+						['已发货'],
+						['已签收'],
+						['待发货'],
+						['已使用'],
+						['灭菌中'],
+						['已消毒'],
+						['已退货'],
+						['预回收'],
+						['已回收'],
+						['已废弃'],
+						['待召回'],
+						['已召回'],
+						['灭菌待确认']]
+					}),
+					mode: 'local',
+					forceSelection: false,
+					allowBlank: true,
+					editable: false,
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
+				items: [{
+					xtype: 'combo',
 					fieldLabel: "标识牌状态",
-					name: "status",
-					id: "status",
+					name: "IDCardStatus",
+					id: "IDCardStatus",
 					valueField: 'value',
 					displayField: 'value',
 					allowBlank: false,
@@ -181,16 +329,55 @@
 					}),
 					value: '全部',
 					forceSelection: true,
+					triggerAction: 'all',
 					mode: 'local',
-					anchor: '95%',
-					triggerAction: 'all'
+					anchor: '95%'
 				}]
 			}, {
+				columnWidth: .25,
 				layout: 'form',
-				width: width,
-				labelWidth: fontSize == 12 ? labelWidth : 120,
-				labelAlign: 'right',
 				items: [{
+					xtype: 'combo',
+					fieldLabel: '资产归属',
+					id: 'assetsBelongCode',
+					name: 'assetsBelongCode',
+					store: assetsBelongStore,
+					queryParam: 'spell',
+					minChars: 0,
+					valueField: 'id',
+					displayField: 'name',
+					forceSelection: true,
+					lazyInit: true,
+					triggerAction: 'all',
+					typeAhead: false,
+					allowBlank: true,
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
+				items: [{
+					xtype: 'multiSelect',
+					id: 'tousseGroupID',
+					name: 'tousseGroupID',
+					valueField: 'id',
+					displayField: 'tousseGroupName',
+					allowBlank: true,
+					editable: false,
+					fieldLabel: '器械包分组',
+					triggerAction: 'all',
+					store: tousseGroupStore,
+					anchor: '95%'
+				}]
+			}]
+		}, {
+			layout: 'column',
+			height: 50,
+			labelAlign: 'right',
+			items: [{
+				columnWidth: .25,
+				layout: 'form',
+				items: [{
 					xtype: 'datefieldWithMin',
 					fieldLabel: '第一次回收时间',
 					id: 'firstRecyclingTimeStart',
@@ -202,8 +389,8 @@
 					anchor: '95%'
 				}]
 			}, {
+				columnWidth: .25,
 				layout: 'form',
-				width: fontSize == 12 ? (width - 60) : (width - 90),
 				labelWidth: 30,
 				labelAlign: 'left',
 				items: [{
@@ -218,14 +405,9 @@
 					allowBlank: false,
 					anchor: '95%'
 				}]
-			}]
-		}, {
-			layout: 'column',
-			items: [{
+			}, {
+				columnWidth: .25,
 				layout: 'form',
-				width: width,
-				labelWidth: labelWidth,
-				labelAlign: 'right',
 				items: [{
 					xtype: 'datefieldWithMin',
 					fieldLabel: '丢失时间',
@@ -238,8 +420,8 @@
 					anchor: '95%'
 				}]
 			}, {
+				columnWidth: .25,
 				layout: 'form',
-				width: width - 60,
 				labelWidth: 30,
 				labelAlign: 'left',
 				items: [{
@@ -258,18 +440,20 @@
 		}],
 		buttons: [{
 			text: '查询',
-			minWidth: 50,
 			iconCls: 'icon_search',
 			handler: function () {
 				queryTable();
 			}
 		}, {
 			text: '重置',
-			minWidth: 50,
 			iconCls: 'icon_set',
 			handler: function () {
 				$Id('tousseName').value = "";
-				$Id('status').value = "全部";
+				$Id('queryMode').value = "模糊查询";
+				$Id('tousseStatus').value = "";
+				$Id('IDCardStatus').value = "";
+				$Id('assetsBelongCode').value = "";
+				$Id('tousseGroupID').value = "";
 				$Id('firstRecyclingTimeStart').value = "";
 				$Id('firstRecyclingTimeEnd').value = "";
 				$Id('lostDateStart').value = "";