Index: ssts-web/src/main/webapp/disinfectsystem/print/print.jsp =================================================================== diff -u -r29489 -r30113 --- ssts-web/src/main/webapp/disinfectsystem/print/print.jsp (.../print.jsp) (revision 29489) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.jsp (.../print.jsp) (revision 30113) @@ -44,9 +44,11 @@ } }); - +var printTemplateMap = []; -function printTemplate_${printTemplate.name}(obj){ +printTemplateMap['printTemplate_${printTemplate.name}'] = '${printTemplate.id}' + +function printTemplate_${printTemplate.id}(obj){ doGetLodop(); var templateName = '${printTemplate.name}'; var template = allTemplate[templateName]; Index: ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js =================================================================== diff -u -r30111 -r30113 --- ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js (.../labelTemplateForm.js) (revision 30111) +++ ssts-web/src/main/webapp/disinfectsystem/labelTemplateDesign/labelTemplateForm.js (.../labelTemplateForm.js) (revision 30113) @@ -133,9 +133,7 @@ id : 'name', name : 'name', allowBlank : false, - anchor : '98%', - regex: /^[A-Za-z0-9\u4e00-\u9fa5]+$/i, - regexText : "名称不能包含特殊符号" + anchor : '98%' },{ xtype : 'textfield', fieldLabel : '样式', Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r29980 -r30113 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 29980) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 30113) @@ -4122,10 +4122,10 @@ } function invokeTemplatePrintFunction(pageType,obj,labelTemplate){ var funName = getTemplatePrintFunName(pageType); - if(funName != null && !isUndefinedOrNull(window[funName])){ + if(funName != null && !isUndefinedOrNull(printTemplateMap[funName])){ logPrintTousse(obj,obj.barcode); doGetLodop(); - window[funName](obj); + window['printTemplate_'+printTemplateMap[funName]](obj); intrinsicDeletingFunctions(obj); setPrinterByConfigName(pageType); @@ -4159,6 +4159,7 @@ function getTemplateByDatasourceAndStyle(datasource,style){ + console.log(allTemplateArray) for(var i=0;i