Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource2.js
===================================================================
diff -u -r27728 -r28471
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource2.js	(.../dataSource2.js)	(revision 27728)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource2.js	(.../dataSource2.js)	(revision 28471)
@@ -161,6 +161,9 @@
 		propName: 'name',
 		displayName: '材料名称'
 	}),new TableDataSourceItem({
+		propName: 'nameAndSpecification',
+		displayName: '材料名称[材料规格]'
+	}),new TableDataSourceItem({
 		propName: 'count',
 		displayName: '材料数量'
 	}),new TableDataSourceItem({
Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js
===================================================================
diff -u -r28309 -r28471
--- ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 28309)
+++ ssts-web/src/main/webapp/disinfectsystem/print/print.js	(.../print.js)	(revision 28471)
@@ -2497,6 +2497,11 @@
 	if(isUndefinedOrNullOrEmpty(idCardInstance)){
 		return;
 	}
+	for(var i=0;i<idCardInstance.materials.length;i++){
+		var materials = idCardInstance.materials[i];
+		var nameAndSpecification = materials.name+'['+ materials.specification + ']';
+		idCardInstance.materials[i].nameAndSpecification = nameAndSpecification;
+	}
 	var paperType = idCardInstance.idCardPaperType;
 	//idCardInstance.name = idCardInstance.tousseDefinition.name;
 	if(isTemplatePageType(paperType)){
Index: ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js
===================================================================
diff -u -r28309 -r28471
--- ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js	(.../LodopFuncs.js)	(revision 28309)
+++ ssts-web/src/main/webapp/disinfectsystem/print/LodopFuncs.js	(.../LodopFuncs.js)	(revision 28471)
@@ -93,7 +93,7 @@
               if (oOBJECT && oOBJECT.parentNode){
                 oOBJECT.parentNode.removeChild(oOBJECT);
               }
-              alert('标签模板设计器在该浏览器下只能查看，不支持进行设计，请使用IE浏览器进行模板设计！');
+              //alert('标签模板设计器在该浏览器下只能查看，不支持进行设计，请使用IE浏览器进行模板设计！');
           }
       } else {
           var is64IE = isIE && !!(ua.match(/x64/i));
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js
===================================================================
diff -u -r28305 -r28471
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 28305)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/dataSource.js	(.../dataSource.js)	(revision 28471)
@@ -139,6 +139,9 @@
 		propName: 'name',
 		displayName: '材料名称'
 	}),new TableDataSourceItem({
+		propName: 'nameAndSpecification',
+		displayName: '材料名称[材料规格]'
+	}),new TableDataSourceItem({
 		propName: 'count',
 		displayName: '材料数量'
 	}),new TableDataSourceItem({
Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js
===================================================================
diff -u -r28308 -r28471
--- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 28308)
+++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/printCustomDesign.js	(.../printCustomDesign.js)	(revision 28471)
@@ -1261,6 +1261,7 @@
 	var num = i+1;
 	dataSource1.materials.push({
 		name: '材料'+num,
+		nameAndSpecification: '材料[规格]'+num,
 		fullName: '材料'+num,
 		count: '数量'+num,
 		specification: '规格'+num,