Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js
===================================================================
diff -u -r36430 -r37471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 36430)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.js	(.../idCardInstanceView.js)	(revision 37471)
@@ -41,6 +41,8 @@
 	$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_lastInvoiceDateStart').value = Ext.getCmp('lastInvoiceDateStart').getRawValue();
+	$Id('parm_s_lastInvoiceDateEnd').value = Ext.getCmp('lastInvoiceDateEnd').getRawValue();
 	$Id('parm_s_instrumentSetTypeIds').value = Ext.getCmp('instrumentSetTypeIds').getValue();
 	$Id('parm_s_isDisable').value = isDisable;
 	grid.dwrReload();
@@ -157,6 +159,7 @@
 		{ header: "使用次数", width: 80, dataIndex: 'useAmount' },
 		{ header: "标识牌编号", width: 100, dataIndex: 'idNumber' },
 		{ header: "位置", width: 100, dataIndex: 'locationForDisplay' },
+		{ header: "最后发货时间", width: 170, dataIndex: 'lastInvoiceTime', renderer: myDateFormatBySecond },
 		{ header: "最后打印时间", width: 170, dataIndex: 'printDate', renderer: myDateFormatBySecond },
 		{ header: "第一次回收时间", width: 170, dataIndex: 'firstRecyclingTime', renderer: myDateFormatBySecond },
 		{ header: "丢失时间", width: 170, dataIndex: 'lostDate', renderer: myDateFormatBySecond }
@@ -174,6 +177,7 @@
 		{ name: 'printDate' },
 		{ name: 'idCardDefinitionID' },
 		{ name: 'firstRecyclingTime' },
+		{ name: 'lastInvoiceTime' },
 		{ name: 'lostDate' }
 	];
 
@@ -340,6 +344,8 @@
 					store: new Ext.data.SimpleStore({
 						fields: ['tousseStatus'],
 						data: [['全部'],
+						['清洗中'],
+						['已清洗'],
 						['已装配'],
 						['已审核'],
 						['已灭菌'],
@@ -504,6 +510,35 @@
 			}, {
 				columnWidth: .25,
 				layout: 'form',
+				items: [{
+					xtype: 'datefieldWithMin',
+					fieldLabel: '最后发货时间',
+					id: 'lastInvoiceDateStart',
+					name: 'lastInvoiceDateStart',
+					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',
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
+				labelWidth: 30,
+				labelAlign: 'left',
+				items: [{
+					xtype: 'datefieldWithMin',
+					fieldLabel: '至',
+					labelSeparator: '',
+					id: 'lastInvoiceDateEnd',
+					name: 'lastInvoiceDateEnd',
+					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',
+					anchor: '95%'
+				}]
+			}, {
+				columnWidth: .25,
+				layout: 'form',
 				hidden:!sstsConfig.enableInstrumentSetTypeSetting,
 				items: [{
 					xtype:'hidden',
@@ -558,6 +593,8 @@
 				$Id('firstRecyclingTimeEnd').value = "";
 				$Id('lostDateStart').value = "";
 				$Id('lostDateEnd').value = "";
+				$Id('lastInvoiceDateStart').value = "";
+				$Id('lastInvoiceDateEnd').value = "";
 				Ext.getCmp('assetsBelongCode').setValue('');
 				Ext.getCmp('IDCardStatus').setValue('全部');
 			}
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp
===================================================================
diff -u -r36430 -r37471
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 36430)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardInstanceView.jsp	(.../idCardInstanceView.jsp)	(revision 37471)
@@ -97,6 +97,8 @@
     <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_lastInvoiceDateStart" name="parm_s_lastInvoiceDateStart">
+    <input type="hidden" id="parm_s_lastInvoiceDateEnd" name="parm_s_lastInvoiceDateEnd">
     <input type="hidden" id="parm_s_isDisable" name="parm_s_isDisable">
     <input type="hidden" id="parm_s_instrumentSetTypeIds" name="parm_s_instrumentSetTypeIds">
 </form>