Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp =================================================================== diff -u -r14419 -r14486 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 14419) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp (.../packingView.jsp) (revision 14486) @@ -72,7 +72,14 @@ var hospitalName = '<%=request.getAttribute("hospitalName")%>'; var foreignDefaultLabelpaper = '<%=request.getAttribute("foreignDefaultLabelpaper")%>'; var parm_s_type ="质量监测"; +//回收记录 var taskType_recyclingRecord = '<%=PackingTask.TASK_RECYCLINGRECORD%>'; +//申请单 +var taskType_application = '<%=PackingTask.TASK_APPLICATION%>'; +//退货重装 +var taskType_returnGoods = '<%=PackingTask.TASK_RETURNGOODS%>'; +//质量监测重新装配 +var taskType_qualityMonitor = '<%=PackingTask.TASK_QUALITY_MONITOR%>'; //扫描篮筐允许的篮筐状态集合 var basketAllowProcedure = '<%=Container.CONTAINER_STATUS_FREE%>;<%=Container.CONTAINER_STATUS_WASHLOADING%>;<%=Container.CONTAINER_STATUS_WASHED%>;<%=Container.CONTAINER_STATUS_PACKED%>'; Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r14474 -r14486 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14474) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 14486) @@ -659,7 +659,8 @@ renderer: function(v,p,record,rowIndex, columnIndex, store,view){ var tousseName = record.get('tousseName'); var showName = tousseName; - if(record.get('taskType') != taskType_recyclingRecord){ + if(record.get('taskType') == taskType_application || record.get('taskType') == taskType_returnGoods + || record.get('taskType') == taskType_qualityMonitor){ showName = '' + showName; } if(record.get('replenishMaterils')){