Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js
===================================================================
diff -u -r33868 -r37073
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 33868)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.js (.../qualitymonitoringInstanceView.js) (revision 37073)
@@ -222,6 +222,67 @@
{name : 'responsiblePerson'}
];
+ var supplyRoomRecord = Ext.data.Record.create([
+ {name: 'departCode', type: 'string'},
+ {name: 'name', type: 'string'}
+ ]);
+
+ var supplyRoomStore = new Ext.data.SimpleStore({
+ 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;
+ }
+ }else{
+ supplyRoomStore.add(new supplyRoomRecord({'departCode':departCodeTemp,'name':supplyRoomData.name}));
+ if(departCodeTemp == currentOrgUnitCoding){
+ currentOrgUnitIsSupplyRoom = true;
+ }
+ }
+ }
+ }
+ //最后使供应室下拉框默认选中用户所属的当前的科室(前提是用户所属的当前的科室也在选项中)
+ if(currentOrgUnitIsSupplyRoom){
+ Ext.getCmp('querySupplyRoom').setValue(currentOrgUnitCoding);
+ }
+ }
+ }
+ });
+
+ supplyRoomRemoteStore.load();
+
var tbar = [{
text : '添加',
hidden : SSTS_QualityRecord_Create,
@@ -252,6 +313,33 @@
handler : function() {
becomeNotAudited(grid);
}
+ }, '-', {
+ text : '选择供应室:',
+ hidden : firstSupplyRoomUser == 'false'
+ }, {
+ xtype : 'multiSelect',
+ id : 'querySupplyRoom',
+ name : 'querySupplyRoom',
+ valueField : 'departCode',
+ hidden : firstSupplyRoomUser == 'false',
+ 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) {
+ combo.setValue(combo.getCheckedValue());
+ $Id("parm_s_orgUnitCoding").value = combo.getCheckedValue();
+ grid.dwrReload();
+ }
+ }
}];
var dwrCallParams = null;
Index: ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp
===================================================================
diff -u -r36618 -r37073
--- ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp (.../qualitymonitoringInstanceView.jsp) (revision 36618)
+++ ssts-web/src/main/webapp/disinfectsystem/qualitymonitoring/qualitymonitoringInstanceView.jsp (.../qualitymonitoringInstanceView.jsp) (revision 37073)
@@ -4,14 +4,18 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
<%@page import="com.forgon.disinfectsystem.labeltemplate.service.*"%>
<%@page import="com.forgon.disinfectsystem.entity.labeltemplate.*"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%
+ SupplyRoomConfigManager supplyRoomConfigManager =(SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
request.setAttribute("userName",AcegiHelper.getLoginUser().getUserFullName());
request.setAttribute("TEMPLATE_NAME_PREFIX",LabelTemplate.TEMPLATE_NAME_PREFIX);
+ String currentOrgUnitCode = AcegiHelper.getLoginUser().getCurrentOrgUnitCode();
+ request.setAttribute("firstSupplyRoomUser",supplyRoomConfigManager.isFirstSupplyRoomOrgUnit(currentOrgUnitCode));
%>
@@ -52,6 +56,10 @@
+
+
+
+
<%@ include file="/common/includeExtJs4_2.jsp"%>
@@ -87,6 +95,12 @@
SSTS_QualityRecord_Return = false;
+//查看所有供应室报表的权限
+var SSTS_View_All_Supply_Room_Report = true;
+
+ SSTS_View_All_Supply_Room_Report = false;
+
+
var enableEditBtn = false;
var enableSaveBtn = false;
var enableSaveAndNewBtn = false;
@@ -107,6 +121,8 @@
var statusUnreview = '<%=QualityMonitoringInstance.STATUS_UNREVIEW %>';
var statusReviewed = '<%=QualityMonitoringInstance.STATUS_REVIEWED %>';
var PRINT_TEMPLATE_NAME_PREFIX = '${TEMPLATE_NAME_PREFIX}';
+var firstSupplyRoomUser = '${firstSupplyRoomUser}';
+var ALL = '全部';
@@ -123,6 +139,7 @@