Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r24630 -r24653 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24630) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24653) @@ -44,29 +44,35 @@ }; $("#myTab>li").removeClass("active"); - $("#myTabContent>div").removeClass("active"); - var tabHeaderHtml = "
  • " + $("#myTabContent>div").removeClass("active"); + + //style='background-images:url("+WWWROOT+"/dx-disinfectsystem/img/img7.gif)' + var tabHeaderHtml = "
  • " + "" + ""+tabName+"" + "" + "" + "
    • "; var tabContentHtml = "
    " - + "" + + "" + "
    "; $("#myTab").append(tabHeaderHtml); $("#myTabContent").append(tabContentHtml); - + //默认灰色 + //$("#myTab>li").css('background',"url("+WWWROOT+"/dx-disinfectsystem/img/img8.gif)"); if ($(".content-index-toggle-off").hasClass("header-closed")) { $(".head-index").css({"height":"0"}); - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif"); + $(this).children("img").attr("src",""+WWWROOT+"/dx-disinfectsystem/img/ico4.gif"); if($("#myTabContent .tab-pane").hasClass("other-tab")) { $(".other-tab").css({"top":"35px"}); } } } } + +//$(".content-index-nav-title .close-tab").css("border","1px solid red"); +//console.log("-=",$(".close-tab")); //关掉导航 function closeTab(that, tabId){ $(that).parent().parent().remove(); @@ -93,54 +99,21 @@ $(this).addClass("header-closed"); $(".head-index").hide(); $(".head-index").css({"height":"0"}); - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif"); + $(this).children("img").attr("src",""+WWWROOT+"/dx-disinfectsystem/img/ico4.gif"); if($("#myTabContent .tab-pane").hasClass("other-tab")) { $(".other-tab").css({"top":"35px"}); } }else{ $(this).removeClass("header-closed"); $(".head-index").show(); $(".head-index").css({"height":"87px"}); - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif"); + $(this).children("img").attr("src",""+WWWROOT+"/dx-disinfectsystem/img/ico3.gif"); if ($("#myTabContent .tab-pane").hasClass("other-tab")) { $(".other-tab").css({"top":"122px"}); } else { $(".other-tab").css({"top":"35px"}); } } - - /*if($("#myTabContent .tab-pane").hasClass("other-tab")){ - var headHeight = $(".head-index").height(); - if(headHeight==87){ - $(".head-index").hide(); - $(".head-index").css({"height":"0"}); - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif"); - - - $(".other-tab").css({"top":"35px"}); - }else{ - $(".head-index").show(); - $(".head-index").css({"height":"87px"}); - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif"); - - $(".other-tab").css({"top":"122px"}); - } - }else{ - - var headHeight = $(".head-index").height(); - if(headHeight==87){ - $(".head-index").hide(); - $(".head-index").css({"height":"0"}) - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif"); - }else{ - //alert("222"); - $(".head-index").show(); - $(".head-index").stop(true).animate({"height":"87px"},300); - $(this).children("img").attr("src","/dx-disinfectsystem/img/ico3.gif"); - $(".other-tab").css({"top":"35px"}); - } - }*/ - }) //首页修改密码验证 @@ -297,7 +270,7 @@ tabId = menuJson.itemId; menuText = menuJson.title; - menuIconSrc =menuJson.imgUrl; + menuIconSrc =WWWROOT+menuJson.imgUrl; //1是tab，2是跳转新页面，3是右击自定义菜单事件 4.弹出一个弹框 if (menuJson.type == 1) { menuTarget = ""; @@ -306,11 +279,11 @@ + "'"+"menu_" + menuJson.itemId +"'" + "," + "'" + menuText + "'" + "," - + "'" + menuJson.itemLinkUrl + "'" + + "'"+WWWROOT+"" + menuJson.itemLinkUrl + "'" + ")\""; } else if(menuJson.type == 2) { - menuHref = menuJson.itemLinkUrl; + menuHref =WWWROOT+menuJson.itemLinkUrl; } else if(menuJson.type == 3) { myMenuGroup = "my-menu-group"; menuTarget = ""; @@ -336,7 +309,7 @@ + taskTitle + "'" + "," - + "'" + + "'"+WWWROOT+"" +submenusLi.itemLinkUrl + "'" + ")\""; Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js =================================================================== diff -u -r24630 -r24653 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24630) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24653) @@ -1,5 +1,3 @@ - -var recoredTableH =""; var assemblyTaskLeftTopTableCon; //left table top var addVal = ""; var packingTasks; @@ -8,6 +6,9 @@ var searchBarcodeHidden; var loseOrDameage_type; var loseOrDameage_packingTaskId; + + + //打印标签部分 var packing = false; var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试 @@ -58,9 +59,10 @@ M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1) + '-'; D = date.getDate() + ' '; D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate()); - sterileDate =  Y+M+D; + sterileDate =  parseInt(Y+M+D); } + console.log("日期",sterileDate); //外来器械拆包信息 splitPackage //篮筐条码 //扫描的篮筐条码 scannedBasketBarcodes @@ -110,7 +112,7 @@ return ; } var packingTaskArray = []; - for(var tousseIndex=0;tousseIndex提示" @@ -339,7 +341,7 @@ assemblyTaskLeftTopTableCon = assembleArray; reloadPackingLeftTopTasks();//刷新左上表格 - //printLabelsAfterPacking();//打印标签 + printLabelsAfterPacking();//打印标签 }); @@ -544,6 +546,7 @@ $.ajax({ url:WWWROOT+"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml", type: "get", + cache:false,//解决ie async:false, success:function(result){ var result = JSON.parse(result); @@ -590,6 +593,12 @@ $(function(){ var documentHeight = $(window).height(); + //父级标签 + var parentHead = window.parent.$(".head-index"); + var navbar = window.parent.$(".content-index"); + var parentHeadIf = window.parent.$(".content-index-toggle-off"); + var todayTableHeight = documentHeight - parentHead.height() - navbar.height() - 124; + //页面一加载就获取焦点 $("#searchBarcode").focus(); loseAndDamageNum();//丢失和报损的数字 @@ -602,107 +611,7 @@ var resultHTop = tableHTop-40; var resultHFoot = tableHFoot-76; - var assemblyTaskLeftTopTable_columns=[ - { - checkbox : true, - switchable: false - }, - { - title : '物品名称', - field : 'tousseName', - align : 'center', - sortable:true, //正序,逆序 - switchable: false, - cellStyle:function(value,row,index){ - for(i=0;i 0){ - return {css:{"color":"red"}}; - } - } - - } - return {css:{"color":"#000"}}; - } - }, - { - title : '数量', - field : 'amount', - align : 'center', - sortable:true, - switchable: false, - formatter:function(v,record){ - var inputId = 'topInput_'+record.tousseID; - return "" - } - }, - { - title : '加急数量', - field : 'urgentAmount', - align : 'center', - sortable:true - }, - { - title : '加急等级', - field : 'urgentLevel', - align : 'center', - sortable:true - }, - { - title : '清洗篮筐', - field : 'basketName', - align : 'center', - sortable:true - }, - { - title : '操作', - field : 'operate', - align : 'center', - sortable:true, - width:300 - }, - { - title : '申请科室', - field : 'department', - align : 'center', - sortable:true - }, - { - title : '清洗时间', - field : 'washTime', - align : 'center', - sortable:true - }, - { - title : '状态', - field : 'status', - align : 'center', - sortable:true - }, - { - title : '回收时间', - field : 'dateTime', - align : 'center', - sortable:true - } - ]; var assemblyTaskLeftTopTable = "
    "; $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); /*在篮筐中输入条码*/ @@ -718,7 +627,7 @@ $("#searchBarcodeHidden").val(searchBarcodeVal); searchBarcodeHidden = $("#searchBarcodeHidden").val(); $("#searchBarcode").val(""); - reloadTopTableMoreborde(searchBarcodeHidden); + reloadTopTableMoreborde(searchBarcodeHidden); //把表格高度变小 $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"}); $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ @@ -740,8 +649,10 @@ //中间的高度 //计算table的高度 - var taskmiddleTop = $(".assembly-task-middlefoot").offset().top; - taskmiddleH = documentHeight - taskmiddleTop-123; + //var taskmiddleTop = $(".assembly-task-middlefoot").offset().top; + //console.log("高度，，",taskmiddleTop); + + taskmiddleH = documentHeight -335-123; $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); //var winH = $(window).height(); /*setInterval(function(){ @@ -782,65 +693,28 @@ },100);*/ /* var topTaboffset = $("#assemblyTaskLeftTopTableWrapp").offset().top;*/ //console.log("winH"+documentHeight); + assemblyTaskLeftTopload([],assemblyTaskLeftTopTable_columns); $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({ "line-height":"0", "margin-top":"4px", "margin-bottom":"4px" }); $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); + //右边材料清单 + var materialsTop = $("#materialsMenu").offset().top; + var materialsH = documentHeight-materialsTop-123; + var materialstable = "
    "; + $("#materialsMenu").append(materialstable); + materialsLoadTable([],materials_columns); + //把表格的高度变小 + $("#materialsTable").css({"min-width": "300px"}); + $("#materialsTable th,#materialsTable td").css({ + "padding-bottom":"2px", + "padding-top":"2px" + }) + /*材料清单 table end*/ - - - - - - - //右边材料清单 - var materialsTop = $("#materialsMenu").offset().top; - var materialsH = documentHeight-materialsTop-123; - var materialstable = "
    "; - $("#materialsMenu").append(materialstable); - materialsLoadTable([],materials_columns); - //把表格的高度变小 - $("#materialsTable").css({"min-width": "300px"}); - $("#materialsTable th,#materialsTable td").css({ - "padding-bottom":"2px", - "padding-top":"2px" - }) - /*材料清单 table end*/ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - //补充丢失/报损表格 var addLoseTable="
    "; $('#addLoseTableWrapper').append(addLoseTable); @@ -916,7 +790,7 @@ align : 'center', sortable:true, //正序,逆序 switchable: false, - /* formatter:function(v,record,index){ + formatter:function(v,record,index){ var vs = v ; for(var i=0;i -1) { + this.splice(index, 1); + } + }; + for(var i=0;i"; - $("#todayAssemblyRecordTableWrapp").append(todayAssemblyRecordTable); - - //alert("111"); - todayAssemblyRecordTableload("todayAssemblyRecordTable",todayAssemblyRecord_columns,todayAssemblyRecordTableData); $("#todayAssemblyRecordTableWrapp .fixed-table-container").css("padding-bottom","43px"); + //高度自适应，分页条的定位 + $(window).resize(function () { + $("#todayAssemblyRecordTable").bootstrapTable('resetView', { + height : $(window).height() - parentHead.height() - navbar.height() - 124 + }); + $("#todayAssemblyRecordTableWrapp .fixed-table-pagination").css("top",$(".wrapp").height()); + }); + + //点击查询按钮 + $("#queryTodayPackingRecord").click(function(){ + var beginSelect = $("#beginSelect option:selected").val(); + var beginSelect = $("#endSelect option:selected").val(); + var instrumentSetSelect = $("#instrumentSetSelect option:selected").val(); + var instrumentCode = $("#instrumentCode").val(); + var packagePeople = $("#packagePeople").val(); + + + //console.log("todayHistoryHidden",$("#todayHistoryHidden").val()); + var filters = []; + var fil = []; + var filtersAppend = { + columnLabel:"tousseName", + type:'string',//字符串类型 + value:"阑尾拉钩", + operator: "like" + }; + filters.push(filtersAppend); + //console.log("filters",filters); + var temp = { + //这里的键的名字和控制器的变量名必须一直，这边改动，控制器也需要改成一样的 + offset:"", //页码 + limit: "", //每页的条数 + filters: fil, + gridId: "com.forgon.disinfectsystem.packing.findPackingRecordList", + }; + + $.ajax({ + url:WWWROOT+"/disinfectSystem/grid/gridController/getGrid.mhtml", + dataType: "json", + async: false, + data: {gridParams:JSON.stringify(temp)}, + type: "post", + success: function(result) { + console.log("返回的数据",result); + if(result.success == true){ + + }else{ + //alert(result.message); + } + } + + }) + + }) + //器械丢失补充模态框 // loadTable("addLoseTable",allModel.list,allModelication_columns,false,false,"",false,true,false); @@ -1607,7 +1655,7 @@ } //今天本组装配记录 -var todayAssemblyRecordTableData =new Array(); +/*var todayAssemblyRecordTableData =new Array(); for(var i=0; i<=100;i++){ todayAssemblyRecordTableData.push({ 'deparent':"麻醉科", @@ -1622,7 +1670,7 @@ "doctor":"李四" }); -} +}*/ var printAmendtable_columns=[ { checkbox : true, @@ -1810,22 +1858,28 @@ //点击删除 $("#confirmDeleteBtn").click(function(){ confirmDelete(footTabelids); - //reloadPackingLeftTopTasks(); }) +//删除装配任务 function confirmDelete(footTabelids){ $.ajax({ url:WWWROOT+"/disinfectSystem/packingController/deletePackingTask.mhtml", dataType: "json", async: true, + cache:false,//解决ie type: "post", data:{"ids":footTabelids}, success: function(result) { if(result.success == true){ - alert("删除成功",result.message); + alert("删除成功"); $('.deleteMsgModel').modal('hide'); reloadPackingTasks();//刷新左下表格 - reloadTopTableMoreborde(searchBarcodeHidden);//刷新左上表格 + //当没有扫条码，上面表格不刷新 + if(searchBarcodeHidden ==undefined || searchBarcodeHidden ==""){ + return; + } + reloadTopTableMoreborde(searchBarcodeHidden);//刷新左上表格 }else{ + //删除失败 alert(result.message); $('.deleteMsgModel').modal('hide'); } @@ -1933,8 +1987,9 @@ allBagName=req; } });*/ - /*var allBagName = {"results":[ - {"id": 1, text: '小手术包' } + + var allBagName = {"results":[ + {"id": 1, text: '小手术包' }, {"id|1-100": 2, text: '小麻醉包' }, {"id|1-100": 3, text: '小麻醉骨科包'}, {"id|1-100": 4, text: '大麻醉包' }, @@ -1952,7 +2007,7 @@ maximumSelectionLength:1 }) - }*/ + } //科室 /*Mock.mock( 'http://mockjsdepartmentame', @@ -1963,8 +2018,8 @@ ] } );*/ - /*$("#departmentsSelect").select2({ - ajax: { + $("#departmentsSelect").select2({ + /* ajax: { url: "http://mockjsdepartmentame", contentType:'application/json;charset=utf-8', dataType: 'json', @@ -1987,13 +2042,13 @@ }; }, cache: true - }, + },*/ language: "zh-CN", placeholder:'关键词搜素', allowClear:true, minimumInputLength: 1, maximumSelectionLength:1 - })*/ + }) //报损科室 /*Mock.mock( @@ -2875,10 +2930,12 @@ searchBarcodeHidden = $("#searchBarcodeHidden").val(); var basketBarcodes = [];//扫描篮筐 basketBarcodes.push(searchBarcodeHidden); - var addLoseBarcodeHidden = $("#addLoseBarcodeHidden").val(); + + var addLoseBarcodeHidden = $("#addLoseBarcodeHidden").val();//弹框上的篮筐条码隐藏域 $.ajax({ url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/materialSupplement.mhtml", type: "post", + cache:false,//解决ie async:true, data:{ "packingTaskId":loseOrDameage_packingTaskId, @@ -2901,10 +2958,12 @@ + ""; $("body").append(addNumHtml); loseAndDamageNum();//请求数字 - reloadTopTableMoreborde(basketBarcodes.join(";"));//丢失或报损的补充 reloadPackingTasks();//刷新左下表格 - //reloadPackingLeftTopTasks(); - + //当没有扫条码，上面表格不刷新 + if(!Tools.ArrayUtils.isNotEmpty(basketBarcodes) || searchBarcodeHidden !=""){ + reloadTopTableMoreborde(basketBarcodes.join(";"));//左上表格的刷新 + } + }else{ alert(result.message); } @@ -2951,7 +3010,6 @@ data: {"taskGroup":taskGroup,"basketBarcodes":searchBarcode}, type: "post", beforeSend: function() { - //console.log('start'); }, success: function(result) { if(result.success == true){ @@ -2980,7 +3038,107 @@ +var assemblyTaskLeftTopTable_columns=[ + { + checkbox : true, + switchable: false + }, + { + title : '物品名称', + field : 'tousseName', + align : 'center', + sortable:true, //正序,逆序 + switchable: false, + cellStyle:function(value,row,index){ + for(i=0;i 0){ + return {css:{"color":"red"}}; + } + } + + } + return {css:{"color":"#000"}}; + } + }, + { + title : '数量', + field : 'amount', + align : 'center', + sortable:true, + switchable: false, + formatter:function(v,record){ + var inputId = 'topInput_'+record.tousseID; + return "" + } + }, + { + title : '加急数量', + field : 'urgentAmount', + align : 'center', + sortable:true + }, + { + title : '加急等级', + field : 'urgentLevel', + align : 'center', + sortable:true + }, + { + title : '清洗篮筐', + field : 'basketName', + align : 'center', + sortable:true + }, + { + title : '操作', + field : 'operate', + align : 'center', + sortable:true, + width:300 + }, + { + title : '申请科室', + field : 'department', + align : 'center', + sortable:true + }, + { + title : '清洗时间', + field : 'washTime', + align : 'center', + sortable:true + }, + { + title : '状态', + field : 'status', + align : 'center', + sortable:true + }, + { + title : '回收时间', + field : 'dateTime', + align : 'center', + sortable:true + } + ]; function assemblyTaskLeftTopload(tableDate,columns){ $("#assemblyTaskLeftTopTable").bootstrapTable('destroy'); $("#assemblyTaskLeftTopTable").bootstrapTable( Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css =================================================================== diff -u -r24583 -r24653 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24583) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24653) @@ -1,5 +1,5 @@ body{ - background:url("/dx-disinfectsystem/img/bg.jpg"); + background:url("../../img/bg.jpg"); background-repeat: no-repeat; background-position: top right; @@ -163,13 +163,14 @@ padding-left: 8px; } .content-index .content-index-nav-title li.active{ - background: url(/dx-disinfectsystem/img/img7.gif) repeat-x !important; + background: url(../../img/img7.gif) repeat-x !important; + } .content-index .content-index-nav-title li{ height: 33px; width: 103px; margin-left:4px; - background: url(/dx-disinfectsystem/img/img8.gif) repeat-x !important; + background: url(../../img/img8.gif) repeat-x !important; } .content-index .content-index-nav-title li a{ display:block; @@ -183,7 +184,6 @@ font-size: 15px; } .content-index .content-index-nav-title li a:hover{ - background-color:; color:#596e95 !important; } .content-index .content-index-nav-title li.active a{ @@ -209,15 +209,15 @@ height:86px; } .content-index .content-index-tab-col-mb20 .content-index-tab-icon-text { - background: url(/dx-disinfectsystem/img/icon_text_l.png) no-repeat scroll 0 0 transparent; + background: url(../../img/icon_text_l.png) no-repeat scroll 0 0 transparent; cursor: pointer; display: inline-block; height: 20px; margin-top: 3px; padding-left: 10px; } .content-index .content-index-tab-col-mb20 .content-index-tab-icon-text span { - background: url(/dx-disinfectsystem/img/icon_text_r.png) no-repeat scroll right center transparent; + background: url(../../img/icon_text_r.png) no-repeat scroll right center transparent; color: #FFFFFF; display: inline-block; height: 20px; @@ -238,7 +238,7 @@ right: 3px; opacity: 0.6; filter: alpha(opacity=60); - background: url(/dx-disinfectsystem/img/tabs_close.gif) no-repeat; + background: url(../../img/tabs_close.gif) no-repeat; cursor:pointer; } Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp =================================================================== diff -u -r24630 -r24653 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24630) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24653) @@ -347,16 +347,16 @@
    - +
    - +
    - @@ -940,6 +940,7 @@ + @@ -955,35 +956,35 @@ - - +<%-- + --%> <%-- bootstrap-datetimepicker --%> -<%-- + - --%> + -<%-- <%@ include file="/disinfectsystem/print/print2.jsp"%> --%> -<%-- - --%> +<%@ include file="/disinfectsystem/print/print2.jsp"%> + + + + + + + + + + + -<%-- - - - - - - - - - --%> - + + - + <%-- --%> +