Index: ssts-web/src/main/webapp/systemmanage/system/systemInfo.js =================================================================== diff -u -r29420 -r36620 --- ssts-web/src/main/webapp/systemmanage/system/systemInfo.js (.../systemInfo.js) (revision 29420) +++ ssts-web/src/main/webapp/systemmanage/system/systemInfo.js (.../systemInfo.js) (revision 36620) @@ -23,11 +23,11 @@ width : 800, height : 600, layout : 'column', + labelWidth : 140, + labelAlign:"left", items : [{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "版本号", @@ -38,10 +38,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "svn版本号", @@ -52,10 +50,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "构建时间", @@ -66,10 +62,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "内部版本", @@ -80,10 +74,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "最大内存", @@ -94,10 +86,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "已分配", @@ -108,10 +98,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "可用", @@ -122,10 +110,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "总可用", @@ -136,10 +122,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "数据库", @@ -150,10 +134,8 @@ anchor : '100%' }] },{ - columnWidth : .25, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "用户", @@ -164,10 +146,8 @@ anchor : '100%' }] },{ - columnWidth : .5, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "连接URL", @@ -178,10 +158,8 @@ anchor : '100%' }] },{ - columnWidth : .5, + columnWidth : 1, layout : 'form', - labelWidth : 80, - labelAlign:"right", items:[{ xtype : 'textfield', fieldLabel : "驱动", @@ -191,6 +169,19 @@ cls:'fieldReadOnlyNoRemove', anchor : '100%' }] + },{ + columnWidth : 1, + layout : 'form', + hidden:!sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction, + items:[{ + xtype : 'textfield', + fieldLabel : "clientComputerName", + id : "clientComputerName", + name : "clientComputerName", + readOnly : true, + cls:'fieldReadOnlyNoRemove', + anchor : '100%' + }] }] }); @@ -204,8 +195,12 @@ items : [form] } ] }); - + if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ + var clientComputerName = sessionStorage.getItem('clientComputerName') || ''; + Ext.getCmp('clientComputerName').setValue(clientComputerName); + } + form.form.load({ url : WWWROOT + '/system/system/getSysInfo.mhtml', method : 'GET', Index: ssts-web/src/main/webapp/disinfectsystem/print/print.js =================================================================== diff -u -r36229 -r36620 --- ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 36229) +++ ssts-web/src/main/webapp/disinfectsystem/print/print.js (.../print.js) (revision 36620) @@ -2109,25 +2109,19 @@ // 未配置，设置为默认打印机 invokeResult = LODOP.SET_PRINTER_INDEX(-1); var msg = '配置前缀:' + name + ',打印机：' + printerName + ',调用结果:' + invokeResult; - if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ - msg = '标签类型【'+name+'】无法找到指定打印机，请检查配置或打印机连接。'; - } - if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ - alert(msg); - }else { + if(!sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ if (!invokeResult) { alert(msg); } } } else { invokeResult = LODOP.SET_PRINTER_INDEX(printerName); var msg = '配置前缀:' + name + ',打印机：' + printerName + ',调用结果:' + invokeResult; - if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ - msg = '标签类型【'+name+'】无法找到指定打印机【'+printerName+'】，请检查配置或打印机连接。'; + if(!sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ + if (!invokeResult) { + alert(msg); + } } - if (!invokeResult) { - alert(msg); - } } } @@ -4836,6 +4830,22 @@ function invokeTemplatePrintFunction(pageType, obj, labelTemplate, time) { var funName = getTemplatePrintFunName(pageType); if (funName != null && !isUndefinedOrNull(printTemplateMap[funName])) { + if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ + var clientComputerName = sessionStorage.getItem('clientComputerName') || ''; + var clientComputerPrinters = sessionStorage.getItem('clientComputerPrinters'); + if(clientComputerName !== '' && (clientComputerPrinters == 'null' || clientComputerPrinters == null)){ + alert('clientComputerName指定的客户端电脑名称【'+clientComputerName+'】，未在标签输出打印机设置中找到对应的配置，请检查！'); + return true + }else if(clientComputerName !== '' && clientComputerPrinters !== 'null' && clientComputerPrinters !== null){ + var items = eval('(' + clientComputerPrinters + ')'); + var printerName = items[pageType]; + var invokeResult = LODOP.SET_PRINTER_INDEX(printerName); + if(!invokeResult){ + alert('clientComputerName指定的客户端电脑名称【'+clientComputerName+'】，标签类型【'+pageType+'】无法找到指定打印机【'+printerName+'】，请检查配置或打印机连接'); + return true + } + } + } logPrintTousse(obj, obj.barcode); doGetLodop(); window['printTemplate_' + printTemplateMap[funName]](obj); Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r36525 -r36620 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 36525) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 36620) @@ -2632,7 +2632,8 @@ } if (sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction) { - if (sessionStorage.getItem('clientComputerPrinters')) { + var clientComputerPrinters = sessionStorage.getItem('clientComputerPrinters'); + if (clientComputerPrinters !== 'null' && clientComputerPrinters !== null) { var clientComputerPrinters = eval('(' + sessionStorage.getItem('clientComputerPrinters') + ')'); var name = ''; if (type == 'smallLabel') { @@ -3290,7 +3291,7 @@ doctorAccountDepart: true, remark: true } - }else if(configureName == 'notAllowBlankFieldsOfOperationReservationForm'){ + } else if (configureName == 'notAllowBlankFieldsOfOperationReservationForm') { newArray = sstsConfig.notAllowBlankFieldsOfOperationReservationForm; obj = { operationRoom: true, Index: ssts-web/src/main/webapp/systemmanage/system/systemInfo.jsp =================================================================== diff -u -r29513 -r36620 --- ssts-web/src/main/webapp/systemmanage/system/systemInfo.jsp (.../systemInfo.jsp) (revision 29513) +++ ssts-web/src/main/webapp/systemmanage/system/systemInfo.jsp (.../systemInfo.jsp) (revision 36620) @@ -17,7 +17,16 @@ .ctcss_printBtns { height:50px; } - +.x-panel-body form{ + padding: 0 20px; +} +.x-panel-body label{ + font-weight: bold; +} +.x-form-item { + border-bottom: 1px solid #ccc; + padding: 3px 0; +}