Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js =================================================================== diff -u -r37792 -r37793 --- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 37792) +++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 37793) @@ -1,9 +1,12 @@ //展示器械包信息 -function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType, page, newId) { +function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType, page, newId, newTousseName) { var hiddenGrid = false; var winWidth = 800; var winHeight = 380; var title = tousseName + '信息'; + if(newId !== ''){ + title = newTousseName + '信息'; + } if (imageType == '一次性物品图片') { hiddenGrid = true; winWidth = 800; @@ -161,6 +164,9 @@ handler: function () { curImageType = IMAGE_TYPE_TOUSSE; objectName = tousseName; + if(newId !== ''){ + objectName = newTousseName; + } objectId = newId ||tousseDefinitionId; loadImageCount(); } @@ -169,6 +175,9 @@ handler: function () { curImageType = IMAGE_TYPE_SPECIFICATION; objectName = tousseName; + if(newId !== ''){ + objectName = newTousseName; + } objectId = newId ||tousseDefinitionId; loadImageCount(); } @@ -228,7 +237,11 @@ }); if (!hiddenGrid) { //材料 - top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料'); + if(newId !== ''){ + top.Ext4.getCmp('materialGrid').setTitle('[' + newTousseName + '] 包含的材料'); + }else { + top.Ext4.getCmp('materialGrid').setTitle('[' + tousseName + '] 包含的材料'); + } materialStore.on("beforeload", function (store, operation, eOpts) { store.proxy.extraParams["tousseName"] = tousseName; }); Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js =================================================================== diff -u -r37791 -r37793 --- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 37791) +++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 37793) @@ -113,10 +113,12 @@ var id = record.raw.tousseDefinitionID; var newTousseType = ''; var newId = ''; + var newTousseName = ''; if(!id){ id = record.raw.materialDefinitionId; newTousseType = '材料图片'; - newId = record.parentNode.raw.tousseDefinitionID; + newId = record.parentNode.raw.tousseDefinitionID || ''; + newTousseName = record.parentNode.raw.name || ''; } if(tousseType == '消毒物品'){ newTousseType = '器械包图片'; @@ -125,7 +127,7 @@ if (record.raw.showCameraPhoto && SSTS_ShowCameraPhotoAndVideo) { newV += ''; } - newV += "" + v + ""; + newV += "" + v + ""; return newV; } else { var id = record.data.tousseDefinitionID;