Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.jsp
===================================================================
diff -u -r36601 -r36668
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.jsp (.../accessListView.jsp) (revision 36601)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.jsp (.../accessListView.jsp) (revision 36668)
@@ -3,9 +3,18 @@
<%@ include file="/common/includeExtJsAndCss.jsp"%>
<%@ include file="/common/includeExtJs4_2.jsp"%>
<%@ page import="com.forgon.tools.SpringBeanManger" %>
+<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager" %>
<%
String userName = AcegiHelper.getLoginUser().getUserFullName();
request.setAttribute("userName",userName);
+ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager) SpringBeanManger.getBean("supplyRoomConfigManager");
+ String firstRoomOrgCode = supplyRoomConfigManager.getFirstSupplyRoomConfig().getOrgUnitCoding();
+ String currentOrgUnitCode = AcegiHelper.getCurrentOrgUnitCode();
+ boolean isFirstSupplyRoom = false;
+ if (currentOrgUnitCode.equals(firstRoomOrgCode)) {
+ isFirstSupplyRoom = true;
+ }
+ request.setAttribute("isFirstSupplyRoom",isFirstSupplyRoom);
%>
@@ -14,6 +23,11 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.js
===================================================================
diff -u -r36601 -r36668
--- ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.js (.../accessListView.js) (revision 36601)
+++ ssts-web/src/main/webapp/disinfectsystem/storageLocationManage/accessListView.js (.../accessListView.js) (revision 36668)
@@ -23,7 +23,48 @@
});
//查询
-function search(listStore, params) {
+function search(listStore) {
+ var startDate = Ext4.getCmp('startDate').getRawValue();
+ var endDate = Ext4.getCmp('endDate').getRawValue();
+ var barcode = Ext4.getCmp('barcode').getValue();
+ var tousseName = Ext4.getCmp('tousseName').getValue();
+ var orgUnitCode = '';
+ if (isFirstSupplyRoom) {
+ orgUnitCode = Ext4.getCmp('orgUnitCode').getValue();
+ } else {
+ orgUnitCode = currentOrgUnitCoding;
+ }
+ var wareHouseId = Ext4.getCmp('wareHouseId').getValue();
+
+ if (startDate || endDate) {
+ if (!compareDate(startDate, endDate)) {
+ showResult("开始时间不能大于结束时间");
+ return;
+ }
+ }
+
+ var params = {
+ startDate: startDate,
+ endDate: endDate
+ }
+
+ //条码
+ if (!isUndefinedOrNullOrEmpty(barcode)) {
+ params.barcode = barcode;
+ }
+ //物品名称
+ if (!isUndefinedOrNullOrEmpty(tousseName)) {
+ params.tousseName = tousseName;
+ }
+ //所属科室
+ if (!isUndefinedOrNullOrEmpty(orgUnitCode)) {
+ params.orgUnitCode = orgUnitCode;
+ }
+ //仓库
+ if (!isUndefinedOrNullOrEmpty(wareHouseId)) {
+ params.wareHouseId = wareHouseId;
+ }
+
listStore.proxy.extraParams = params;
listStore.loadPage(1);
}
@@ -241,6 +282,7 @@
}, {
layout: 'form',
columnWidth: 0.25,
+ hidden: !isFirstSupplyRoom,
items: [{
xtype: 'combo',
fieldLabel: '所属科室',
@@ -291,43 +333,7 @@
minWidth: 70,
iconCls: 'icon_search',
handler: function () {
- var startDate = Ext4.getCmp('startDate').getRawValue();
- var endDate = Ext4.getCmp('endDate').getRawValue();
- var barcode = Ext4.getCmp('barcode').getValue();
- var tousseName = Ext4.getCmp('tousseName').getValue();
- var orgUnitCode = Ext4.getCmp('orgUnitCode').getValue();
- var wareHouseId = Ext4.getCmp('wareHouseId').getValue();
-
- if (startDate || endDate) {
- if (!compareDate(startDate, endDate)) {
- showResult("开始时间不能大于结束时间");
- return;
- }
- }
-
- var params = {
- startDate: startDate,
- endDate: endDate
- }
-
- //条码
- if (!isUndefinedOrNullOrEmpty(barcode)) {
- params.barcode = barcode;
- }
- //物品名称
- if (!isUndefinedOrNullOrEmpty(tousseName)) {
- params.tousseName = tousseName;
- }
- //所属科室
- if (!isUndefinedOrNullOrEmpty(orgUnitCode)) {
- params.orgUnitCode = orgUnitCode;
- }
- //仓库
- if (!isUndefinedOrNullOrEmpty(wareHouseId)) {
- params.wareHouseId = wareHouseId;
- }
-
- search(listStore, params);
+ search(listStore);
}
}, {
xtype: 'button',
@@ -339,7 +345,9 @@
Ext4.getCmp('endDate').setValue(new Date());
Ext4.getCmp('barcode').setValue("");
Ext4.getCmp('tousseName').setValue("");
- Ext4.getCmp('orgUnitCode').setValue("");
+ if (isFirstSupplyRoom) {
+ Ext4.getCmp('orgUnitCode').setValue("");
+ }
Ext4.getCmp('wareHouseId').setValue("");
}
}, {
@@ -352,7 +360,11 @@
var endDate = Ext4.getCmp('endDate').getRawValue();
var barcode = Ext4.getCmp('barcode').getValue();
var tousseName = Ext4.getCmp('tousseName').getValue();
- var orgUnitCode = Ext4.getCmp('orgUnitCode').getValue();
+ if (isFirstSupplyRoom) {
+ orgUnitCode = Ext4.getCmp('orgUnitCode').getValue();
+ } else {
+ orgUnitCode = currentOrgUnitCoding;
+ }
var wareHouseId = Ext4.getCmp('wareHouseId').getValue();
if (startDate || endDate) {
@@ -397,4 +409,6 @@
}]
});
+ search(listStore);
+
});
\ No newline at end of file