Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js =================================================================== diff -u -r30286 -r30323 --- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30286) +++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js (.../packingView.js) (revision 30323) @@ -858,6 +858,8 @@ {name : 'maxAmount'}, {name : 'urgentLevelObj'}, {name : 'colorCode'}, + {name : 'classifiedItemAmountInfo'}, + {name : 'patient'}, {name : 'washRecordId'} ]}); @@ -892,7 +894,11 @@ showName = '' + showName + ''; } } - return showName; + if(record.get('leaf') && record.get('patient') !== '' && record.get('tousseType') == '外来器械包'){ + return showName+'-'+ record.get('patient'); + }else { + return showName + } } },{ header: '数量', @@ -999,9 +1005,14 @@ align:'center', sortable: true, dataIndex: 'basketName', - renderer:function (value, metaData, record, rowIdx, colIdx, store){ + renderer:function (value, metaData, record, rowIdx, colIdx, store){ + var html = value; + var classifiedItemAmountInfo = record.get('classifiedItemAmountInfo') || ''; + if(classifiedItemAmountInfo !== '' && record.get('tousseType') == '外来器械包'){ + html = classifiedItemAmountInfo; + } metaData.style='word-wrap: break-word !important;'; - metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(value) + '"'; //在tips中展示列的全部内容. + metaData.tdAttr = 'data-qtip="' + Ext4.String.htmlEncode(html) + '"'; //在tips中展示列的全部内容. return value; } },{