Index: ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js =================================================================== diff -u -r36281 -r36866 --- ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 36281) +++ ssts-web/src/main/webapp/disinfectsystem/invoice/invoicePlanExtractedForm.js (.../invoicePlanExtractedForm.js) (revision 36866) @@ -1804,7 +1804,10 @@ } if (selectedAppFormType) { urls += '&appFormType=' + encodeURI(selectedAppFormType); } - + if(sstsConfig.enableInstrumentSetTypeSetting){ + var instrumentSetTypeIds = Ext.getCmp('instrumentSetTypeIds').getValue(); + urls += '&instrumentSetTypeId=' + instrumentSetTypeIds; + } var departApplicationStore = new Ext.data.Store({ proxy: new Ext.data.HttpProxy({ url: urls, @@ -1886,6 +1889,11 @@ if (top.Ext.getCmp("sendOutGoodsDetail")) { top.Ext.getCmp("sendOutGoodsDetail").getEl().mask("加载中,请稍候..."); } + //器械包种类 + if(sstsConfig.enableInstrumentSetTypeSetting){ + var instrumentSetTypeIds = Ext.getCmp('instrumentSetTypeIds').getValue(); + recyclingapplicationStore1.baseParams['instrumentSetTypeId'] = instrumentSetTypeIds; + } }); recyclingapplicationStore1.on("load", function (thiz, options) { Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js =================================================================== diff -u -r36615 -r36866 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 36615) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.js (.../awaitForRecycleList.js) (revision 36866) @@ -1058,13 +1058,20 @@ //按器械包分组过滤 var selectTousseGroupId = $('#tousseGroupSelect').val(); var tousseGroupName = $("#tousseGroup" + selectTousseGroupId).text(); + + //器械包种类过滤 + var tousseTypeSelectId = $('#tousseTypeSelect').val(); + var tousseTypeName = $("#tousseTypeId" + tousseTypeSelectId).text(); CookieManager.setCookie("groupId", id); CookieManager.setCookie("groupText", txt); CookieManager.setCookie("appType", appType); CookieManager.setCookie("tousseGroupId", selectTousseGroupId); CookieManager.setCookie("tousseGroupName", tousseGroupName); + CookieManager.setCookie("tousseTypeId", tousseTypeSelectId); + CookieManager.setCookie("tousseTypeName", tousseTypeName); + var orgUnitCoding = CookieManager.getCookie("applyDepartCode"); var operationRoom = CookieManager.getCookie("operationRoom"); loadApplicationData(id, appType, applyTimeOrder, orgUnitCoding, operationRoom, false, '', 1, awaitForRecyclePageSize); @@ -1073,12 +1080,14 @@ // 获取待回收的申请单，即获取回收清点模块的待回收列表数据 function loadApplicationData(groupId, appType, applyTimeOrder, orgUnitCoding, operationRoom, isOpenApplication, orgUnitName, pageIndex, pageSize) { var tousseGroupId = CookieManager.getCookie("tousseGroupId"); + var instrumentSetTypeIds = CookieManager.getCookie("tousseTypeId"); $.ajax({ type: 'post', url: WWWROOT + '/disinfectSystem/recyclingRecordAction!getAwaitForRecyclingInvoicePlan.do', dataType: 'json', data: { tousseGroupId: tousseGroupId || '', + instrumentSetTypeIds:instrumentSetTypeIds || '', groupId: groupId || '', appType: appType || '', applyTimeOrder: applyTimeOrder || '', @@ -1197,9 +1206,13 @@ CookieManager.setCookie("applyDepartCode", ""); CookieManager.setCookie("operationRoom", ""); CookieManager.setCookie("appType", ""); + CookieManager.setCookie("tousseTypeId", ""); + CookieManager.setCookie("tousseTypeName", ""); $("#appTypeSelect").val(''); $("#inputselect").val(''); $('#tousseGroupSelect').val(''); + $('#tousseTypeSelect').val(''); + $("#divTousseType .filter").text('器械包种类'); $("#divselect .filter").text('科室分组'); $("#divTousseGroup .filter").text('器械包分组'); setApplicationHeaderFilterStyle(); @@ -1225,6 +1238,13 @@ if (recycleRecordFilterManager.statusEnabled()) { $("#divStatusSelect cite").html(CookieManager.getCookie('status')); } + if (sstsConfig.enableInstrumentSetTypeSetting) { + if(CookieManager.getCookie('divTousseTypId') == ''){ + $("#divTousseTypeSelect cite").html('器械包种类'); + }else { + $("#divTousseTypeSelect cite").html(CookieManager.getCookie('divTousseTypName')); + } + } if (recycleRecordFilterManager.hisDepartGroupIdEnabled()) { $("#divDepartGroupSelect cite").html(CookieManager.getCookie('hisGroupName')); } else { @@ -1301,11 +1321,21 @@ firstPage(); //过滤后就进入到首页 updateHeaderStatus(); } +function resetTousseType() { + recycleRecordFilterManager.resetTousseType(); + firstPage(); //过滤后就进入到首页 + updateHeaderStatus(); +} function resetStatus(status) { recycleRecordFilterManager.resetStatus(); firstPage(); //过滤后就进入到首页 updateHeaderStatus(); } +function selectTousseType(id,name) { + recycleRecordFilterManager.selectTousseType(id,name); + firstPage(); + updateHeaderStatus(); +} function selectIdCardBarcode(barcode) { if (recycleRecordFilterManager.selectIDCardBarcode(barcode)) { firstPage(); @@ -1702,6 +1732,32 @@ }); } +function getInstrumentSetType(){ + Ext.Ajax.request({ + url: WWWROOT + '/disinfectSystem/baseData/instrumentSetTypeAction!getInstrumentSetTypeBySpellingAndWB.do', + success: function (response, options) { + var result = Ext.decode(response.responseText); + if(result.data.length > 0){ + var html = '
  • 全部
    • '; + for(var i=0;i'+result.data[i].name+''; + } + var html2 = '
  • 全部
    • '; + for(var i=0;i" + result.data[i].name + ""; + } + $('#divTousseType ul').html(html); + $('#divTousseTypeSelect ul').html(html2); + $.divselect("#divTousseType", "#tousseTypeSelect"); + } + }, + failure: function (response, options) { + var result = Ext.decode(response.responseText); + showResult(result.message); + } + }); +} + $(document).ready(function () { /*Annie 快速入框权限*/ if (sstsConfig.enableExpressIntoContainer) { @@ -1711,11 +1767,23 @@ $("#rememberRecycleUser").show(); } $.divselect("#divTousseGroup", "#tousseGroupSelect"); - if (sstsConfig.enableTousseGroupFilterInAwaitRecycling) { + if (!sstsConfig.enableTousseGroupFilterInAwaitRecycling) { $('#divTousseGroup').show(); } else { $('#divTousseGroup').hide(); + if (sstsConfig.enableInstrumentSetTypeSetting) { + $('#divTousseType').css({ + left: '375px', + top: '-45px' + }) + } } + if (sstsConfig.enableInstrumentSetTypeSetting) { + getInstrumentSetType(); + $('#divTousseType').show(); + } else { + $('#divTousseType').hide(); + } if (sstsConfig.enablePackingSerialNum) { $("#packingTaskSerialNum").show(); @@ -1726,6 +1794,8 @@ $.divselect("#divselect", "#inputselect"); $.divselect("#divStatusSelect", "#inputStatusSelect"); $.divselect("#divDepartGroupSelect", "#inputDepartGroupSelect"); + $.divselect("#divTousseTypeSelect", "#inputTypeSelect"); + var groupid = CookieManager.getCookie("groupId"); var groupText = CookieManager.getCookie("groupText"); if (groupText != null && groupText != '') { @@ -1740,6 +1810,13 @@ $("#tousseGroupSelect").val(tousseGroupId); } + var tousseTypeId = CookieManager.getCookie("tousseTypeId"); + var tousseTypeName = CookieManager.getCookie("tousseTypeName"); + if (tousseTypeId && tousseTypeId != '') { + $("#divTousseType cite").html(tousseTypeName); + $("#tousseTypeSelect").val(tousseTypeId); + } + var appType = CookieManager.getCookie("appType"); if (appType != null && appType != '') { $("#appTypeSelect option[value='" + appType + "']").attr("selected", "selected"); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js =================================================================== diff -u -r36590 -r36866 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js (.../divselect.js) (revision 36590) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/js/divselect.js (.../divselect.js) (revision 36866) @@ -8,18 +8,38 @@ $("#divTousseGroup ul").hide(); $("#divDepartGroupSelect ul").hide(); $("#divStatusSelect ul").hide(); + $("#divTousseTypeSelect ul").hide(); + $("#divTousseType ul").hide(); }else if(divselectid == '#divTousseGroup'){ $("#divselect ul").hide(); $("#divDepartGroupSelect ul").hide(); $("#divStatusSelect ul").hide(); + $("#divTousseTypeSelect ul").hide(); + $("#divTousseType ul").hide(); + }else if(divselectid == '#divTousseType'){ + $("#divselect ul").hide(); + $("#divTousseGroup ul").hide(); + $("#divDepartGroupSelect ul").hide(); + $("#divStatusSelect ul").hide(); + $("#divTousseTypeSelect ul").hide(); }else if(divselectid == '#divDepartGroupSelect'){ $("#divselect ul").hide(); $("#divTousseGroup ul").hide(); $("#divStatusSelect ul").hide(); + $("#divTousseTypeSelect ul").hide(); + $("#divTousseType ul").hide(); }else if(divselectid == '#divStatusSelect'){ $("#divselect ul").hide(); $("#divTousseGroup ul").hide(); $("#divDepartGroupSelect ul").hide(); + $("#divTousseTypeSelect ul").hide(); + $("#divTousseType ul").hide(); + }else if(divselectid == '#divTousseTypeSelect'){ + $("#divselect ul").hide(); + $("#divTousseGroup ul").hide(); + $("#divDepartGroupSelect ul").hide(); + $("#divStatusSelect ul").hide(); + $("#divTousseType ul").hide(); } }else{ ul.slideUp("fast"); Index: ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp =================================================================== diff -u -r36590 -r36866 --- ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 36590) +++ ssts-web/src/main/webapp/disinfectsystem/touchScreen/recycle/awaitForRecycleList.jsp (.../awaitForRecycleList.jsp) (revision 36866) @@ -149,24 +149,41 @@ #divStatusSelect{width:145px; margin:0px 170px auto; position:relative; z-index:10000;top: 2px;left: 0;} #divStatusSelect cite{width:110px;} -#divStatusSelect ul,#divDepartGroupSelect ul{width:194px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;} -#divStatusSelect ul li,#divDepartGroupSelect ul li{height:60px; line-height:60px;} -#divStatusSelect ul li a,#divDepartGroupSelect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} -#divStatusSelect ul li a:hover,#divDepartGroupSelect ul li a:hover{background-color:#CCC;} +#divStatusSelect ul,#divDepartGroupSelect ul,#divTousseTypeSelect ul{width:194px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;} +#divStatusSelect ul li,#divDepartGroupSelect ul li,#divTousseTypeSelect ul li{height:60px; line-height:60px;} +#divStatusSelect ul li a,#divDepartGroupSelect ul li a,#divTousseTypeSelect ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} +#divStatusSelect ul li a:hover,#divDepartGroupSelect ul li a:hover,#divTousseTypeSelect ul li a:hover{background-color:#CCC;} #divStatusSelect { left: 205px; top: -45px; } -#divTousseGroup{width:145px; position:relative; z-index:10000;top: -45px;left: 375px;} -#divTousseGroup cite{width:110px;} -#divTousseGroup ul{width:214px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;} -#divTousseGroup ul li{height:60px; line-height:60px;} -#divTousseGroup ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} -#divTousseGroup ul li a:hover{background-color:#CCC;} +#divTousseTypeSelect { + width:145px; + position:relative; + z-index:10000; + left: 520px; + top: -92px; +} -#rememberRecycleUser{width:212px; margin:-50px 515px auto; position:relative; z-index:10000;} +#divTousseTypeSelect cite{ + width:110px; +} + +#divTousseGroup,#divTousseType{width:145px; position:relative; z-index:10000;top: -45px;left: 375px;} +#divTousseGroup cite,#divTousseType cite{width:110px;} +#divTousseGroup ul,#divTousseType ul{width:214px;max-height:700px;border:1px solid #333333; background-color:#ffffff; position:absolute; z-index:20000; margin-top:-1px; display:none;overflow:auto;} +#divTousseGroup ul li,#divTousseType ul li{height:60px; line-height:60px;} +#divTousseGroup ul li a,#divTousseType ul li a{display:block;font-size:30px; height:60px; color:#333333; text-decoration:none; padding-left:10px; padding-right:10px;} +#divTousseGroup ul li a:hover,#divTousseType ul li a:hover{background-color:#CCC;} + +#divTousseType { + left: 520px; + top: -92px; +} + +#rememberRecycleUser{width:212px; margin:-89px 515px auto; position:relative; z-index:10000;} #rememberCheckBox{ width: 60px; height: 35px; @@ -419,6 +436,14 @@ + + +
    + 器械包种类 + +