Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js =================================================================== diff -u -r24492 -r24513 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24492) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24513) @@ -17,7 +17,7 @@ }else{ tempTableId = "assemblyTaskLeftTopTable"; } - var table = $("#" + tempTableId); + var table = $("#" + tempTableId); var selections = table.bootstrapTable('getSelections'); if(selections == null || selections.length == 0){ return ; @@ -209,38 +209,39 @@ $("#inspectorCodeInput").keydown(function(e){ if (e.keyCode == 13) { var inspectorCodeInput = $("#inspectorCodeInput").val(); - requstCode(inspectorCodeInput,"inspectorInput","inspectorCodeInputHidden"); + requstCode(inspectorCodeInput,"inspectorCodeInput","inspectorInput","inspectorCodeInputHidden"); } }) //配包人条码 $("#operatorCode").keydown(function(e){ if (e.keyCode == 13) { var operatorCode = $("#operatorCode").val(); - requstCode(operatorCode,"operator","operatorCodeHidden"); + requstCode(operatorCode,"operatorCode","operator","operatorCodeHidden"); } }) //审核人条码 $("#reviewerCode").keydown(function(e){ if (e.keyCode == 13) { var reviewerCode = $("#reviewerCode").val(); - requstCode(reviewerCode,"reviewer","reviewerCodeHidden"); + requstCode(reviewerCode,"reviewerCode","reviewer","reviewerCodeHidden"); } }) //包装人条码 $("#wrapperCode").keydown(function(e){ if (e.keyCode == 13) { var wrapperCode = $("#wrapperCode").val(); - requstCode(wrapperCode,"wrapper","wrapperCodeHidden"); + requstCode(wrapperCode,"wrapperCode","wrapper","wrapperCodeHidden"); } }) //灭菌人条码 $("#sterileUserCode").keydown(function(e){ if (e.keyCode == 13) { var sterileUserCode = $("#sterileUserCode").val(); - requstCode(sterileUserCode,"sterileUserName","sterileUserCodeHidden"); + requstCode(sterileUserCode,"sterileUserCode","sterileUserName","sterileUserCodeHidden"); } }) -/*function requstCode(barcode,name,namecode,focusInput){ + +function requstCode(barcode,clearId,name,namecode){ $.ajax({ url:"/disinfectSystem/web/userController/getUserByBarcode.mhtml", dataType: "json", @@ -251,24 +252,7 @@ if(result.success == true){ $("#"+name).val(result.fullName); $("#"+namecode).val(result.name);//工号 - $("#"+focusInput).focus(); - }else{ - alert(result.message); - } - } - }) -}*/ -function requstCode(barcode,name,namecode){ - $.ajax({ - url:"/disinfectSystem/web/userController/getUserByBarcode.mhtml", - dataType: "json", - async: false, - data: {"barcode":barcode}, - type: "post", - success:function(result){ - if(result.success == true){ - $("#"+name).val(result.fullName); - $("#"+namecode).val(result.name);//工号 + $("#"+clearId).val(""); $("#"+name).parent().parent().parent().next().children("div:first-child").children().children("input").focus(); }else{ alert(result.message); @@ -729,7 +713,44 @@ table +=""; $detail.html(table); subText("assemblyTaskleftTopTableSub"); - } + var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr"); + for(var i=0;i 0){ return {css:{"color":"red"}}; } - return {css:{"color":"#000"}}; + } } + return {css:{"color":"#000"}}; } }, @@ -853,6 +875,7 @@ loadPackingTasks(); } window.reloadPackingTasks = reloadPackingTasks; + //左下表格数据 function loadPackingTasks(){ $.ajax({ url: "/disinfectSystem/packingController/getPackingTaskList.mhtml", @@ -872,6 +895,7 @@ } var assemblyTaskleftFootTable = "
"; $("#assemblyTaskleftFootTableWrapp").append(assemblyTaskleftFootTable); + $("#assemblyTaskleftFootTable").bootstrapTable("destroy"); assemblyTaskLeftFootload(result.data,assemblyTaskleftFootTable_columns); $("#assemblyTaskleftFootTable").bootstrapTable("refresh"); $("#assemblyTaskleftFootTable").css({"min-width": "1100px"}); @@ -974,33 +998,74 @@ table +=""; $detail.html(table); subText("assemblyTaskleftFootTableSub"); + var footTableSubTr = $detail.find("#assemblyTaskleftFootTableSub tbody tr"); + for(var i=0;i0){*/ - $("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll"); - /*}*/ - } + }; + $("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll"); + //材料清单 + $.ajax({ + url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml", + dataType: "json", + async: true, + data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, + type: "post", + success: function(result) { + if(result.success == true){ + //器械总数 + $("#materialTotalAmount").text(result.materialTotalAmount); + //一次性物品总数 + $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount); + $("#materialsTable").bootstrapTable('destroy'); + materialsLoadTable(result.rows,materials_columns); + metarilsFocus();//显示功能检查 + }else{ + alert(result.message); + } + } + + }) + } }); } @@ -1023,7 +1088,74 @@ "padding-top":"2px" }) $("#assemblyTaskLeftFootTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); + /*left foot table end*/ + /*材料清单table start*/ + function materialsLoadTable(tableDate,columns){//detailView树形菜单 + $("#materialsTable").bootstrapTable( + { + data:tableDate, + method : 'get', + striped : true,// 设置为 true 会有隔行变色效果 + undefinedText : " ",// 当数据为 undefined 时显示的字符 + data_local : "zh-US",// 表格汉化 + responseHandler : "", + sortable: true,//是否启用排序 + sortOrder: "desc",//排序方式 + sortName: 'appTime',//排序字段 + formatLoadingMessage: function () { + return "请稍等，正在加载中..."; + }, + formatNoMatches:function(){ //未找到匹配记录 + //return " "; + }, + columns : columns + }); + + } + var materials_columns=[ + { + checkbox : true, + }, + { + title : '材料名称', + field : 'name', + align : 'center', + sortable:true, //正序,逆序 + width:500, + formatter:function(v,record){ + return ""+v+""; + } + }, + { + title : '数量', + field : 'count', + align : 'center', + sortable:true //正序,逆序 + }, + { + title : '是否可拆', + field : 'detachable', + align : 'center', + sortable:true //正序,逆序 + } + ]; + + //右边材料清单 + 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 allModelication_columns=[ @@ -1207,47 +1339,8 @@ } ]; - /*材料清单table start*/ - var materials_columns=[ - { - checkbox : true, - }, - { - title : '材料名称', - field : 'materialsName', - align : 'center', - sortable:true, //正序,逆序 - width:500 - }, - { - title : '数量', - field : 'materialsNum', - align : 'center', - sortable:true //正序,逆序 - }, - { - title : '是否可拆', - field : 'isOpen', - align : 'center', - sortable:true //正序,逆序 - } - ]; + - - //右边材料清单 - var materialsTop = $("#materialsMenu").offset().top; - var materialsH = documentHeight-materialsTop-123; - var materialstable = "
"; - $("#materialsMenu").append(materialstable); - loadTable("materialsTable", [],materials_columns,false,false,"",false,false,false); - //把表格的高度变小 - $("#materialsTable").css({"min-width": "300px"}); - $("#materialsTable th,#materialsTable td").css({ - "padding-bottom":"2px", - "padding-top":"2px" - }) - /*材料清单 table end*/ - //var recoredTableOff = $("#todayAssemblyRecordTableWrapp").offset().top; //今天分组装配记录 var pageTableH = $(".fixed-table-pagination").height(); @@ -1307,13 +1400,35 @@ modelCenter("#deleteInstrumentBag"); //装配记录点击表格废弃按钮 modelCenter("#urgent"); //装配记录点击表格加急按钮 - $("#assemblyTaskLeftTopTable").on("check.bs.table check-all.bs.table",function(row){ + $("#assemblyTaskLeftTopTable").on("check.bs.table",function(row){ //首先判断FootTable是否已有选中 /*var footCheckeds=$("#assemblyTaskleftFootTable").bootstrapTable("getSelections"); if(footCheckeds.length>0){*/ $("#assemblyTaskleftFootTable").bootstrapTable("uncheckAll"); /*}*/ - + //材料清单 + $.ajax({ + url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml", + dataType: "json", + async: false, + data: {"tousseName":row.tousseName,"tousseDefinitionId":row.tousseID}, + type: "post", + success: function(result) { + console.log("2222..",result); + if(result.success == true){ + //器械总数 + $("#materialTotalAmount").text(result.materialTotalAmount); + //一次性物品总数 + $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount); + $("#materialsTable").bootstrapTable('destroy'); + materialsLoadTable(result.rows,materials_columns); + metarilsFocus();//显示功能检查 + }else{ + alert(result.message); + } + } + + }) }) @@ -1621,9 +1736,9 @@ } //left top table 删除按钮 -function confirmDeleteTop(){ +/*function confirmDeleteTop(){ $('.deleteMsgModel').modal('show'); -} +}*/ //left top table 报损按钮 function addBreakageTableBtnTop(){ @@ -1641,12 +1756,43 @@ function confirmDeleteFoot(){ $('.deleteMsgModel').modal('show'); } - +//点击删除按钮 删除左下的装配任务 +$("#confirmDelete").click(function(){ + var ids = "";//装配任务id + var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections'); + //遍历父级tr + for(var j=0;j(windowWidth-materialsW)){ - x = (windowWidth-materialsW-50); - } - if(y>(windowHeight-materialsH-100)){ - y = (windowHeight-materialsH-50); - x = (windowWidth-materialsW-300); - } - $(".metariles-list-tips").css({ - "position":"absolute", - "left": x + "px", - "top": y + "px", - "z-index":"200000" - }) - $(".metariles-list-tips").show(); - }) - $(materialsTr[i]).mouseout(function(e){ - $(".metariles-list-tips").hide(); - }) - } -}) - +/*$(function(){ + + +})*/ +function metarilsFocus(){ + //材料清单表格上mouseover显示的表格 + var materialsTr= $("#materialsTable tr"); + var tables; + for (var i = 0; i< materialsTr.length; i++) { + $(materialsTr[i]).mouseover(function(e){ + $(".metariles-firstTd").parent().empty().append("清洗质量检查方法清洗质量检查关注点功能检查"); + $(this).css({"cursor":"pointer"}); + var washQualityCheckPoint = $(this).find("td span").attr("washQualityCheckPoint"); + var washQualityCheckMethod = $(this).find("td span").attr("washQualityCheckMethod"); + var functionCheck = $(this).find("td span").attr("functionCheck"); + tables = "" + + ""+washQualityCheckPoint+"" + +""+washQualityCheckMethod+"" + + ""+functionCheck+"" + + ""; + $(".metariles-firstTd").after(tables); + var e =e||window.event; + var scrollX = document.documentElement.scrollLeft || document.body.scrollLeft; + var scrollY = document.documentElement.scrollTop || document.body.scrollTop; + var x = e.pageX || e.clientX + scrollX; + var y = e.pageY || e.clientY + scrollY; + var windowWidth = $(window).width(); + var windowHeight = $(window).height(); + var materialsW = $(".metariles-list-tips").width(); + var materialsH = $(".metariles-list-tips").height(); + y= y+10; + if(x>(windowWidth-materialsW)){ + x = (windowWidth-materialsW-50); + } + if(y>(windowHeight-materialsH-100)){ + y = (windowHeight-materialsH-50); + x = (windowWidth-materialsW-300); + } + $(".metariles-list-tips").css({ + "position":"absolute", + "left": x + "px", + "top": y + "px", + "z-index":"200000" + }) + + + $(".metariles-list-tips").show(); + }) + $(materialsTr[i]).mouseout(function(e){ + $(".metariles-list-tips").hide(); + }) + } + + +} /*function prevPage(num){ var countPage = parseInt($("#goodsImg").attr("imgcount")); if(countPage<2){ Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp =================================================================== diff -u -r24492 -r24513 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24492) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24513) @@ -9,12 +9,12 @@ <%@ include file="./disinfectsystem/commons/tagLibsPath.jsp"%> JSP模板 - + - + @@ -130,7 +130,7 @@
-

系统告警

+

@@ -145,6 +145,27 @@ + +
+ + + + + +
告警类型告警数量操作
+
+
+ + +
@@ -202,7 +223,7 @@
-
+ @@ -932,9 +927,6 @@ <%-- bootstrap-datetimepicker --%> - - - @@ -974,24 +966,8 @@ searchURL = searchURL.substring(1, searchURL.length); taskGroup = decodeURIComponent(searchURL.split("?")[0].split("=")[1]); } - - /* var sterilerGroup; - var paramName = taskGroup; - var reg = new RegExp("(^|&)" + paramName + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象 - var r = window.location.search.substr(1).match(reg); //匹配目标参数 - if (r != null) { - sterilerGroup = decodeURI(r[2]) - } */ - Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r24492 -r24513 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24492) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24513) @@ -30,12 +30,15 @@ break; } }; - if (modelData.type == 4 && tabIdSp[1] == "systemWarning") { + if (modelData.type == 4) { + + if(tabIdSp[1] == "systemWarning"){ $("#systemWarning").modal('show'); return; }else if(tabIdSp[1] == "satisfactionSurveyTable"){ - + $("#satisfactionSurvey").modal('show'); + return; } }; @@ -367,9 +370,10 @@ }) //获取告警数据 - $.ajax({ + + /* $.ajax({ //url:"/system/systemWarningAction!getSystemWarning.do", - url:"http://gjsj", + // url:"http://gjsj", type: 'get', dataType:'JSON', async:false, @@ -385,17 +389,57 @@ //console.log("tabId数据..."+tabId); //changeTab('menu_xtgjid','系统告警','html/xtgj.html') //var myId = - if(menuJsonRows[i].type == 4 ){ - if(tabId == "systemWarning"){ - $("#systemWarningTtitle").text("系统告警"); - }else if(tabId == "satisfactionSurveyTable"){ - $("#systemWarningTtitle").text("满意度调查表"); - } - if (result.total == undefined || result.total <= 0) { + if(menuJsonRows[i].type == 4 && tabId == "systemWarning"){ + $("#systemWarning .title-font").text("系统告警"); + if (result.total == undefined || result.total <= 0) { + } else if(result.total >= 1 && result.total <= 10) { + $("#menu_" + tabId).append("

"); + $("#systemWarning").modal('show'); + + for (var j=0;j" + + "
"+result.rows[j].warningItemType+"
" + + "" + + "" + + "
"+result.rows[j].warningAmount+"
" + + "" + + "" + + "" + + "" + + ""; + $("#systemWarningTable").after(trs); + } + + } else if(result.total >= 11) { + $("#menu_" + tabId).append("

"); + $("#systemWarning").modal('show'); + // $("#systemWarningTtitle").text("系统告警"); + for (var k=0;k" + + "
"+result.rows[k].warningItemType+"
" + + "" + + "" + + "
"+result.rows[k].warningAmount+"
" + + "" + + "" + + "" + + "" + + ""; + $("#systemWarningTable").after(trs); + } + + } + //return; + }else if(menuJsonRows[i].type == 4 && tabId == "satisfactionSurveyTable"){ + $("#satisfactionSurvey .title-font").text("满意度调查表"); + if (result.total == undefined || result.total <= 0) { + } else if(result.total >= 1 && result.total <= 10) { $("#menu_" + tabId).append("

"); - $("#systemWarning").modal('show'); + $("#satisfactionSurvey").modal('show'); for (var j=0;j" + "" + "" - + "" - $("#systemWarningTable").after(trs); + + ""; + $("#satisfactionSurveyTable").after(trs); } + } else if(result.total >= 11) { $("#menu_" + tabId).append("

"); - $("#systemWarning").modal('show'); - $("#systemWarningTtitle").text("系统告警"); + $("#satisfactionSurvey").modal('show'); for (var k=0;k" @@ -426,17 +470,18 @@ + "" + "" + "" - + "" - $("#systemWarningTable").after(trs); + + ""; + $("#satisfactionSurveyTable").after(trs); } + } } } }else{ - // console.log(result.message); + alert(result.message); } } - }) + })*/ //获取图标数字提醒(发货计划) $.ajax({ @@ -532,7 +577,7 @@ }) //右下角内容 $.ajax({ - url:"http://rightbottom", + //url:"http://rightbottom", type: 'post', // data:{departCode} dataType:'JSON',