Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js
===================================================================
diff -u -r27520 -r28042
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 27520)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionForm.js	(.../materialDefinitionForm.js)	(revision 28042)
@@ -154,6 +154,10 @@
 	    	name : 'id',
 	    	id : 'id'
 		},{
+	    	xtype : 'hidden',
+	    	name : 'imageIds',
+	    	id : 'imageIds'
+		},{
 			layout: 'column',
 			items: [{
 				xtype : "fieldset",
@@ -574,7 +578,8 @@
 							anchor : '100%',
 							listeners : {
 								select: function(combo, record, index){
-									if(id && record.data.value == '是' ){
+									//if(id && record.data.value == '是' ){
+									if(record.data.value == '是' ){
 										top.Ext.getCmp('detachableImagPanel').show();
 										top.Ext.getCmp('splitAmountPanel').show();
 									}else{
@@ -600,7 +605,7 @@
 		    		  
 		    	  }]
 			   },{
-			         columnWidth : .33,
+			         columnWidth : .5,
 			         layout : 'form',
 			         id : 'splitAmountPanel',
 			         hidden : true,
@@ -611,7 +616,8 @@
 		        		 allowNegative:false,
 		        		 name: "splitAmount",
 		        		 id: "splitAmount",
-		        		 anchor: '100%'
+						 width : 110
+		        		// anchor: '55%'
 			         }]
 	        	 },{
 					columnWidth : 1,
@@ -738,6 +744,10 @@
 		items : [ formObj ]
 	});
 	materialDefinitionWin.show();
+	materialDefinitionWin.on('close',function(w){
+		imageIds = null;
+		top.Ext.getCmp('imageIds').setValue("");
+	});
 	
 	//load的代码位置已调整至所在父容器materialDefinitionWin之后,因为如果写在父容器show()之前的话,会导致formObj面板在没有渲染至dom节点前就load,
 	//mask加载信息遮罩层默认仅覆盖显示在列表组件上,而后又被弹出的materialDefinitionWin这个window覆盖,同时如果在load方法结束前就关闭此window时会引发js错误
Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionUploadImageManager.js
===================================================================
diff -u -r26541 -r28042
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionUploadImageManager.js	(.../materialDefinitionUploadImageManager.js)	(revision 26541)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/materialDefinition/materialDefinitionUploadImageManager.js	(.../materialDefinitionUploadImageManager.js)	(revision 28042)
@@ -1,5 +1,5 @@
 var  materialImageStore;
-
+var imageIds = null;
 var enableMove = true;
 
 /*function moveUp2(id){
@@ -105,18 +105,27 @@
    });    
    
    dialog.show();
-   dialog.on('uploadsuccess',function(dialog){
-	      showResult("文件上传成功！");
-	      materialImageStore.reload();
+   dialog.on('uploadsuccess',function(dialog, filename, resp_data, record){
+			showResult("文件上传成功！");
+			if(imageIds == null){
+				imageIds = resp_data.imageIds;
+			}else{
+				imageIds = imageIds + ","+resp_data.imageIds;
+			}
+			
+			if(imageIds != null){
+				top.Ext.getCmp('imageIds').setValue(imageIds);
+				materialImageStore.baseParams["imageIds"] = imageIds;
+			}
+			materialImageStore.load();
+			Ext.Ajax.request({
+				url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!updateImageUploadStatus.do',
+				params : {id : id,imageType:imageType},
+				success : function(response, options) {},
+				failure : function(response, options) {}
+			});
 	      
-	      Ext.Ajax.request({
-	  		url : WWWROOT + '/disinfectSystem/baseData/materialDefinitionAction!updateImageUploadStatus.do',
-	  		params : {id : id,imageType:imageType},
-	  		success : function(response, options) {},
-	  		failure : function(response, options) {}
-	  	  });
-	      
-	      dialog.hide();   
+	        dialog.hide();   
 	   }); //定义上传完成回调函数 
    dialog.on('uploadfailed',function(dialog){
 	      showResult("文件上传失败！");
@@ -136,7 +145,8 @@
 function uploadMaterialImageFile(imageType,id){
     materialImageStore = new top.Ext.data.Store({
             proxy : new Ext.data.HttpProxy({
-                url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id ,
+              // url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do?imageType='+encodeURI(imageType)+'&objectId='+id+'&imageIds='+imageIds,
+			    url:WWWROOT + '/disinfectSystem/baseData/uploadImageFileAction!loadTousseFileImage.do',
                 method : 'POST'
             }),
             reader : new Ext.data.JsonReader({
@@ -146,7 +156,14 @@
                 {name : 'id',mapping : 'id'}, 
                 {name : 'imageName',mapping : 'imageName'}
                ]
-            )
+            ),
+			listeners:{
+				beforeload : function( store, options ){
+					store.baseParams.imageType = imageType;
+					store.baseParams.objectId = id;
+					store.baseParams.imageIds = imageIds;
+				}
+			}
         });
         materialImageStore.load();