Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js =================================================================== diff -u -r18213 -r18404 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 18213) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.js (.../tousseInstanceView.js) (revision 18404) @@ -108,9 +108,12 @@ var useRecord_id = tousseInstance.useRecord_id; var signedUser = tousseInstance.signedUser; var invoice_id = tousseInstance.invoice_id; + var tousseTransitionItemId = tousseInstance.tousseTransitionItemId; if (statusRecycled == v) { - if (useRecord_id) { + if(tousseTransitionItemId){ + return statusPrerecycled; + }else if (useRecord_id) { return statusUsed; } else if (signedUser) { return statusSigned; @@ -212,6 +215,7 @@ {name : 'recyclingStatus'}, {name : 'useRecord_id'}, {name : 'invoice_id'}, + {name : 'tousseTransitionItemId'}, {name : 'stockBarcode'}, {name : 'sterilingType'}, {name : 'validUntil'}, @@ -250,7 +254,7 @@ {type : 'string',dataIndex : 'tousseDefinition.taskGroup'}, {type : 'string',dataIndex : 'operator'}, {type : 'date',dataIndex : 'operationTime'}, - {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true}, //增加一个已消毒的过滤条件(陈家儒改) + {type : 'list',dataIndex : 'status',options : [statusPacked, statusReviewed, statusSterileding,statusSteriled, statusShipped,statusSigned, statusUsed,statusPrerecycled, statusDiscard, statusDisinfected,statusDelayConfirm],phpMode : true}, //增加一个已消毒的过滤条件(陈家儒改) {type : 'string',dataIndex : 'stockBarcode'}, {type : 'string',dataIndex : 'sterilingType'}, {type : 'date',dataIndex : 'validUntil'}, Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp =================================================================== diff -u -r18119 -r18404 --- ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 18119) +++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/tousseinstancemanager/tousseInstanceView.jsp (.../tousseInstanceView.jsp) (revision 18404) @@ -45,6 +45,7 @@ var statusDelayConfirm = '<%=TousseInstance.STATUS_DELAY_CONFIRM%>'; var statusDisinfected = '<%=TousseInstance.STATUS_DISINFECTED%>'; var statusRecycled = '<%=TousseInstance.STATUS_RECYCLED%>'; + var statusPrerecycled = '<%=TousseInstance.STATUS_PRERECYCLED%>'; statusArr.push([statusPacked]); statusArr.push([statusReviewed]);