Index: ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js
===================================================================
diff -u -r29097 -r30665
--- ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 29097)
+++ ssts-web/src/main/webapp/disinfectsystem/useRecord/useRecordView.js (.../useRecordView.js) (revision 30665)
@@ -602,6 +602,10 @@
url : WWWROOT+ '/disinfectSystem/useRecordAction!showApplicationAndRecyclingItems.do',
params : {useRecordId : useRecordId},
success : function(response, options) {
+ if(response.responseText == ''){
+ showResult('无回收信息');
+ return;
+ }
var result = Ext.decode(response.responseText);
var success = result.success;
if (!success) {
@@ -837,13 +841,8 @@
{header : operationColumnHeader,width : 150,dataIndex : 'operation',hidden:fromDepartmentUseRecord || existsObjInArray(operationColumnHeader,hiddenColumnsOfUseRecordListView)},
{header : recyclingStatusColumnHeader,width : 150,dataIndex : 'recyclingStatus',hidden:fromDepartmentUseRecord || (sstsConfig.monitorGoodsRecyclingStatusForUseRecord ? false :true),renderer:function(v , p , rec){
//SZSZLYY-31 使用记录监控回收状态功能优化
- if(v == awaitRecycle){
- return ""+ v +"";
- }else if(v == partRecycle){
- return ""+ v +"";
- }else if(v == recycled){
- return ""+ v +"";
- }else{
+ if(v == awaitRecycle || v == partRecycle || v == recycled){
+ return ''+v+'';
return v;
}
}},