Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js =================================================================== diff -u -r34150 -r34548 --- ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js (.../workQualityCollectionView.js) (revision 34150) +++ ssts-web/src/main/webapp/disinfectsystem/reportforms/workQualityCollectionView.js (.../workQualityCollectionView.js) (revision 34548) @@ -2,151 +2,151 @@ var grid; var supplyRoomStore; -var rd = new Ext.data.JsonReader( { - fields : [ - {name : 'id'}, - {name : 'departId'}, - {name : 'name'} - +var rd = new Ext.data.JsonReader({ + fields: [ + { name: 'id' }, + { name: 'departId' }, + { name: 'name' } + ] }); supplyRoomStore = new Ext.data.Store({ - proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', - method : 'POST' + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', + method: 'POST' }), - baseParams :{type:"12"}, - reader : rd, - listeners:{ - load :function (thiz,records,options ){ - if(records.length >0){ + baseParams: { type: "12" }, + reader: rd, + listeners: { + load: function (thiz, records, options) { + if (records.length > 0) { Ext.getCmp('departCoding').setValue(records[0].data.departId); Ext.getCmp('querySupplyRoom').setValue(records[0].data.name); } } } }); var myMask; -Ext.onReady(function() { +Ext.onReady(function () { Ext.QuickTips.init(); - entityName = sstsConfig.workQualityCollectionReportConfiguration?(sstsConfig.workQualityCollectionReportConfiguration.reportName || '工作质量持续收集统计报表'):'工作质量持续收集统计报表'; + entityName = sstsConfig.workQualityCollectionReportConfiguration ? (sstsConfig.workQualityCollectionReportConfiguration.reportName || entityName) : entityName; //20181225 var supplyRoomRecord = Ext.data.Record.create([ - {name: 'departCode', type: 'string'}, - {name: 'name', type: 'string'} + { name: 'departCode', type: 'string' }, + { name: 'name', type: 'string' } ]); var supplyRoomStore = new Ext.data.SimpleStore({ - fields : ['departCode','name'] - }); - + fields: ['departCode', 'name'] + }); + var supplyRoomRemoteStore = new Ext.data.Store({ - proxy : new Ext.data.HttpProxy({ - url : WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', - method : 'POST' - }), - baseParams :{type:"12"}, - // reader : rd, - 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; + proxy: new Ext.data.HttpProxy({ + url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!loadSupplyRoomConfigRoom.do', + method: 'POST' + }), + baseParams: { type: "12" }, + // reader : rd, + 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; + } } - }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('querySupplyRoom').setValue(currentOrgUnitCoding); + } } - if(supplyRoomStore.getCount() > 1){ - supplyRoomStore.insert(0 , new supplyRoomRecord({'departCode':ALL,'name':ALL})); - } - //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中) - if(currentOrgUnitIsSupplyRoom){ - Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding); - } } - } -}); + }); //20181225 end // 记录cookie(3步) - function reloadReport(){ - var year= $Id('year').value; - + function reloadReport() { + var year = $Id('year').value; + var departCoding = Ext.getCmp('querySupplyRoom').value; - if(departCoding.indexOf(ALL) == 0){ + if (departCoding.indexOf(ALL) == 0) { departCoding = ""; } - var type= Ext.getCmp('type').getValue(); - + var type = Ext.getCmp('type').getValue(); + myMask = new Ext.LoadMask(Ext.getBody(), { msg: '正在加载,请稍候!', removeMask: true }); myMask.show(); var hidePartOfWorkQualityCollection = false; - if(sstsConfig.hasOwnProperty('isHidePartOfWorkQualityCollection') && sstsConfig.isHidePartOfWorkQualityCollection){ + if (sstsConfig.hasOwnProperty('isHidePartOfWorkQualityCollection') && sstsConfig.isHidePartOfWorkQualityCollection) { hidePartOfWorkQualityCollection = true; } var isZSYYWorkQualityCollection = false; - if(sstsConfig.hasOwnProperty('isZSYYWorkQualityCollection') && sstsConfig.isZSYYWorkQualityCollection){ + if (sstsConfig.hasOwnProperty('isZSYYWorkQualityCollection') && sstsConfig.isZSYYWorkQualityCollection) { isZSYYWorkQualityCollection = true; } var isXjjqzyyWorkQualityCollection = false; - if(sstsConfig.hasOwnProperty('isXjjqzyyWorkQualityCollection') && sstsConfig.isXjjqzyyWorkQualityCollection){ + if (sstsConfig.hasOwnProperty('isXjjqzyyWorkQualityCollection') && sstsConfig.isXjjqzyyWorkQualityCollection) { isXjjqzyyWorkQualityCollection = true; } var jasperReportName = ""; - if(sstsConfig.hasOwnProperty('workQualityCollectionReportConfiguration')){ + if (sstsConfig.hasOwnProperty('workQualityCollectionReportConfiguration')) { jasperReportName = "workQualityCollectionCustom.jasper"; - if(type == 'split'){ + if (type == 'split') { // 上下半年对比 jasperReportName = "workQualityCollectionCustom2.jasper"; - }else if(type == 'compareToLastYear'){ + } else if (type == 'compareToLastYear') { // 跟去年对比 jasperReportName = "workQualityCollectionCustom3.jasper"; } - }else{ + } else { jasperReportName = "workQualityCollection.jasper"; - if(type == 'split'){ + if (type == 'split') { // 上下半年对比 jasperReportName = "workQualityCollection2.jasper"; - }else if(type == 'compareToLastYear'){ + } else if (type == 'compareToLastYear') { // 跟去年对比 jasperReportName = "workQualityCollection3.jasper"; } - if(hidePartOfWorkQualityCollection == true){ + if (hidePartOfWorkQualityCollection == true) { // 全年 var jasperReportName = "workQualityCollection4.jasper"; - if(type == 'split'){ + if (type == 'split') { // 上下半年对比 jasperReportName = "workQualityCollection5.jasper"; - }else if(type == 'compareToLastYear'){ + } else if (type == 'compareToLastYear') { // 跟去年对比 jasperReportName = "workQualityCollection6.jasper"; } @@ -155,188 +155,167 @@ var url = WWWROOT + '/jasperreports/jasperreportsAction!createReportFromJavaBeanSource.do'; var params = { - jasperreportName : jasperReportName, - isZSYYWorkQualityCollection : isZSYYWorkQualityCollection, - querySupplyRoom : departCoding, - isXjjqzyyWorkQualityCollection : isXjjqzyyWorkQualityCollection, - year : year, - type : type, - isHidePartOfWorkQualityCollection : hidePartOfWorkQualityCollection, - reportName:'workQualityCollection' + jasperreportName: jasperReportName, + isZSYYWorkQualityCollection: isZSYYWorkQualityCollection, + querySupplyRoom: departCoding, + isXjjqzyyWorkQualityCollection: isXjjqzyyWorkQualityCollection, + year: year, + type: type, + isHidePartOfWorkQualityCollection: hidePartOfWorkQualityCollection, + reportName: 'workQualityCollection' } - searchReport(url,params); + searchReport(url, params); } - var sign = true; - var dwrCallParams = null; - - Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function() { + var sign = true; + var dwrCallParams = null; - }; - - var departJsonStore = new Ext.data.SimpleStore({ - fields : [ 'departName' ], - url : WWWROOT + '/disinfectSystem/reportFormsCenterAction!getAllDepartName.do' - }); - - var form = new Ext.form.FormPanel({ - title : entityName, - region : 'north', - labelAlign : 'right', - buttonAlign : 'center', - collapsible : true, - collapseMode : 'mini', - split : true, - border : 0, - frame : true, - bodyStyle : 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px; - height : 110, - labelWidth :90, - items : [{ - xtype : 'hidden', - name : 'departCoding', - id : 'departCoding' - },{ - layout : 'column', - height : 40, - items : [{ - width : 220, - layout : 'form', - items : [ - new Ext.ux.MonthField({ - id:'year', - name : 'year', - fieldLabel : '年月', - readOnly : true, - width : 140, - format:'Y', - value : new Date(), - anchor : '95%', - listeners : { - specialkey : function(field, ee) { - if (ee.getKey() == Ext.EventObject.ENTER) { - initQueryValueAndReload(); - } - } - } - })] - },{ + Ext.ux.ForgonPageGrid.prototype.getGridParameterMap = function () { - width : 300, - layout : 'form', - labelSeparator : '选择供应室:', - items : [{//20181225 - xtype : 'multiSelect', - id : 'querySupplyRoom', - name : 'querySupplyRoom', - valueField : 'departCode', - displayField : 'name', - minChars : 0, - allowBlank : true, - editable : false, - store : supplyRoomStore, - forceSelection : false, - mode : 'local', - triggerAction : 'all', - lazyInit : true, - typeAhead : false, - anchor : '95%', + }; + + var departJsonStore = new Ext.data.SimpleStore({ + fields: ['departName'], + url: WWWROOT + '/disinfectSystem/reportFormsCenterAction!getAllDepartName.do' + }); + + var form = new Ext.form.FormPanel({ + title: entityName, + region: 'north', + labelAlign: 'right', + buttonAlign: 'center', + collapsible: true, + collapseMode: 'mini', + split: true, + border: 0, + frame: true, + bodyStyle: 'padding:0px auto;margin:0px',// padding:1px;padding-top:5px; + height: 110, + labelWidth: 90, + items: [{ + xtype: 'hidden', + name: 'departCoding', + id: 'departCoding' + }, { + layout: 'column', + height: 40, + items: [{ + width: 220, + layout: 'form', + items: [ + new Ext.ux.MonthField({ + id: 'year', + name: 'year', + fieldLabel: '年月', + readOnly: true, + width: 140, + format: 'Y', + value: new Date(), + anchor: '95%', listeners: { - select: function (combo, record, index) { - //1、如果选中“全部”的项,则把所有的项选中,反之全部取消选择 - if (record.get('departCode') == ALL) { - if (record.get('checked')) { - combo.selectAll(); - } else { - combo.deselectAll(); - } + specialkey: function (field, ee) { + if (ee.getKey() == Ext.EventObject.ENTER) { + initQueryValueAndReload(); } - //2、如果已经选中所有的项,则把“全部”项选中,反之把“全部”项取消选择 - var selectAll = true; - combo.store.each(function(record) { - if (record.get('departCode') != ALL && !record.get(this.checkField)) { - selectAll = false; - return; - } - }, combo); - var all = combo.store.getAt(0); - if (selectAll) { - all.set(combo.checkField, true); + } + } + })] + }, { + + width: 300, + layout: 'form', + labelSeparator: '选择供应室:', + items: [{//20181225 + xtype: 'multiSelect', + id: 'querySupplyRoom', + name: 'querySupplyRoom', + valueField: 'departCode', + displayField: 'name', + minChars: 0, + allowBlank: true, + editable: false, + store: supplyRoomStore, + forceSelection: false, + mode: 'local', + triggerAction: 'all', + lazyInit: true, + typeAhead: false, + anchor: '95%', + listeners: { + select: function (combo, record, index) { + //1、如果选中“全部”的项,则把所有的项选中,反之全部取消选择 + if (record.get('departCode') == ALL) { + if (record.get('checked')) { + combo.selectAll(); } else { - all.set(combo.checkField, false); + combo.deselectAll(); } - combo.setValue(combo.getCheckedValue()); } + //2、如果已经选中所有的项,则把“全部”项选中,反之把“全部”项取消选择 + var selectAll = true; + combo.store.each(function (record) { + if (record.get('departCode') != ALL && !record.get(this.checkField)) { + selectAll = false; + return; + } + }, combo); + var all = combo.store.getAt(0); + if (selectAll) { + all.set(combo.checkField, true); + } else { + all.set(combo.checkField, false); + } + combo.setValue(combo.getCheckedValue()); } - - }] -// items : [{ -// xtype : 'combo', -// id : 'querySupplyRoom', -// name : 'querySupplyRoom', -// valueField : 'departId', -// displayField : 'name', -// allowBlank : true, -// editable : false, -// store : supplyRoomStore, -// forceSelection : true, -// mode : 'local', -// triggerAction : 'all', -// listeners : { -// 'select' : function(combo,record,index){ -// Ext.getCmp('departCoding').setValue(record.data.departId); -// } -// }, -// anchor : '95%' -// }] - - },{ - layout : 'form', - items : [new Ext.ux.RadioGroup({ - fieldLabel : "查询方式", - allowBlank : false, - horizontal:true, - defaultValue:'allYear', - name : "type", - id : "type", - radios:[{boxLabel:'整年',value:'allYear'}, - {boxLabel:'上半年、下半年对比',value:'split'}, - {boxLabel:'与去年对比',value:'compareToLastYear'}] - }) ] - }] - }], - buttons:[{ + } - xtype : 'button', - text : '查询', - minWidth : 70, - iconCls : 'icon_search', - handler : function() { - reloadReport(); - } + }] + }, { + layout: 'form', + items: [new Ext.ux.RadioGroup({ + fieldLabel: "查询方式", + allowBlank: false, + horizontal: true, + defaultValue: 'allYear', + name: "type", + id: "type", + radios: [{ boxLabel: '整年', value: 'allYear' }, + { boxLabel: '上半年、下半年对比', value: 'split' }, + { boxLabel: '与去年对比', value: 'compareToLastYear' }] + })] }] - }); - - - var reportForm = new Ext.Panel({ - frame:false,//渲染面板 - autoScroll:true,//自动显示滚动条 - collapsible:true,//允许展开和收缩 - bodyPadding:5, - html:'' - }); - - - var viewport = new Ext.Viewport({ - layout : 'border', - items : [form, { - id:'reportPanel', - region : 'center', - margins : '0 0 0 0', - layout : 'fit', - items : reportForm - }] - }); - //supplyRoomStore.load(); - supplyRoomRemoteStore.load();//20181225 - }); \ No newline at end of file + }], + buttons: [{ + xtype: 'button', + text: '查询', + minWidth: 70, + iconCls: 'icon_search', + handler: function () { + reloadReport(); + } + }] + }); + + + var reportForm = new Ext.Panel({ + frame: false,//渲染面板 + autoScroll: true,//自动显示滚动条 + collapsible: true,//允许展开和收缩 + bodyPadding: 5, + html: '' + }); + + + var viewport = new Ext.Viewport({ + layout: 'border', + items: [form, { + id: 'reportPanel', + region: 'center', + margins: '0 0 0 0', + layout: 'fit', + items: reportForm + }] + }); + + supplyRoomRemoteStore.load();//20181225 +}); \ No newline at end of file