Index: ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js =================================================================== diff -u -r29762 -r29765 --- ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 29762) +++ ssts-web/src/main/webapp/disinfectsystem/foreigntousseapplication/foreignTousseInfoForm.js (.../foreignTousseInfoForm.js) (revision 29765) @@ -1833,7 +1833,28 @@ oldSupplierName = supplierName; } } - } + }, + renderer: function(v,p,record,rowIndex, columnIndex, store){ + var isLeaf = record.get('leaf'); + if(isLeaf){ + var id = record.data['id']; + var tdName = record.data['tdName']; + var isComboTousse = record.data['isComboTousse']; + var tousseDefinitionId = record.data['tousseDefinitionId']; + var tousseType = record.data['tousseType']; + if(v !== ''){ + var arr = []; + for(var i=0;i" + barcode + "";; + arr[i] = html; + } + return arr.join(','); + } + }else { + return v; + } + } },{ header: '器械包/材料名称', width : includeImplantUsedAmountHidden ? 200 : 170, @@ -3199,7 +3220,6 @@ } }); - foreignTousseApplyWindow.show(); if (id) {// 编辑