Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r35937 -r35955 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 35937) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 35955) @@ -2107,18 +2107,20 @@ var invokeResult = ''; if (printerName == null) { // 未配置,设置为默认打印机 + invokeResult = LODOP.SET_PRINTER_INDEX(-1); + var msg = '配置前缀:' + name + ',打印机:' + printerName + ',调用结果:' + invokeResult; if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ - alert('无法找到指定打印机,请检查配置或打印机连接。'); - }else { - invokeResult = LODOP.SET_PRINTER_INDEX(-1); - var msg = '配置前缀:' + name + ',打印机:' + printerName + ',调用结果:' + invokeResult; - if (!invokeResult) { - alert(msg); - } + msg = '标签类型【'+name+'】无法找到指定打印机,请检查配置或打印机连接。'; } + if (!invokeResult) { + alert(msg); + } } else { invokeResult = LODOP.SET_PRINTER_INDEX(printerName); var msg = '配置前缀:' + name + ',打印机:' + printerName + ',调用结果:' + invokeResult; + if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ + msg = '标签类型【'+name+'】无法找到指定打印机【'+printerName+'】,请检查配置或打印机连接。'; + } if (!invokeResult) { alert(msg); } Index: ssts-web/src/main/webapp/disinfectsystem/computerLabelPrinterSetting/computerLabelPrinterSettingForm.js =================================================================== diff -u -r35937 -r35955 --- ssts-web/src/main/webapp/disinfectsystem/computerLabelPrinterSetting/computerLabelPrinterSettingForm.js (.../computerLabelPrinterSettingForm.js) (revision 35937) +++ ssts-web/src/main/webapp/disinfectsystem/computerLabelPrinterSetting/computerLabelPrinterSettingForm.js (.../computerLabelPrinterSettingForm.js) (revision 35955) @@ -72,7 +72,7 @@ fields: ['value'], data: printerArray }), - forceSelection: true, + forceSelection: false, mode: 'local', triggerAction: 'all' }] @@ -164,8 +164,8 @@ var labelTemplateId = top.Ext4.getCmp('labelTemplateId_' + i).getValue(); labelPrinterSettingArr.push({ 'id': childId, - 'printerName': printerName, - 'labelName': labelName, + 'printerName': printerName || '', + 'labelName': labelName || '', 'labelTemplateId': labelTemplateId }) } @@ -329,7 +329,7 @@ fields: ['value'], data: printerArray }), - forceSelection: true, + forceSelection: false, mode: 'local', triggerAction: 'all' }]