Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r27484 -r27527 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27484) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 27527) @@ -904,17 +904,17 @@ header: '操作', width : 120, align:'center', - sortable: true, + sortable: true, renderer: function(v,p,record,rowIndex, columnIndex, store){ - var str = '
'; + var str = ''; if(record.get('leaf')){ var taskid = record.get('taskId'); var tousseName = record.get('tousseName'); var tousseID = record.get('tousseID'); var status = record.get('status'); if(!SSTS_PackingTask_Delete){ if(taskid != undefined && taskid != null){ - str += ""; + str += ""; } } if(status == '待装配'){ @@ -948,7 +948,6 @@ } } } - str += '
'; return str; } },{ @@ -2361,28 +2360,37 @@ deletePackingTask(ids); } },"-",{ - text : '添加报损器械', + text : '报损器械', hidden : SSTS_QualityRecord_Create, iconCls : 'btn_ext_application_add', handler : function() { addAndEditRecyclingDamageRecord('', LINKTYPE_PACKINGRECORD); } },"-",{ - text : '添加丢失器械', + text : '丢失器械', //hidden : SSTS_QualityRecord_Create, iconCls : 'btn_ext_application_add', handler : function() { addAndEditRecyclingLostRecord('', LINKTYPE_PACKINGRECORD_ERROR); } },"-",{ - text : '添加质量监测', + text : '质量监测', hidden:SSTS_QualityRecord_Create, iconCls : 'btn_ext_application_add', handler : function() { materialCountRecords = Ext4.getCmp("materialGrid").getSelectionModel().getSelection(); otherPartAddQM = true; addQualityMonitoringByResponPart("清洗消毒"); } +},"-",{ + text : '定期监测', + hidden:SSTS_RoutineMonitoring_Create, + iconCls : 'btn_ext_application_add', + handler : function() { + otherPartAddRM = true; + addRoutineMonitoringByResponPart("清洗消毒",routineMonitoring_type); + //addQualityMonitoringWash(); + } }/* ,"-",{ text : '打印回收清单', hidden:SSTS_RecyclingDetail_Print,