Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.js =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.js (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.js (revision 14668) @@ -0,0 +1,28 @@ +Ext.onReady(function () { + + //如果使用version2且不是显示全部申请单则显示界面并绑定点击事件 + if (recyclingApplicationVersion == 2 && listType != 'all') { + //取消隐藏 + Ext.get('desktop_normal').dom.style.display = ""; + + //器械包申请单 + Ext.get('tousseApplication').addListener('click', function (e) { + openApplication(invoicePlanForTousseType_Tousse, tousseApplicationForm); + }); + + //一次性物品申请单 + Ext.get('diposableGoodsApplication').addListener('click', function (e) { + openApplication(invoicePlanForTousseType_Diposable, diposableGoodsApplicationForm); + }); + + //消毒物品申请单 + Ext.get('disinfectGoodsApplication').addListener('click', function (e) { + openApplication(invoicePlanForTousseType_Tousse, ""); + addAndEditUntracableTousse('', 0, "01", function () { + }); + }); + } + + +}); + Index: ssts-web/src/main/webapp/themes/portalPage/img/tabs_dressing.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.jsp =================================================================== diff -u --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.jsp (revision 0) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationViewVersion2.jsp (revision 14668) @@ -0,0 +1,68 @@ + +<%@ include file="goodsApplicationView.jsp" %> +<%@ page contentType="text/html; charset=UTF-8" %> + + + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js =================================================================== diff -u -r14573 -r14668 --- ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 14573) +++ ssts-web/src/main/webapp/disinfectsystem/config/gdsy/config.js (.../config.js) (revision 14668) @@ -12,7 +12,7 @@ // 外部代理灭菌装配时是否必须入篮筐(为true或未配置此项时表示必须,为其它值则非必须) mustScanBasketForForeignProxy : false, // 申请表单的类型：1 ：通用申请单（组合申请单），2：分开的申请单 - applicationFormType : 1, + applicationFormType : 2, hidePackageSpec : true, // 申请界面是否显示器械包或消毒物品的的单位 showTousseUnitColumn : true, @@ -84,5 +84,7 @@ //是否隐藏住院号 isHideHospitalNumber: true, //是否隐藏加急数量 - isHideUrgentAmount: true + isHideUrgentAmount: true, + // 科室申请版本：1或者没有配置沿用之前的版本，2：独立出科室申领的几个申请功能 + recyclingApplicationVersion : 2 } \ No newline at end of file Index: ssts-web/src/main/webapp/homepage/portalPage.js =================================================================== diff -u -r14643 -r14668 --- ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14643) +++ ssts-web/src/main/webapp/homepage/portalPage.js (.../portalPage.js) (revision 14668) @@ -539,6 +539,10 @@ } itemUrl = WWWROOT + url; if(item['itemId'] != 'packing' && item['itemId'] != 'reviewPacking' && item['itemId'] !='sterilizationRecord'){ + //如果是用version2版本的就不显示原来的图标,如果没用version2版本的则不显示version2的图标 + if (sstsConfig.recyclingApplicationVersion == 2 && item['itemId'] == 'recyclingApplication' || sstsConfig.recyclingApplicationVersion != 2 && item['itemId'] == 'recyclingApplicationVersion2'){ + return returnContent; + } var supplyRoomRecall = false; if(item['itemId'] == "recallRecord"){ if(SSTS_RecallRecord_Menu == false){ Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r14608 -r14668 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 14608) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 14668) @@ -61,7 +61,8 @@ request.setAttribute("showAllApplicationPermission", has); String listType = request.getParameter("listType"); - + request.setAttribute("listType", listType); + boolean isCssdUser = false; if(firstSupplyRoomConfig != null && currentOrgUnitCode != null){ String supplyRoomCoding = firstSupplyRoomConfig.getOrgUnitCoding(); @@ -133,6 +134,8 @@ var unPrint = '<%=InvoicePlan.PRINT_STATUS_UNPRINT%>'; var isCssdUser = '<%=request.getAttribute("isCssdUser")%>'; +//因为申请单有version2版本,全部申请单和科室申领引用同一个js,因此要加入这个listType来区分面前页面是科室申领还是全部申请单 +var listType = '<%=request.getAttribute("listType")%>'; var sortFieldStr = 'committedStatus ASC, po.orderByFiled ASC, po.applicationTime'; //var sortFieldStr = 'po.applicationTime'; if(isCssdUser == 'true'){ Index: ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js =================================================================== diff -u -r14627 -r14668 --- ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14627) +++ ssts-web/src/main/webapp/disinfectsystem/recyclingApplication/goodsTemplateApplicationView.js (.../goodsTemplateApplicationView.js) (revision 14668) @@ -11,6 +11,7 @@ var allowApplyDisposableGoodsWhenUnderstock = true;// 一次性物品库存不足时，是否允许申领 var windowHeight = top.document.body.clientHeight > 650 ? 650 : top.document.body.clientHeight; var invoicePlanPrintButtonName = '发货计划'; +var recyclingApplicationVersion = sstsConfig.recyclingApplicationVersion; if (sstsConfig.invoicePlanPrintButtonName != undefined){ invoicePlanPrintButtonName = sstsConfig.invoicePlanPrintButtonName; } @@ -3422,27 +3423,105 @@ } }]; + //如果不是用版本2或者是在高级视图的全部申请单打开,则按原来的显示 + if (recyclingApplicationVersion != 2 || listType == 'all'){ + grid = new Ext.ux.ForgonPageGrid({ + title : entityName + '单列表', + tbar : tbar, + pageSize : 20, + defaultSortField : sortFieldStr, + defaultSortDirection : 'DESC', + searchDisableIndexes : ['invoiceStatus'], + isCheckboxSelectionModel : true, + rememberSelected : false, + isShowSearchField : true, + columns : columns, + plugins: filters, + autoExpandColumn : 'operationRemark', + renderTo : 'gridDiv', + frame : false + }, + readerDetail, + RecyclingApplicationTableManager.findRecyclingApplicationTableList, + null + ); + + var tableContent; + grid.on('mouseover', function(e) {// 添加mouseover事件 + var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置 + if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false） + var record = this.getStore().getAt(index); + var BorrowName = ''; + var BorrowAmount = ''; + var isDiposableApplicationForm = (record.data['type']==diposableGoodsApplicationForm); + tableContent = record.data['htmlContent'];// + if(!tableContent){ + var content = ""; + DWREngine.setAsync(false); + InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){ + for(var i=0;i"; + } + var recyclingAmount = voItems[i].recyclingAmount; + content +=" " + tousseName +"" + voItems[i].amount+"" + recyclingAmount+"" + voItems[i].invoiceAmount+""+BorrowAmount; + //一次性物品加编号 + if(isDiposableApplicationForm){ + var code = voItems[i].externalCode; + if(code == null || code.length <= 0){ + code = " "; + } + content +=""+ code +""; + } + content +=""; + //消毒物品加材料 + var material = voItems[i].material; + if(material != null && material.length > 0){ + var materialArray = material.split("@&"); + for ( var j = 0; j < materialArray.length; j++) { + var materialItems = materialArray[j].split("#&"); + content +="

" + materialItems[0] +"" + materialItems[1]+""; + content +="" + (materialItems[2] == "null" ? " " : materialItems[2]) + " "; + } + } + } + }); + DWREngine.setAsync(true); + tableContent = (""+BorrowName); + if(isDiposableApplicationForm){ + tableContent += ""; + } + tableContent += "" + content + "

物品名称

申请数量

回收数量

已发货数量

编码

"; + record.set("htmlContent",tableContent); + } +// var maxWidth = grid.getInnerWidth(); + var maxHeight = grid.getInnerHeight(); + var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象 + //var align = e.xy[1] > maxHeight / 2 ? 'bl-tr' : 'tl-tr'; + rowEl.set({ + 'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':' 申请物品列表:'},false); +// + /*grid.tip.show(); + grid.tip.body.dom.innerHTML = tableContent;*/ + }else{ + + } + }); + + var viewport = new Ext.Viewport({ + layout : 'border', + items : [{ + region : 'center', + margins : '0 0 0 0', + layout : 'fit', + items : grid + }] + }); + } - grid = new Ext.ux.ForgonPageGrid({ - title : entityName + '单列表', - tbar : tbar, - pageSize : 20, - defaultSortField : sortFieldStr, - defaultSortDirection : 'DESC', - searchDisableIndexes : ['invoiceStatus'], - isCheckboxSelectionModel : true, - rememberSelected : false, - isShowSearchField : true, - columns : columns, - plugins: filters, - autoExpandColumn : 'operationRemark', - renderTo : 'gridDiv', - frame : false - }, - readerDetail, - RecyclingApplicationTableManager.findRecyclingApplicationTableList, - null - ); + /*var view = grid.getView(); // Capture the GridView. grid.tip = new Ext.ToolTip({ @@ -3476,77 +3555,7 @@ } });*/ - var tableContent; - grid.on('mouseover', function(e) {// 添加mouseover事件 - var index = grid.getView().findRowIndex(e.getTarget());// 根据mouse所在的target可以取到列的位置 - if (index !== false) {// 当取到了正确的列时，（因为如果传入的target列没有取到的时候会返回false） - var record = this.getStore().getAt(index); - var BorrowName = ''; - var BorrowAmount = ''; - var isDiposableApplicationForm = (record.data['type']==diposableGoodsApplicationForm); - tableContent = record.data['htmlContent'];// - if(!tableContent){ - var content = ""; - DWREngine.setAsync(false); - InvoicePlanTableManager.findApplicationItemVOListByInvoicePlanId(record.data['id'],function(voItems){ - for(var i=0;i"; - } - var recyclingAmount = voItems[i].recyclingAmount; - content +=" " + tousseName +"" + voItems[i].amount+"" + recyclingAmount+"" + voItems[i].invoiceAmount+""+BorrowAmount; - //一次性物品加编号 - if(isDiposableApplicationForm){ - var code = voItems[i].externalCode; - if(code == null || code.length <= 0){ - code = " "; - } - content +=""+ code +""; - } - content +=""; - //消毒物品加材料 - var material = voItems[i].material; - if(material != null && material.length > 0){ - var materialArray = material.split("@&"); - for ( var j = 0; j < materialArray.length; j++) { - var materialItems = materialArray[j].split("#&"); - content +="

" + materialItems[0] +"" + materialItems[1]+""; - content +="" + (materialItems[2] == "null" ? " " : materialItems[2]) + " "; - } - } - } - }); - DWREngine.setAsync(true); - tableContent = (""+BorrowName); - if(isDiposableApplicationForm){ - tableContent += ""; - } - tableContent += "" + content + "

物品名称

申请数量

回收数量

已发货数量

编码

"; - record.set("htmlContent",tableContent); - } -// var maxWidth = grid.getInnerWidth(); - var maxHeight = grid.getInnerHeight(); - var rowEl = Ext4.fly(e.getTarget());// 把target转换成Ext.Element对象 - //var align = e.xy[1] > maxHeight / 2 ? 'bl-tr' : 'tl-tr'; - rowEl.set({ - 'data-qtip' : tableContent,'data-qwidth':450,'data-qtitle':' 申请物品列表:'},false); -// - /*grid.tip.show(); - grid.tip.body.dom.innerHTML = tableContent;*/ - }else{ - - } - }); + - var viewport = new Ext.Viewport({ - layout : 'border', - items : [{ - region : 'center', - margins : '0 0 0 0', - layout : 'fit', - items : grid - }] - }); + }); \ No newline at end of file Index: ssts-web/src/main/webapp/themes/portalPage/img/tabs_disposable.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/webapp/themes/portalPage/img/tabs_tousse.png =================================================================== diff -u Binary files differ Index: ssts-web/src/main/resources/systemset/portalPage.xml =================================================================== diff -u -r14034 -r14668 --- ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 14034) +++ ssts-web/src/main/resources/systemset/portalPage.xml (.../portalPage.xml) (revision 14668) @@ -3,6 +3,7 @@ +