Index: ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js
===================================================================
diff -u
--- ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(revision 0)
+++ ssts-web/src/main/webapp/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js	(revision 13718)
@@ -0,0 +1,737 @@
+var signBoardForm = null;
+var gridPanel;
+var idCardDefinitionStore;
+var idCardInstancesGridStore;
+var IDCardInstance;
+var IDCard;
+var idCardInstancesGridPanel;
+var traceableMaterialGridPanel;
+var signMaterilenStore;
+var signMaterileGridStore;
+var idCardInstanceState_using = '使用中';
+var idCardInstanceState_lost = '已丢失';
+var idCardsOriginalStr = '';
+var tousseDefinitionID = '';
+var recyclingErrorID = '';
+var packingTaskID = '';
+var forSupplement = false;// 是否装配补充弹出来的
+var supplementResult = false;// 补充结果
+
+var idCardInstanceFields = [
+                       	    {name : 'id'},
+                       	    {name : 'idCardDefinitionID'},
+                       	    {name : 'barcode'},
+                       	    {name : 'status'},
+                       	    {name : 'useAmount'},
+                       	    {name : 'printDate'},
+                       	    {name : 'tousseInstanceStatusAndTime'}
+                     	];
+
+var traceableMaterialFields = [
+                 	  	    {name : 'id'},
+                 	  	    {name : 'count'},
+                	  	    {name : 'nameSpecification'},
+                	  	    {name : 'name'},
+                	  	    {name : 'specification'},
+                	  	    {name : 'serialNumber'},
+                	  	    {name : 'materialDefinition'}
+                	  	];
+var materialFields = [
+           	  	    {name : 'id'},
+           	  	    {name : 'count'},
+          	  	    {name : 'materileName'},
+          	  	    {name : 'name'},
+          	  	    {name : 'specification'}
+          	  	];
+
+var idCardFields = [
+             	    {name : 'id'},
+               	    {name : 'number'},
+               	    {name : 'deleted'},
+               	    {name : 'status'},
+               	    {name : 'barcode'},
+               	    {name : 'idCardInstances'},
+               	    {name : 'useAmount'},
+               	    {name : 'traceableMaterials'},
+               	    {name : 'description'}
+             	];
+//IDCardInstance = Ext.data.Record.create(idCardInstanceFields);
+//IDCard = Ext.data.Record.create(idCardFields);
+//var TraceableMaterial = Ext.data.Record.create(traceableMaterialFields);
+
+
+// 显示标识牌表单
+function showIDCardListView(){
+	supplementResult = false;
+	
+	Ext4.define('IdCardDefinitionModel', {
+	    extend: 'Ext4.data.Model',
+	    fields: idCardFields
+	});
+	idCardDefinitionStore = new Ext4.data.Store({
+		proxy : new Ext4.data.proxy.Ajax({
+			url : WWWROOT + '/disinfectSystem/idCardDefinitionAction!loadIDCardInfo.do'
+		}),
+		model: 'IdCardDefinitionModel',
+		reader : new Ext4.data.reader.Json({
+			model: 'IdCardDefinitionModel'
+		})
+	});
+//	idCardDefinitionStore.baseParams['id'] = id;
+//	idCardDefinitionStore.load({
+//		callback:function(records,options,success){
+//			if(success){
+//				idCardsOriginalStr = buildJSONStringFromStore(idCardDefinitionStore);
+//				// 选中第一个标识牌
+//				gridPanel.getSelectionModel().selectFirstRow();
+//			}
+//			}});
+	if(id != 0 && !sstsConfig.disableIdCard){
+		loadIDCardDefinitions();
+	}
+	
+	gridPanel = new top.Ext4.grid.Panel({
+//		height : 200,
+		width:860,
+		store : idCardDefinitionStore,
+		columns: [
+//		          { xtype : 'checkcolumn', text : ''},
+		          { text : '编号', dataIndex : 'number' ,columnWidth: 50},
+		          { text : '当前条码', dataIndex : 'barcode' ,columnWidth: 70},
+		          { text : '使用次数', dataIndex : 'useAmount' ,columnWidth: 70},
+		          { text : '状态', dataIndex : 'status' ,columnWidth: 50},
+		          { text : '描述', dataIndex : 'description' ,columnWidth: 200}
+		          
+		],
+		frame : false,
+//		autoScroll : true,
+		autoExpandColumn : 'description',
+//		bodyStyle : 'border:1px solid #afd7af;overflow-y:auto;overflow-x:hidden',
+		bodyStyle : 'border:1px solid #afd7af',
+		viewConfig: {
+	        forceFit:true
+		},
+		clicksToEdit:2,
+//		autoScroll:true,
+		selModel : new Ext4.selection.CheckboxModel({
+			mode : 'SINGLE',
+			listeners :{
+		    	'selectionchange':function(sm){
+		    		var record = sm.getSelection();
+		    		// 清除显示的列表
+		    		idCardInstancesGridPanel.getStore().removeAll();
+		    		traceableMaterialGridPanel.getStore().removeAll();
+		    		if(record != null){
+		    			loadDataToIdCardInstancesGridStore();
+		            	loadDataToSignMaterileGridStore();
+		    		}
+//		            var fieldName = grid.getColumnModel().getDataIndex(columnIndex);
+//		            if(fieldName != 'deleteButton' && fieldName != 'printButton'){
+//		            	var record = grid.getSelectionModel().getSelected();
+//		            	var id = record.data['id'];
+//		            	
+//		            }
+//		            Ext4.getCmp('rowNumber').setValue(rowIndex);
+		    	}
+		    }
+		}),
+		
+	    items:[{
+	    	xtype:'hidden',
+	    	name:'rowNumber',
+	    	id:'rowNumber'
+	    }]
+	});
+
+	Ext4.define('IdCardInstanceModel', {
+	    extend: 'Ext4.data.Model',
+	    fields: idCardInstanceFields
+	});
+	idCardInstancesGridStore = new Ext4.data.Store({
+		proxy : new Ext4.data.proxy.Memory({
+		}),
+		model: 'IdCardInstanceModel',
+		reader : new Ext4.data.reader.Json({
+		})
+	});
+	idCardInstancesGridPanel = new top.Ext4.grid.Panel({
+		title:'标识牌实例（含使用中和已丢失的）',
+//		height:260,
+//		autoHeight:true,
+//		width:300,
+		store : idCardInstancesGridStore,
+		columns: [
+				//{ xtype : 'checkcolumn', text : ''},
+				{ text : '条码', dataIndex : 'barcode' ,columnWidth: 60},
+				{ text : '使用次数', dataIndex : 'useAmount' ,columnWidth: 50},
+				{ text : '状态', dataIndex : 'status' ,columnWidth: 50},
+				{ text : '打印时间', dataIndex : 'printDate' ,columnWidth: 110},
+				{ text : '器械包状态', dataIndex : 'tousseInstanceStatusAndTime' ,columnWidth: 150}
+				],
+		bodyStyle : 'border:1px solid #afd7af',
+		viewConfig: {
+	        forceFit:true
+		},
+		clicksToEdit:1,
+		selModel : new Ext4.selection.CheckboxModel({
+			mode : 'SINGLE'
+		}),
+		tbar : [
+				{
+					text : '打印',
+					iconCls : 'icon_print',
+					hidden:forSupplement,
+					handler : function() {
+
+						var records = idCardInstancesGridPanel
+								.getSelectionModel().getSelection();
+
+						if (records.length == 0) {
+							showResult('请选择要打印的标识牌实例!');
+							return;
+						}
+						Ext4.MessageBox.progress('打印中', '请稍候...');
+						printIDCardInstanceByID(records[0].data.id);
+						hideMessageBox(true);
+					}
+				}, {
+					text : '转换',
+					hidden:forSupplement,
+					iconCls : 'btn_ext_refresh',
+					handler : function() {
+						rebindIDCardInstanceToIDCardDefinition();
+					}
+				}, {
+					text : '修改使用次数',
+					hidden:forSupplement,
+					handler : function() {
+						modifyUseAmountOfIDCardInstance();
+					}
+				} ]
+	});
+	Ext4.define('TraceableMaterialModel', {
+	    extend: 'Ext4.data.Model',
+	    fields: traceableMaterialFields
+	});
+	signMaterileGridStore = new Ext4.data.Store({
+		proxy : new Ext4.data.proxy.Memory({
+		}),
+		model: 'TraceableMaterialModel',
+		reader : new Ext4.data.JsonReader({
+		})
+	});
+	traceableMaterialGridPanel = new top.Ext4.grid.Panel({
+		id:'signMaterileID',
+		title:'单件器械列表',
+//		height:260,
+		width:280,
+		frame : false,
+		store : signMaterileGridStore,
+		columns: [
+					//{ xtype : 'checkcolumn', text : ''},
+					{ text : '器械名称', dataIndex : 'nameSpecification' ,columnWidth: 150},
+					{ text : '序列号', dataIndex : 'serialNumber' ,columnWidth: 100}
+					],
+		autoExpandColumn : 'serialNumber',
+		autoScroll : true,
+		viewConfig: {
+	        forceFit:true
+		},
+		bodyStyle : 'border:1px solid #afd7af',
+		clicksToEdit : 1,
+		selModel : new Ext4.selection.CheckboxModel({
+			mode : 'SINGLE'
+		})
+		
+	});
+	// 标识牌表单
+	signBoardForm = new top.Ext4.form.Panel({
+		id : 'tousseSignBoardForm',
+//		frame : true,
+		width: 900,
+		height : 600,
+		layout:'column',
+		bodyStyle : 'padding:0px 0px 0px 0px;',
+		autoScroll : true,
+		items: [{
+			xtype:'hidden',
+	    	hidden:true,
+	    	name:'signBoardMaterileData',
+	    	id:'signBoardMaterileData'
+		},{
+			//region: 'north',
+			anchor:'100% 50%',
+			height:280,
+			columnWidth : 1,
+			layout : 'fit',
+	        items:[gridPanel],
+	        tbar:[{
+	        	xtype:'button',
+	        	text:'添加',
+	        	hidden:forSupplement,
+	        	id : 'addBtn',
+	        	iconCls : 'btn_ext_application_add',
+	    		handler : function(){
+	    			addIDCardDefinition();
+	    		}
+	        },{
+	        	xtype:'button',
+	        	text:'废弃',
+	        	hidden:forSupplement,
+	        	iconCls : 'btn_ext_application_del',
+	        	id : 'discardBtn',
+	    		handler : function(){
+	    			discardIDCards();
+	    		}
+	        },{
+	        	xtype:'button',
+	        	text:'丢失打印',
+	        	hidden:true,
+	        	id : 'printNewBtn',
+	    		handler : function(){
+	    			printNewIDCardInstance();
+	    		}
+	        },{
+	        	xtype:'button',
+	        	text:'补充并打印',
+	        	hidden:!forSupplement,
+	    		handler : function(){
+	    			printNewIDCardInstanceForSupplement();
+	    		}
+	        },{
+				text : '打印全部',
+				iconCls : 'icon_print',
+				hidden:forSupplement,
+				handler : function() {
+					printAllIdCard();
+				}
+			},{
+				text : '标识牌标签:',
+				hidden:forSupplement
+			},{
+                xtype : 'combo',
+                id : 'idCardPaperType2',
+                name : 'idCardPaperType2',
+                editable:false,
+                valueField : 'value',
+                displayField : 'value',
+                store : new Ext4.data.ArrayStore( {
+                    fields : [ 'value'],
+                    data : [['大标签'],['中标签'],['小标签']]
+                }),
+                value : '大标签',
+                forceSelection : true,
+                mode : 'local',
+                triggerAction : 'all',
+                anchor : '100%'
+            }]
+	    },{
+	    	anchor:'100% 50%',
+	    	layout : 'fit',
+	    	columnWidth : 1,
+	    	items : [{
+		    	//region: 'center',
+		    	layout : 'column',
+		    	columnWidth : 1,
+		    	labelAlign : 'right',
+				items : [{
+					height:250,
+					columnWidth : .65,
+					layout:'fit',
+					items : [idCardInstancesGridPanel]
+				},{
+					height:250,
+					columnWidth : .35,
+					layout:'fit',
+					items : [traceableMaterialGridPanel]
+				}]
+		    }]
+	    }
+//		,{
+//			anchor:'100% 50%',
+//	    	height:250,
+//	    	//region: 'center',
+//	    	layout : 'column',
+//	    	columnWidth : 1,
+//	    	labelAlign : 'right',
+//			items : [{
+//				columnWidth : .6,
+//				layout:'fit',
+//				items : [idCardInstancesGridPanel]
+//			},{
+//				columnWidth : .39,
+//				layout:'fit',
+//				items : [traceableMaterialGridPanel]
+//			}]
+//	    }
+		],
+	    buttonAlign : 'center',
+	    buttons:[{
+	    	text:'保存',
+	    	hidden:forSupplement,
+	    	handler:function(){}
+	    },{
+	    	text:'取消',
+//	    	hidden:forSupplement,
+	    	handler:cancel
+	    }]
+	});
+	function cancel() {
+		suppleIDCardWin.close();
+	}
+	
+	function validateFormParams(){
+		// 校验材料是否都已经填写
+		var idCardDefinitionStore = gridPanel.getStore();
+		for(var i=0;i<idCardDefinitionStore.getCount();++i){
+			var idCardDefinition = idCardDefinitionStore.getAt(i).data;
+			var traceableMaterials = idCardDefinition.traceableMaterials;
+			if(!isUndefinedOrNullOrEmpty(traceableMaterials)){
+				for(var t=0;t<traceableMaterials.length;++t){
+					var traceableMaterial = traceableMaterials[t];
+					if(isUndefinedOrNullOrEmpty(traceableMaterial.serialNumber)){
+						showResult('请输入序列号!');
+						return false;
+					}
+					if(isUndefinedOrNullOrEmpty(traceableMaterial.materialDefinition) || isUndefinedOrNullOrEmpty(traceableMaterial.materialDefinition.id)){
+						showResult('请选择材料!');
+						return false;
+					}
+				}
+			}
+		}
+		return true;
+	}
+	
+	function setTraceableMaterialsToCurrentSelectedIDCardDefinition() {
+		return;
+		var idCards = gridPanel.getSelectionModel().getSelection();
+		if (idCards.length == 0) {
+			showResult('请选择标识牌!');
+			return;
+		}
+		setTraceableMaterialsToIDCardDefinition(idCards[0].data);
+	}
+	// 将store里面的材料设置到标识牌
+	function setTraceableMaterialsToIDCardDefinition(idCardDefinition){
+		// 从标识牌里面删除
+		idCardDefinition.traceableMaterials = [];
+		  for(var i = 0;i<signMaterileGridStore.getCount();i++){
+			  var material = signMaterileGridStore.getAt(i);
+			  idCardDefinition.traceableMaterials.push(material.data);
+		  }
+	}
+	function printIDCardInstanceObj(idCardInstance){
+		var unit = "";
+		DWREngine.setAsync(false);
+		SupplyRoomConfigTableManager.getUnitName(function(unitName){
+			if(unitName != null && unitName != ""){
+				unit = unitName;
+			}
+		});
+		DWREngine.setAsync(true);
+		idCardInstance.unit = unit;
+		idCardInstance.userName = userName;
+		// 设置打印的标签类型
+		var idCardPaperType2 = top.Ext4.getCmp("idCardPaperType2").getValue();
+		if(!isUndefinedOrNullOrEmpty(idCardPaperType2)){
+			idCardInstance.idCardPaperType = idCardPaperType2;
+		}
+		
+		printIDCardInstance(idCardInstance);
+	}
+	function printIDCardInstanceByID(idCardInstanceID){
+		var id = idCardInstanceID;
+		var printResult = false;
+		DWREngine.setAsync(false);
+		var params = {idCardInstanceID : id,tousseDefinitionID : tousseDefinitionID};
+		IDCardDefinitionTableManager.rePrintIDCardInstance(JSON.stringify(params),function(jsonStr){
+			var result = JSON.parse(jsonStr);
+			if(!isUndefinedOrNullOrEmpty(result.idCardInstance)){
+				printIDCardInstanceObj(result.idCardInstance);
+			}
+		});
+		DWREngine.setAsync(true);
+	}
+	function printIDCardInstanceByIDs(idCards){
+		Ext4.MessageBox.progress('打印中', '请稍候...');
+		for(var i=0;i<idCards.length;i++){
+			var id = idCards[i];
+			var curNumber = i+1;
+			Ext4.MessageBox.updateProgress((curNumber)/idCards.length,'第' + (curNumber) + '个,共' + idCards.length +  '个');
+			printIDCardInstanceByID(id);
+		}
+		hideMessageBox(true);
+	}
+	// 打印全部标识牌
+	function printAllIdCard(){
+		var idCards = [];
+		var idCardsIds = [];
+		var idCardDefinitionStore = gridPanel.getStore();
+		for(var i=0;i<idCardDefinitionStore.getCount();++i){
+			var idCardDefinition = idCardDefinitionStore.getAt(i).data;
+			var idCardInstances = idCardDefinition.idCardInstances;
+			if(isUndefinedOrNull(idCardInstances)){
+				continue;
+			}
+			if(idCardInstances.length == 0){
+				continue;
+			}
+			for(var i2=0;i2<idCardInstances.length;++i2){
+				var idCardInstance = idCardInstances[i2];
+				if('使用中' == idCardInstance.status){
+					idCards.push(idCardInstance);
+					idCardsIds.push(idCardInstance.id);
+				}
+			}
+		}
+		if(idCards.length == 0){
+			showResult("没有要打印的标识牌!");
+			return;
+		}
+		
+		printIDCardInstanceByIDs(idCardsIds)
+	}
+	
+	function renderPrintButton(v,p,record){
+		return "<a href=\"#\" target=\"_self\" onclick=\"getCurrentTab().printBarcode('"+record.data.id+"');\"><img src=\""+WWWROOT +"/images/printButton.png\"></img></a>";
+	}
+
+	function rebindIDCardInstanceToIDCardDefinition(serialNumber){}
+	function modifyUseAmountOfIDCardInstance(){}
+	function validatingForPrintNewIDCardInstance(){
+		var idCardsRecords = gridPanel.getSelectionModel().getSelection();
+		if(idCardsRecords.length == 0){
+			showResult("请选择要打印的标识牌!");
+			return false;
+		}
+		if(idCardsRecords.length > 1){
+			showResult("一次只能打印一个标识牌!");
+			return false;
+		}
+		for(var i=0;i<idCardsRecords.length;++i){
+			var id = idCardsRecords[i].data.id;
+			if(isUndefinedOrNullOrEmpty(id)){
+				showResult("标识牌未保存不能重新打印!");
+				return false;
+			}
+		}
+		return true;
+	}
+	// 丢失打印新的标识牌实例
+	function printNewIDCardInstance(){
+		if(!validatingForPrintNewIDCardInstance()){
+			return;
+		}
+		var idCardsRecords = gridPanel.getSelectionModel().getSelection();
+		var idCardDefinition = idCardsRecords[0].data;
+		Ext4.MessageBox.confirm("请确认", "如果打印新标签，会将现有标签置为丢失状态，是否继续？",
+				function(btn) {
+			if (btn == 'yes') {
+				Ext4.MessageBox.wait('正在打印，请稍候……', '请等待');
+				// 目前只会打印一个，以后可改为打印多个
+				var id = idCardsRecords[0].data.id;
+				//该标识牌定义新增一个标识牌实例
+				Ext.Ajax.request({
+					url :  WWWROOT + '/disinfectSystem/idCardDefinitionAction!addIDCardInstanceToThisDefinition.do',
+					params : {id : idCardDefinition.id,tousseDefinitionID:tousseDefinitionID},
+					success : function(response, options) {
+						var result = Ext.decode(response.responseText);
+						
+						if(!isUndefinedOrNullOrEmpty(result.idCardInstance)){
+							printIDCardInstanceObj(result.idCardInstance);
+						}
+						
+//						loadDataToIdCardInstancesGridStore();
+						// 重新加载数据
+						idCardInstancesGridPanel.getStore().removeAll();
+    		    		traceableMaterialGridPanel.getStore().removeAll();
+            			loadIDCardDefinitions();
+						
+						hideMessageBox(true);
+					}
+				});
+			}
+		});
+	}
+	// 补充标识牌并打印
+	function printNewIDCardInstanceForSupplement(){
+		if(!validatingForPrintNewIDCardInstance()){
+			return;
+		}
+		var idCardsRecords = gridPanel.getSelectionModel().getSelection();
+		var idCardDefinition = idCardsRecords[0].data;
+		top.Ext4.MessageBox.confirm("请确认", "如果打印新标签，会将现有标签置为丢失状态，是否继续？",
+				function(btn) {
+			if (btn == 'yes') {
+				top.Ext4.MessageBox.wait('正在打印，请稍候……', '请等待');
+				// 目前只会打印一个，以后可改为打印多个
+				var id = idCardsRecords[0].data.id;
+				//该标识牌定义新增一个标识牌实例
+				Ext.Ajax.request({
+					url :  WWWROOT + '/disinfectSystem/idCardDefinitionAction!addIDCardInstanceToThisDefinitionForSupplement.do',
+					params : {id : idCardDefinition.id,tousseDefinitionID:tousseDefinitionID,packingTaskID:packingTaskID,recyclingErrorID:recyclingErrorID},
+					success : function(response, options) {
+						var result = Ext.decode(response.responseText);
+						if(!result.success){
+							showResult(result.errMsg);
+							return ;
+						}
+						onSupplementIDCard(result);
+						if(!isUndefinedOrNullOrEmpty(result.idCardInstance)){
+							printIDCardInstanceObj(result.idCardInstance);
+						}					
+						
+//						loadDataToIdCardInstancesGridStore();
+						// 重新加载数据
+						idCardInstancesGridPanel.getStore().removeAll();
+    		    		traceableMaterialGridPanel.getStore().removeAll();
+            			loadIDCardDefinitions();
+            			supplementResult = true;// 补充成功
+					},
+					callback : function(options,response,success) {
+						hideMessageBox4(true);
+					}
+				});
+			}
+		});
+	}
+	
+	// 废弃/删除标识牌
+	function discardIDCards(){
+		// 获取选择的data
+		var idCardsRecords = getGridSelectionsRecords(gridPanel);
+		if(idCardsRecords.length == 0){
+			showResult("请选择要废弃的标识牌!");
+			return;
+		}
+		for(var i=0;i<idCardsRecords.length;++i){
+			var id = idCardsRecords[i].data.id;
+			if(isUndefinedOrNullOrEmpty(id)){
+				showResult("标识牌未保存不能废弃!");
+				return;
+			}
+		}
+		Ext4.MessageBox
+		.confirm("请确认",
+				"您确定要废弃标识牌定义吗？",
+				function(button, text) {
+					if ("yes" == button){
+						idCardsRecords[0].data.deleted = 1; 
+						idCardsRecords[0].set('status','已废弃')
+					}
+		});
+	}
+
+	function addIDCardDefinition(){
+		Ext.Ajax.request({
+			url :  WWWROOT + '/disinfectSystem/idCardDefinitionAction!getBarcode.do',
+			success : function(response, options) {
+				var result = Ext.decode(response.responseText);
+				var barcode = result.barcode;
+				var store = gridPanel.getStore();
+				var number = store.getCount()+1;
+				
+				// 标识牌实例
+				var idCardInstance = new IdCardInstanceModel({
+					barcode:barcode,
+					useAmount:0,
+					status:idCardInstanceState_using,
+					printDate:new Date().format('Y-m-d H:i:s')
+				});
+				// 标识牌
+				var idCard = new IdCardDefinitionModel({
+//					id:null,
+					number:number,
+					deleted:0,
+					status:idCardInstanceState_using,
+					barcode:barcode,
+					idCardInstances:[idCardInstance.data],
+					useAmount:0,
+					traceableMaterials:[],
+					description:''
+					
+				});
+				store.add(idCard);
+				gridPanel.getSelectionModel().selectRecords([idCard],false);
+			}
+		});
+	}
+
+
+	function loadDataToIdCardInstancesGridStore(){
+		idCardInstancesGridStore.removeAll();
+		var records = gridPanel.getSelectionModel().getSelection();
+		var record = null;
+		if(records != null){
+			record = records[0];
+		}
+		
+		if(isUndefinedOrNull(record)){
+			return;
+		}
+		var idCardInstances = record.data.idCardInstances;
+		var useAmount = 0;
+		if(isUndefinedOrNull(idCardInstances)){
+			return;
+		}
+		if(idCardInstances !=null && idCardInstances.length > 0 ){
+			for(var i=0;i<idCardInstances.length;i++){
+					var idCardInstance = idCardInstances[i];
+					var id = idCardInstance.id;
+					var barcode = idCardInstance.barcode;
+					var status = idCardInstance.status;
+					var printDate = idCardInstance.printDate;
+					
+					if('使用中' == status){
+						record.set("barcode",barcode);
+					}
+					var d = new IdCardInstanceModel(idCardInstance);
+					useAmount += idCardInstance.useAmount;
+					idCardInstancesGridPanel.getStore().add(d);
+			}
+			record.set("useAmount",useAmount);
+		}
+	}
+
+	function loadDataToSignMaterileGridStore(){
+		var traceableMaterialStore = traceableMaterialGridPanel.getStore();
+		traceableMaterialStore.removeAll();
+		var records = gridPanel.getSelectionModel().getSelection();
+		var record = records[0];
+		if(isUndefinedOrNull(record)){
+			return;
+		}
+		var traceableMaterials = record.data.traceableMaterials;
+		if(traceableMaterials != null && traceableMaterials.length > 0 ){
+			for(var i=0;i<traceableMaterials.length;i++){
+					var traceableMaterial = traceableMaterials[i];
+//					dumpObj(traceableMaterial)
+					var traceableMaterialsRecord = new TraceableMaterialModel(traceableMaterial);
+					traceableMaterialStore.add(traceableMaterialsRecord);
+			}
+		}
+	}
+	
+	function loadIDCardDefinitions(){
+		idCardDefinitionStore.load({
+			params: {
+				id: tousseDefinitionID
+			},
+			callback:function(records,options,success){
+				if(success){
+					idCardsOriginalStr = buildJSONStringFromStore(idCardDefinitionStore);
+					// 选中第一个标识牌
+					gridPanel.getSelectionModel().selectRange(0,0);
+				}
+				}});
+	}
+	function reLoadIDCardDefinitions(){
+		idCardInstancesGridPanel.getStore().removeAll();
+		traceableMaterialGridPanel.getStore().removeAll();
+		gridPanel.getStore().removeAll();
+		loadIDCardDefinitions();
+	}
+}
+
+
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp
===================================================================
diff -u -r12713 -r13718
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 12713)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.jsp	(.../packingView.jsp)	(revision 13718)
@@ -56,7 +56,7 @@
 <script type="text/javascript" src="${ctx}/dwr/interface/ForeignTousseApplicationTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/PackingTableManager.js"></script>
 <script type="text/javascript" src="${ctx}/dwr/interface/ContainerTableManager.js"></script>
-<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/idCardForm.js"></script>
+<script type="text/javascript" src="${ctx}/disinfectsystem/basedatamanager/tousse/idCardFormExt4.js"></script>
 
 <title>装配管理</title>
 <script type="text/javascript">
Index: ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js
===================================================================
diff -u -r13710 -r13718
--- ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 13710)
+++ ssts-web/src/main/webapp/disinfectsystem/packing/packingView.js	(.../packingView.js)	(revision 13718)
@@ -283,14 +283,15 @@
 	        			packingTaskID = taskid;
 	        			showIDCardListView();
 	        			
-	        			suppleIDCardWin = new top.Ext.Window({
+	        			
+	        			suppleIDCardWin = new top.Ext4.Window({
 	        		        id : 'suppleIDCardWin',
 	        		        layout : 'fit',
 	        		        title : '标识牌补充',
 	        		        modal : true,
 	        		        border : false,
 	        		        width : 950,
-	        		        height : 650,
+	        		        height : 660,
 //	        		        autoHeight : true,
 //	        		        plain : true,
 	        		        items : [signBoardForm]
Index: ssts-web/src/main/webapp/ext/js/common.js
===================================================================
diff -u -r13280 -r13718
--- ssts-web/src/main/webapp/ext/js/common.js	(.../common.js)	(revision 13280)
+++ ssts-web/src/main/webapp/ext/js/common.js	(.../common.js)	(revision 13718)
@@ -30,6 +30,20 @@
 		}
 	}
 }
+function hideMessageBox4(isTop){
+	if (isTop){
+		if(top.Ext4.MessageBox && top.Ext4.MessageBox.isVisible()){
+			top.Ext4.MessageBox.updateProgress(1,' '); // 清除进度条的提示文字
+			top.Ext4.MessageBox.hide();
+		}
+	}
+	else{
+		if(Ext4.MessageBox && Ext4.MessageBox.isVisible()){
+	        Ext4.MessageBox.updateProgress(1,' '); // 清除进度条的提示文字
+	        Ext4.MessageBox.hide();
+		}
+	}
+}
 function showWaitMsg(msg){
     Ext.MessageBox.show({
            msg: msg,