Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js
===================================================================
diff -u -r36430 -r39058
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 36430)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.js (.../tousseWorkLoadView.js) (revision 39058)
@@ -1073,5 +1073,9 @@
}]
});
supplyRoomRemoteStore.load();//20181225
-
+ //QYSQXQRMYY-11：若当前登录科室不为“一、二级供应室”，则“申请科室”的值为当前科室，且不可改变
+ if(supplyRoomType == '0'){
+ Ext.getCmp('applicationDepart').setRawValue(currentOrgUnitName);
+ Ext.getCmp('applicationDepart').disable();
+ }
});
\ No newline at end of file
Index: ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp
===================================================================
diff -u -r36219 -r39058
--- ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 36219)
+++ ssts-web/src/main/webapp/disinfectsystem/reportforms/tousseWorkLoadView.jsp (.../tousseWorkLoadView.jsp) (revision 39058)
@@ -1,11 +1,19 @@
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.reportoption.GoodsOption"%>
<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition"%>
+<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%>
<%@ page contentType="text/html; charset=UTF-8"%>
<%@ include file="/common/taglibs.jsp"%>
<%@ include file="/common/includeExtJsAndCss.jsp"%>
+<%
+ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+ String orgUnitCoding = AcegiHelper.getLoginUser().getOrgUnitCodingFromSupplyRoomConfig();
+ int supplyRoomType = supplyRoomConfigManager.getSupplyRoomTypeByOrgUnitCoding(orgUnitCoding);
+ request.setAttribute("supplyRoomType", supplyRoomType);
+%>
@@ -52,7 +60,7 @@
var enableEditBtn = false;
var enableSaveBtn = false;
var enableSaveAndNewBtn = false;
-
+var supplyRoomType = '${supplyRoomType}';
enableEditBtn = true;
@@ -102,6 +110,7 @@
var ALL = '全部';
//当前用户所在的当前科室
var currentOrgUnitCoding = '<%=AcegiHelper.getCurrentOrgUnitCode()%>';
+ var currentOrgUnitName = '<%=AcegiHelper.getCurrentOrgUnitName()%>';
//查看所有供应室报表的权限
var SSTS_View_All_Supply_Room_Report = true;