Index: ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js
===================================================================
diff -u -r37790 -r37791
--- ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 37790)
+++ ssts-web/src/main/webapp/disinfectsystem/showTousseImage/ext4ShowTousseImage.js (.../ext4ShowTousseImage.js) (revision 37791)
@@ -1,5 +1,5 @@
//展示器械包信息
-function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType, page) {
+function getAndShowTousseInfoDiv(tousseName, tousseDefinitionId, imageType, page, newId) {
var hiddenGrid = false;
var winWidth = 800;
var winHeight = 380;
@@ -144,7 +144,7 @@
proxy: {
type: 'ajax',
url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do',
- extraParams: { tousseName: tousseName, tousseDefinitionId: tousseDefinitionId },
+ extraParams: { tousseName: tousseName, tousseDefinitionId: newId || tousseDefinitionId },
reader: {
type: 'json'
}
Index: ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js
===================================================================
diff -u -r37790 -r37791
--- ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 37790)
+++ ssts-web/src/main/webapp/disinfectsystem/sterilizationmanager/sterilizationrecord/foreignProxyDisinfectionForm.js (.../foreignProxyDisinfectionForm.js) (revision 37791)
@@ -112,9 +112,11 @@
var tousseType = record.raw.tousseType;
var id = record.raw.tousseDefinitionID;
var newTousseType = '';
+ var newId = '';
if(!id){
id = record.raw.materialDefinitionId;
newTousseType = '材料图片';
+ newId = record.parentNode.raw.tousseDefinitionID;
}
if(tousseType == '消毒物品'){
newTousseType = '器械包图片';
@@ -123,7 +125,7 @@
if (record.raw.showCameraPhoto && SSTS_ShowCameraPhotoAndVideo) {
newV += '
';
}
- newV += "" + v + "";
+ newV += "" + v + "";
return newV;
} else {
var id = record.data.tousseDefinitionID;