Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js =================================================================== diff -u -r38274 -r39629 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 38274) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsdbzxyy/config.js (.../config.js) (revision 39629) @@ -25,6 +25,8 @@ hideEnterReviewListButton : false, // 是否自动补全用户名 autoFillUserName:false, + //是否启用器械包自动加急功能（启用后会自动加急，并且也会自动弹出加急窗口） + enableTousseVoluntarilyUrgent:2, // 自动补全用户名的长度 autoFillUserNameLength:6, //装配界面的配包人是否默认为上一次装配的配包人 Index: ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js =================================================================== diff -u -r37449 -r39629 --- ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 37449) +++ ssts-web/src/main/webapp/disinfectsystem/config/dgsetyy/config.js (.../config.js) (revision 39629) @@ -244,7 +244,7 @@ //是否启用打印回收清单版本2 enablePrintRecyclingDetailVersion2 : true, //是否启用器械包自动加急功能 - enableTousseVoluntarilyUrgent : true, + enableTousseVoluntarilyUrgent : 1, //急物品的提示时间间隔60秒 urgentGoodsWarningTimeInterval : 1500, //打印发货单的版本,如果为2,则表示批量打印使用分组打印方式,并有下拉菜单 Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js =================================================================== diff -u -r32125 -r39629 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js (.../urgentGoodsHintView.js) (revision 32125) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/urgentGoodsHintView.js (.../urgentGoodsHintView.js) (revision 39629) @@ -25,37 +25,81 @@ showResult('共有'+urgentAmountSum+'个加急物品，请及时处理！') } if (!urgentGoodsWarningWindow) { - urgentGoodsWarningGrid = new Ext.grid.GridPanel({ - store: new Ext.data.Store({ - data : result, - reader : new Ext.data.JsonReader({ - fields : ["tousseName", "urgentAmount", "department"] - }) - }), - columns: [{ - header: "器械包名称", width: 150,dataIndex: 'tousseName' - },{ - header: "加急数量", width: 150,dataIndex: 'urgentAmount' - },{ - header: "科室", width: 150,dataIndex: 'department' - }], - stripeRows: true, - viewConfig: { - forceFit:true - }, - height:200 - }); - - urgentGoodsWarningWindow = new Ext.Window({ - autoHeight:true, - title : '所有加急物品', - width:500, - draggable:true, - modal:true, - closeAction:'hide', - items:[urgentGoodsWarningGrid] - }); - urgentGoodsWarningWindow.show(); + if(sstsConfig.enableTousseVoluntarilyUrgent == 2){ + urgentGoodsWarningGrid = new Ext.grid.GridPanel({ + store: new Ext.data.Store({ + data : result, + reader : new Ext.data.JsonReader({ + fields : ["tousseName", "urgentAmount", "department", "recyclingAmount", "washAmount", "packedAmount", "reviewAmount", "sterilizationAmount"] + }) + }), + columns: [{ + header: "器械包名称", width: 150,dataIndex: 'tousseName' + },{ + header: "待处理加急数", width: 100,dataIndex: 'urgentAmount' + },{ + header: "科室", width: 100,dataIndex: 'department' + },{ + header: "当前已回收", width: 100,dataIndex: 'recyclingAmount' + },{ + header: "当前已清洗", width: 100,dataIndex: 'washAmount' + },{ + header: "当前已装配", width: 100,dataIndex: 'packedAmount' + },{ + header: "当前已审核", width: 100,dataIndex: 'reviewAmount' + },{ + header: "当前已灭菌", width: 100,dataIndex: 'sterilizationAmount' + }], + stripeRows: true, + viewConfig: { + forceFit:true + }, + height:200 + }); + + urgentGoodsWarningWindow = new Ext.Window({ + autoHeight:true, + title : '所有加急物品', + width:800, + draggable:true, + modal:true, + closeAction:'hide', + items:[urgentGoodsWarningGrid] + }); + urgentGoodsWarningWindow.show(); + }else { + urgentGoodsWarningGrid = new Ext.grid.GridPanel({ + store: new Ext.data.Store({ + data : result, + reader : new Ext.data.JsonReader({ + fields : ["tousseName", "urgentAmount", "department"] + }) + }), + columns: [{ + header: "器械包名称", width: 150,dataIndex: 'tousseName' + },{ + header: "加急数量", width: 150,dataIndex: 'urgentAmount' + },{ + header: "科室", width: 150,dataIndex: 'department' + }], + stripeRows: true, + viewConfig: { + forceFit:true + }, + height:200 + }); + + urgentGoodsWarningWindow = new Ext.Window({ + autoHeight:true, + title : '所有加急物品', + width:500, + draggable:true, + modal:true, + closeAction:'hide', + items:[urgentGoodsWarningGrid] + }); + urgentGoodsWarningWindow.show(); + } } else { urgentGoodsWarningGrid.store.loadData(result); urgentGoodsWarningWindow.show(); Index: ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js =================================================================== diff -u -r38532 -r39629 --- ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js (.../config.js) (revision 38532) +++ ssts-web/src/main/webapp/disinfectsystem/config/fsfy_xcyq/config.js (.../config.js) (revision 39629) @@ -215,7 +215,7 @@ //勾选需要装配的器械包时，是否自动在界面右下角“由下往上”弹出配包注意事项提示框 showTousseNoteOnClickTousse:true, //是否启用器械包自动加急功能（启用后会自动加急，并且也会自动弹出加急窗口） -enableTousseVoluntarilyUrgent:true, +enableTousseVoluntarilyUrgent:1, //加急物品的提示时间间隔（单位秒）。 urgentGoodsWarningTimeInterval:86400, //显示回收时间 Index: ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js =================================================================== diff -u -r38388 -r39629 --- ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js (.../config.js) (revision 38388) +++ ssts-web/src/main/webapp/disinfectsystem/config/zsxlrmyy/config.js (.../config.js) (revision 39629) @@ -76,7 +76,7 @@ //启用设备维护个人桌面图标显示 showDeviceMaintenanceDesktopIcon : true, //是否启用器械包自动加急功能（只有为true时才启用，false或不配置都不启用） - enableTousseVoluntarilyUrgent : true, + enableTousseVoluntarilyUrgent : 1, //急物品的提示时间间隔（单位秒） urgentGoodsWarningTimeInterval : 60, //只有装配完成才能使用清洗篮筐回收.默认为true