Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r29750 -r29977 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 29750) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 29977) @@ -54,6 +54,8 @@ var statusDisinfected = '<%=TousseInstance.STATUS_DISINFECTED%>'; var statusRecycled = '<%=TousseInstance.STATUS_RECYCLED%>'; var statusPrerecycled = '<%=TousseInstance.STATUS_PRERECYCLED%>'; + var statusWaitForRecall = '<%=TousseInstance.STATUS_WAIT_FOR_RECALL%>'; + var statusRecalled = '<%=TousseInstance.STATUS_RECALLED%>'; var PRINT_TEMPLATE_NAME_PREFIX = '${TEMPLATE_NAME_PREFIX}'; Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r28868 -r29977 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 28868) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 29977) @@ -592,7 +592,7 @@ {type : 'string',dataIndex : 'taskGroup'}, {type : 'string',dataIndex : 'operator'}, {type : 'date',dataIndex : 'operationTime'}, - {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed,statusPrerecycled, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true}, //增加一个已消毒的过滤条件(陈家儒改) + {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed,statusPrerecycled,statusWaitForRecall,statusRecalled, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true}, {type : 'string',dataIndex : 'sterilingType'}, {type : 'numeric',dataIndex : 'useAmount'}, // {type : 'string',dataIndex : 'idNumber'},