Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/common/common-tools.js =================================================================== diff -u -r24437 -r24516 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/common/common-tools.js (.../common-tools.js) (revision 24437) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/common/common-tools.js (.../common-tools.js) (revision 24516) @@ -53,6 +53,7 @@ //判断是否是IE浏览器 isIE:function(){ var userAgent = navigator.userAgent; //取得浏览器的userAgent字符串 + var isOpera = userAgent.indexOf("Opera") > -1; //判断是否Opera浏览器 var isIE = userAgent.indexOf("compatible") > -1 && userAgent.indexOf("MSIE") > -1 && !isOpera; //判断是否IE浏览器 if(isIE) { @@ -443,5 +444,16 @@ } }; + Tools.ArrayUtils = { + isNotEmpty:function(array){ + if (array == null || array === undefined || array.length == 0) { + return false; + }else{ + return true; + } + } + + } + window['Tools'] = Tools; })(); Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/common/constants.js =================================================================== diff -u -r24437 -r24516 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/common/constants.js (.../constants.js) (revision 24437) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/common/constants.js (.../constants.js) (revision 24516) @@ -23,7 +23,26 @@ TYPE_QUALITY_MONITOR_RECYCLE_APPLICATION : "质量监测回收申请单",//质量监测业务创建的申请单,不用发, TYPE_OPERATION_RESERVATION_APPLICATION : "手术预约申请单", TYPE_EXPENSIVEGOODS_FORM : "高值耗材申请单" - } - + }; + /** + * 器械包物品类型 + */ + Constants.TousseType={ + PACKAGE_TYPE_INSIDE : "器械包", //一张该申请单可以包含多种申领物品,含器械包和一次性物, + PACKAGE_TYPE_DRESSING : "敷料包", + PACKAGE_TYPE_DISINFECTION : "消毒物品", + PACKAGE_TYPE_FOREIGNPROXY : "外部代理灭菌", + PACKAGE_TYPE_FOREIGN : "外来器械包", + PACKAGE_TYPE_CUSTOM : "自定义器械包" + + }; + /** + * 一次性物品类型 + */ + Constants.DisposableGoodType={ + TYPE_DIPOSABLEGOODS : "普通物品", //一张该申请单可以包含多种申领物品,含器械包和一次性物, + TYPE_EXPENSIVEDIPOSABLEGOODS : "高值耗材", + TYPE_NAME : "一次性物品", + }; window['Constants'] = Constants; })();