Index: ssts-web/src/main/webapp/js/common.js =================================================================== diff -u -r36229 -r36430 --- ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 36229) +++ ssts-web/src/main/webapp/js/common.js (.../common.js) (revision 36430) @@ -2631,33 +2631,33 @@ return null; } - if(sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction){ - if(sessionStorage.getItem('clientComputerPrinters')){ - var clientComputerPrinters = eval('('+sessionStorage.getItem('clientComputerPrinters')+')'); + if (sstsConfig.enablePrintLabelsOutputPrinterSettingsFunction) { + if (sessionStorage.getItem('clientComputerPrinters')) { + var clientComputerPrinters = eval('(' + sessionStorage.getItem('clientComputerPrinters') + ')'); var name = ''; - if(type == 'smallLabel'){ + if (type == 'smallLabel') { name = '小标签'; - }else if(type == 'smallLabel2'){ + } else if (type == 'smallLabel2') { name = '小标签2'; - }else if(type == 'middleLable'){ + } else if (type == 'middleLable') { name = '中标签'; - }else if(type == 'middleLable2'){ + } else if (type == 'middleLable2') { name = '中标签2'; - }else if(type == 'largeLabel'){ + } else if (type == 'largeLabel') { name = '大标签'; - }else if(type == 'largeLabel2'){ + } else if (type == 'largeLabel2') { name = '大标签2'; - }else if(type == 'exLargeLabel'){ + } else if (type == 'exLargeLabel') { name = '加大标签'; - }else { + } else { name = type; } if (clientComputerPrinters[name] != undefined) { printerName = clientComputerPrinters[name]; } } return printerName; - }else { + } else { // 改为通过jason对象来获取，不用ini的方式了。 if (typeof (printerNameMapping) != 'undefined' && printerNameMapping != null) { if (printerNameMapping[type] != undefined) { @@ -4306,11 +4306,11 @@ var records = top.Ext.getCmp('select_TypeGrid').getSelectionModel().getSelections(); top.Ext.getCmp('select_TypeGrid').getStore().remove(records[0]); } -function setInstrumentSetType(extHiddenElementId, extComboElementId, ids, names) { +function setInstrumentSetType(extHiddenElementId, extComboElementId, ids, names, callback) { //科室的窗口 var win; //确定保存 - function saveSelect(extHiddenElementId, extComboElementId) { + function saveSelect(extHiddenElementId, extComboElementId, callback) { var idsArr = []; var nameArr = []; for (var i = 0; i < select_TypeGridStore.getCount(); i++) { @@ -4326,6 +4326,9 @@ Ext.getCmp(extHiddenElementId).setValue(idsArr.join(";")); Ext.getCmp(extComboElementId).setValue(nameArr.join(";")); } + if (callback) { + callback(idsArr.join(";"), nameArr.join(";")); + } } else { if (top.Ext.getCmp(extHiddenElementId)) { top.Ext.getCmp(extHiddenElementId).setValue(""); @@ -4334,6 +4337,9 @@ Ext.getCmp(extHiddenElementId).setValue(""); Ext.getCmp(extComboElementId).setValue(""); } + if (callback) { + callback('', ''); + } } select_TypeGridStore.removeAll(); win.close(); @@ -4489,7 +4495,7 @@ id: 'saveBtn2', text: '确定', handler: function () { - saveSelect(extHiddenElementId, extComboElementId); + saveSelect(extHiddenElementId, extComboElementId, callback); } }, { id: 'cancleBtn2', @@ -4677,7 +4683,7 @@ * 兼容IE * LZString.js */ - function exportReportExcel(data, thisID, is2Column, widthArr) { +function exportReportExcel(data, thisID, is2Column, widthArr) { var fileName = data.fileName + data.fileType; if (isIE()) { var iframeName = data.iframeName || 'thisIframe'; @@ -4994,173 +5000,173 @@ } //RFID感应范围调节 -function updateRSSI(rssiValue,id) { - var formObj = new top.Ext4.form.Panel({ - width: 800, - height: 200, - bodyStyle: 'padding: 10px;', - buttonAlign: 'left', - // 拉动滑块的时候会显示值 - defaults: { - anchor: '95%', - border: false - }, - items: [{ - layout: 'column', - items: [{ - layout: 'form', - columnWidth: 0.7, - border: false, - items: [{ - xtype: 'sliderfield', - tipText: function (thumb) { - return '-' + String(100 - thumb.value); - }, - value: (100-rssiValue), - height: 25, - id: 'sliderValue', - name: 'sliderValue', - listeners: { - change: function (field, nV, oV) { - top.Ext4.getCmp('rssiValue').setValue(100 - nV) - } - } - }] - }, { - layout: 'form', - columnWidth: 0.25, - style: 'margin-left: 10px;', - border: false, - items: [{ - xtype: 'numberfield', - id: 'rssiValue', - name: 'rssiValue', - value: rssiValue, - maxValue: 100, - minValue: 0, - listeners: { - change: function (field, nV, oV) { - top.Ext4.getCmp('sliderValue').setValue(100 - nV) - } - } - }] - }] - }] - }); - var rssiWindow = new top.Ext4.Window({ - layout: 'fit', - title: 'RFID感应范围调节(-100 到 0)', - width: 400, - border: true, - modal: true, - height: 200, - plain: true, - items: [formObj], - buttonAlign: 'center', - buttons: [{ - text: '确定', - handler: function () { - var value = top.Ext4.getCmp('sliderValue').getValue(); - var params = {}; - if(id !== ''){ - params = { - id:id, - rssiValue:100-value - } - }else { - params = { - rssiValue:100-value - } - } - Ext.Ajax.request({ - url: WWWROOT + '/disinfectSystem/rssiRecordAction!saveRssiRecord.do', - params: params, - success: function (response, options) { - showResult("保存成功！"); - sessionStorage.setItem('rssiValue',params.rssiValue) - rssiWindow.close(); - }, - failure: function (response, options) { - showResult("保存失败!"); - } - }); - } - }, { - text: '取消', - handler: function () { - rssiWindow.close(); - } - }] - }); +function updateRSSI(rssiValue, id) { + var formObj = new top.Ext4.form.Panel({ + width: 800, + height: 200, + bodyStyle: 'padding: 10px;', + buttonAlign: 'left', + // 拉动滑块的时候会显示值 + defaults: { + anchor: '95%', + border: false + }, + items: [{ + layout: 'column', + items: [{ + layout: 'form', + columnWidth: 0.7, + border: false, + items: [{ + xtype: 'sliderfield', + tipText: function (thumb) { + return '-' + String(100 - thumb.value); + }, + value: (100 - rssiValue), + height: 25, + id: 'sliderValue', + name: 'sliderValue', + listeners: { + change: function (field, nV, oV) { + top.Ext4.getCmp('rssiValue').setValue(100 - nV) + } + } + }] + }, { + layout: 'form', + columnWidth: 0.25, + style: 'margin-left: 10px;', + border: false, + items: [{ + xtype: 'numberfield', + id: 'rssiValue', + name: 'rssiValue', + value: rssiValue, + maxValue: 100, + minValue: 0, + listeners: { + change: function (field, nV, oV) { + top.Ext4.getCmp('sliderValue').setValue(100 - nV) + } + } + }] + }] + }] + }); + var rssiWindow = new top.Ext4.Window({ + layout: 'fit', + title: 'RFID感应范围调节(-100 到 0)', + width: 400, + border: true, + modal: true, + height: 200, + plain: true, + items: [formObj], + buttonAlign: 'center', + buttons: [{ + text: '确定', + handler: function () { + var value = top.Ext4.getCmp('sliderValue').getValue(); + var params = {}; + if (id !== '') { + params = { + id: id, + rssiValue: 100 - value + } + } else { + params = { + rssiValue: 100 - value + } + } + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/rssiRecordAction!saveRssiRecord.do', + params: params, + success: function (response, options) { + showResult("保存成功！"); + sessionStorage.setItem('rssiValue', params.rssiValue) + rssiWindow.close(); + }, + failure: function (response, options) { + showResult("保存失败!"); + } + }); + } + }, { + text: '取消', + handler: function () { + rssiWindow.close(); + } + }] + }); - rssiWindow.show(); + rssiWindow.show(); } //获取供应室store -function getSupplyRoomStore(domID){ +function getSupplyRoomStore(domID) { var supplyRoomStore = new Ext.data.SimpleStore({ - fields: ['departCode', 'name'] - }); - var supplyRoomRecord = Ext.data.Record.create([ - { name: 'departCode', type: 'string' }, - { name: 'name', type: 'string' } - ]); - /** - * “供应室combo”的store,仅用于普通的ajax请求的数据源 - */ - var supplyRoomRemoteStore = new Ext.data.Store({ - proxy: new Ext.data.HttpProxy({ - url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', - method: 'POST' - }), - baseParams: { type: "12" }, - reader: new Ext.data.JsonReader({ - fields: [ - { name: 'id', mapping: 'id' }, - { name: 'departCode', mapping: 'departId' }, - { name: 'name', mapping: 'name' } - ] - }), - listeners: { - beforeload: function () { - loadMask = new Ext.LoadMask(Ext.getBody(), { - msg: '正在加载供应室...，请稍候！', removeMask: true - }); - loadMask.show(); - }, - load: function (thiz, records, options) { - loadMask.hide(); - var currentOrgUnitIsSupplyRoom = false; - if (records && records.length > 0) { - for (var i = 0; i < records.length; i++) { - var supplyRoomData = records[i].data; - var departCodeTemp = supplyRoomData.departCode; - //如果没有查看其它供应室权限时,只显示是当前用户的科室 - if (SSTS_View_All_Supply_Room_Report) { - if (departCodeTemp == currentOrgUnitCoding) { - supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name })); - currentOrgUnitIsSupplyRoom = true; - } - } else { - supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name })); - if (departCodeTemp == currentOrgUnitCoding) { - currentOrgUnitIsSupplyRoom = true; - } - } - } - } - if (supplyRoomStore.getCount() > 1) { - supplyRoomStore.insert(0, new supplyRoomRecord({ 'departCode': ALL, 'name': ALL })); - } - //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中) - if (currentOrgUnitIsSupplyRoom) { - Ext.getCmp(domID).setValue(currentOrgUnitCoding); - } - } - } - }); - - supplyRoomRemoteStore.load(); + fields: ['departCode', 'name'] + }); + var supplyRoomRecord = Ext.data.Record.create([ + { name: 'departCode', type: 'string' }, + { name: 'name', type: 'string' } + ]); + /** + * “供应室combo”的store,仅用于普通的ajax请求的数据源 + */ + var supplyRoomRemoteStore = new Ext.data.Store({ + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', + method: 'POST' + }), + baseParams: { type: "12" }, + reader: new Ext.data.JsonReader({ + fields: [ + { name: 'id', mapping: 'id' }, + { name: 'departCode', mapping: 'departId' }, + { name: 'name', mapping: 'name' } + ] + }), + listeners: { + beforeload: function () { + loadMask = new Ext.LoadMask(Ext.getBody(), { + msg: '正在加载供应室...，请稍候！', removeMask: true + }); + loadMask.show(); + }, + load: function (thiz, records, options) { + loadMask.hide(); + var currentOrgUnitIsSupplyRoom = false; + if (records && records.length > 0) { + for (var i = 0; i < records.length; i++) { + var supplyRoomData = records[i].data; + var departCodeTemp = supplyRoomData.departCode; + //如果没有查看其它供应室权限时,只显示是当前用户的科室 + if (SSTS_View_All_Supply_Room_Report) { + if (departCodeTemp == currentOrgUnitCoding) { + supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name })); + currentOrgUnitIsSupplyRoom = true; + } + } else { + supplyRoomStore.add(new supplyRoomRecord({ 'departCode': departCodeTemp, 'name': supplyRoomData.name })); + if (departCodeTemp == currentOrgUnitCoding) { + currentOrgUnitIsSupplyRoom = true; + } + } + } + } + if (supplyRoomStore.getCount() > 1) { + supplyRoomStore.insert(0, new supplyRoomRecord({ 'departCode': ALL, 'name': ALL })); + } + //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中) + if (currentOrgUnitIsSupplyRoom) { + Ext.getCmp(domID).setValue(currentOrgUnitCoding); + } + } + } + }); + supplyRoomRemoteStore.load(); + return supplyRoomStore; } \ No newline at end of file