Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp
===================================================================
diff -u -r34739 -r34753
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp (.../changePosition.jsp) (revision 34739)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.jsp (.../changePosition.jsp) (revision 34753)
@@ -60,6 +60,7 @@
+
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp
===================================================================
diff -u -r34739 -r34753
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp (.../unReturnTousseList.jsp) (revision 34739)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp (.../unReturnTousseList.jsp) (revision 34753)
@@ -1,3 +1,5 @@
+<%@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"%>
@@ -9,6 +11,21 @@
手术仪器未归还列表
+<%
+ SupplyRoomConfigManager supplyRoomConfigManager = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+ SupplyRoomConfig supplyRoomConfig = supplyRoomConfigManager.getSystemParamsObj();
+ //是否启用领用人
+ request.setAttribute("isEnableTousseOpRecipient",supplyRoomConfig.getIsEnableTousseOpRecipient());
+ //是否启用目的位置
+ request.setAttribute("isEnableTousseOpDestLocation",supplyRoomConfig.getIsEnableTousseOpDestLocation());
+ //是否启用签收
+ request.setAttribute("isEnableTousseOpSign",supplyRoomConfig.getIsEnableTousseOpSign());
+%>
+
Index: ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js
===================================================================
diff -u -r34746 -r34753
--- ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34746)
+++ ssts-web/src/main/webapp/disinfectsystem/config/ksdqdyrmyy/menu/menuconfigure.js (.../menuconfigure.js) (revision 34753)
@@ -439,7 +439,7 @@
children:[
{hidden :SSTS_Tousse,text:"仪器班物品管理",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_TousseTraceabilityInquiry,text:"手术仪器追溯查询",href:WWWROOT+'/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :false,text:"手术仪器未归还列表",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp',hrefTarget:linkTarget,leaf:true}
+ {hidden :isEnableTousseUnReturnWarn == 'false',text:"手术仪器未归还列表",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
text:"干预管理",
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js
===================================================================
diff -u -r34739 -r34753
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js (.../unReturnTousseList.js) (revision 34739)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.js (.../unReturnTousseList.js) (revision 34753)
@@ -5,15 +5,27 @@
Ext4.QuickTips.init();
var pageSize = 20;
+ var recipient = '领用人';
+ if (sstsConfig.enableSurgicalInstrumentsManagement) {
+ if (sstsConfig.aliasNameOfSurgicalInstrumentsManagement) {
+ var aliasNameOfSurgicalInstrumentsManagement = sstsConfig.aliasNameOfSurgicalInstrumentsManagement || [];
+ for (var i = 0; i < aliasNameOfSurgicalInstrumentsManagement.length; i++) {
+ if (aliasNameOfSurgicalInstrumentsManagement[i].fieldName == 'recipient') {
+ recipient = aliasNameOfSurgicalInstrumentsManagement[i].displayText;
+ }
+ }
+ }
+ }
+
var columns = [
{ header: "仪器名称", dataIndex: 'tousseName', width: 150, sortable: false },
{ header: "器械包条码", dataIndex: 'barcode', width: 100, sortable: false },
{ header: "标识牌条码", dataIndex: '', width: 100, sortable: false },
{ header: "数量", dataIndex: 'invoiceAmount', width: 80, sortable: false },
{ header: "出库操作人", dataIndex: 'invoiceOperator', width: 80, sortable: false },
- { header: "签收操作人", dataIndex: 'signOperator', width: 80, sortable: false },
- { header: "领用人", dataIndex: 'invoiceRecipient', width: 80, sortable: false },
- { header: "目的位置", dataIndex: 'invoiceDestLocation', width: 120, sortable: false },
+ { header: "签收操作人", dataIndex: 'signOperator', width: 80, sortable: false, hidden: isEnableTousseOpSign == 'false' },
+ { header: recipient, dataIndex: 'invoiceRecipient', width: 80, sortable: false, hidden: isEnableTousseOpRecipient == 'false' },
+ { header: "目的位置", dataIndex: 'invoiceDestLocation', width: 120, sortable: false, hidden: isEnableTousseOpDestLocation == 'false' },
{ header: "操作时间", dataIndex: 'invoiceTime', width: 140, sortable: false }
];
@@ -75,11 +87,11 @@
}
}
}, {
- text: '查询',
- handler: function () {
- listStore.load();
- }
- }],
+ text: '查询',
+ handler: function () {
+ listStore.load();
+ }
+ }],
dockedItems: [{
xtype: 'pagingtoolbar',
store: listStore,
Index: ssts-web/src/main/webapp/homepage/menuconfigure.js
===================================================================
diff -u -r34739 -r34753
--- ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34739)
+++ ssts-web/src/main/webapp/homepage/menuconfigure.js (.../menuconfigure.js) (revision 34753)
@@ -497,7 +497,7 @@
children:[
{hidden :SSTS_Tousse,text:"仪器班物品管理",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/instrumentRoomGoodsManagement.jsp?editMode=true',hrefTarget:linkTarget,leaf:true},
{hidden :SSTS_TousseTraceabilityInquiry,text:"手术仪器追溯查询",href:WWWROOT+'/disinfectsystem/reportforms/tousseTraceabilityInquiry.jsp',hrefTarget:linkTarget,leaf:true},
- {hidden :false,text:"手术仪器未归还列表",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp',hrefTarget:linkTarget,leaf:true}
+ {hidden :isEnableTousseUnReturnWarn == 'false',text:"手术仪器未归还列表",href:WWWROOT+'/disinfectsystem/toussemanager/instrumentGoodsManagement/unReturnTousseList.jsp',hrefTarget:linkTarget,leaf:true}
]
},{
text:"干预管理",
Index: ssts-web/src/main/webapp/homepage/menu.jsp
===================================================================
diff -u -r34727 -r34753
--- ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34727)
+++ ssts-web/src/main/webapp/homepage/menu.jsp (.../menu.jsp) (revision 34753)
@@ -2,8 +2,16 @@
<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.ExpensiveGoodsGodownEntry"%>
<%@page import="com.forgon.disinfectsystem.entity.assestmanagement.Contract"%>
<%@page import="com.forgon.disinfectsystem.entity.departmentGroupOption.DepartmentGroupOption"%>
+<%@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"%>
+<%
+ SupplyRoomConfigManager supplyRoomConfigManager2 = (SupplyRoomConfigManager)SpringBeanManger.getBean("supplyRoomConfigManager");
+ SupplyRoomConfig syscfg = supplyRoomConfigManager2.getSystemParamsObj();
+ //是否启用未归还提醒
+ request.setAttribute("isEnableTousseUnReturnWarn",syscfg.getIsEnableTousseUnReturnWarn());
+%>
@@ -13,6 +21,7 @@
var directCompanyIdsWhereUserBelong = "${loginUserData.directCompanyIdsWhereUserBelong}";
var directCompanyNamesWhereUserBelong = "${loginUserData.directCompanyNamesWhereUserBelong}";
var gridparams = new Object();
+var isEnableTousseUnReturnWarn = '<%=request.getAttribute("isEnableTousseUnReturnWarn")%>';
var userName = '${loginUserData.userName}'; //登录用户
//自购入库
Index: ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js
===================================================================
diff -u -r34746 -r34753
--- ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js (.../changePosition.js) (revision 34746)
+++ ssts-web/src/main/webapp/disinfectsystem/toussemanager/position/changePosition.js (.../changePosition.js) (revision 34753)
@@ -517,7 +517,23 @@
triggerAction : 'all',
hideTrigger : true,
typeAhead : false,
- anchor : '95%'
+ anchor : '95%',
+ listeners : {
+ render : function(c){
+ c.getEl().on('keypress',function(e,thiz){
+ if(e.getKey() == 13){
+ var text = top.Ext.getCmp('recipient').getRawValue();
+ getUserObjByBarcode(text,top.Ext.getCmp('recipient'),'',function(name){
+ top.Ext.getCmp('recipient').setValue(name);
+ });
+ }
+ });
+ c.getEl().on('dblclick',function(e,thiz){
+ c.doQuery(c.allQuery, true);
+ c.expand();
+ });
+ }
+ }
}]
},{
layout : 'form',