Index: ssts-web/src/main/webapp/homepage/portalPage.js
===================================================================
diff -u -r17302 -r17950
--- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 17302)
+++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 17950)
@@ -1,4 +1,5 @@
var warningWindow; //系统告警win
+var unReturnWarningWindow; //未归还告警win
var packingMenu ;
var reviewPackingMenu ;
var sterilizationRecordMenu ;
@@ -277,6 +278,10 @@
});*/
//系统告警
initShowSystemWarningWin();
+
+ if (sstsConfig.isShowUnReturnWarning){
+ showUnReturnWarning();
+ }
showUpToNeckSatisfactionSurveyWinTips();
if (sstsConfig.biologicalMonitoringWarning && currentOrgUnitIsFirstSupplyRoom) { //开启生物监测结束后的提示功能,目前只开发给当前科室为一级供应室的用户
@@ -1201,6 +1206,51 @@
function showSystemWarningWin(){
doShowSystemWarningWinByParam(false);
}
+
+/**
+ * 显示未归还告警
+ */
+function showUnReturnWarning() {
+ var departCode = globalIsSupplyRoomUser == "true" ? '' : currentDepartCode;
+ Ext4.Ajax.request({
+ dataType : "json",
+ params : {'departCode': departCode},
+ url: WWWROOT + "/system/systemWarningAction!getUnReturnWarning.do",
+ success: function(response) {
+ var result = Ext4.decode(response.responseText);
+ if(result.data && result.data.length > 0){
+ var unReturnGrid = new Ext.grid.GridPanel({
+ store: new Ext.data.Store({
+ reader : new Ext.data.JsonReader({
+ fields : ["depart", "spec"]
+ })
+ }),
+ columns: [
+ {header: "科室名称", width: 130, dataIndex: 'depart'},
+ {header: "未归还的物品", width: 300,dataIndex: 'spec'},
+ {header: "查看", width: 70,dataIndex: 'warningItemType',renderer : goBorrow}
+ ],
+ stripeRows: true,
+ viewConfig: {forceFit: true},
+ height : 140
+ });
+ unReturnGrid.getStore().loadData(result.data);
+ unReturnWarningWindow = new Ext.Window({
+ autoHeight:true,
+ title : '未归还提示',
+ width : 480,
+ draggable:true,
+ modal:true,
+ closeAction:'close',
+ items:[unReturnGrid]
+ });
+ unReturnWarningWindow.show();
+ }
+ }
+ });
+}
+
+
var doSync = false;
function doShowSystemWarningWinByParam(isFirstOnLoad){
if(doSync){
@@ -1332,6 +1382,14 @@
return ""+mess+"";
}
+/**
+ * 未归还告警窗口点击查看详细跳去借物管理页面
+ */
+function goBorrow(v, p, record){
+ var mess = "查看详细";
+ return ""+mess+"";
+}
+
function openSelectOrgUnitWindow(){
var data = new Array();
var orgUnitIdArray = directOrgUnitCodesWhereUserBelong.split(";");