Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r24517 -r24605 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24517) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24605) @@ -83,7 +83,7 @@ var headHeight = $(".head-index").height(); if(headHeight==87){ $(".head-index").hide(); - $(".head-index").css({"height":"0"}) + $(".head-index").css({"height":"0"}); $(this).children("img").attr("src","/dx-disinfectsystem/img/ico4.gif"); $(".other-tab").css({"top":"35px"}); }else{ Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp =================================================================== diff -u -r24585 -r24605 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24585) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24605) @@ -72,7 +72,7 @@ - +
@@ -94,6 +94,7 @@
+
@@ -770,7 +771,7 @@

 是否确定要删除选中的装配信息？

- +
@@ -938,8 +939,8 @@ + - Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js =================================================================== diff -u -r24585 -r24605 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24585) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24605) @@ -4,6 +4,8 @@ var addVal = ""; var packingTasks; var addLOseClassifyTypeResult; +var footTabelids; +var searchBarcodeHidden; //打印标签部分 var packing = false; var packingToussesArray = []; // 装配的器械包数组，用于Selenium自动化测试 @@ -564,110 +566,23 @@ }) } -//补充丢弃器械和报损按钮的数字 -$.ajax({ - url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml", - type: "get", - async:true, - success:function(result){ - var result = JSON.parse(result); - if(result.success == true){ - $("#addLose b").text(result.errorCount); - $("#addBreakage b").text(result.damageCount); - }else{ - alert(result.message); - } - - } -}); + + $(function(){ - //补充丢失表格 + loseAndDamageNum();//丢失和报损的数字 + //补充丢失/报损表格 var addLoseTable="
"; $('#addLoseTableWrapper').append(addLoseTable); + registerLoseOrDamageSubmitHandler("comfirmAddlose"); + //补充丢失弹框 $("#addLose").click(function(){ - loseAnd("丢失"); - + loseOrDamageModel("丢失",""); }); - //点确定 - $("#comfirmAddlose").click(function(){ - //function conformAdd(type){ - var addLoseTableData = $('#addLoseTable').bootstrapTable('getData'); - if(addLoseTableData.length == 0){ - alert("没有待补充的器械！"); - //showResult("没有待补充的器械！" , null , sstsConfig.messagePauseTimeOnPackingPage); - return false; - } - var materialArray = []; - for(var i=0;i提示" - + "
" - + ""+result.message+"" - + "
" - + ""; - $("body").append(addNumHtml); - reloadPackingTasks();//刷新左下表格 - }else{ - alert(result.message); - } - - } - }); - // } - - }); - - //补充丢失器械弹框end - - //补充报损器械按钮弹框 + //补充报损器械弹框 $("#addBreakage").click(function(){ - /* $('.addBreakageModel').modal('show'); - $(".addBreakageModel .modal-title").text("器械补充"); - addPaddingBottom("addBreakageModel");*/ - loseAnd("报损"); + loseOrDamageModel("报损",""); }) - //添加报损器械按钮弹框 $("#addBreakageMsg").click(function(){ $('#addBreakageMsgModel').modal('show'); @@ -687,11 +602,8 @@ $("#printRecycleListModel .modal-title").text("打印回收清单"); }) - //删除按钮弹框 - $("#deleteMsg").click(function(){ - $('.deleteMsgModel').modal('show'); - }) + //装配记录点击表格废弃按钮弹框 $("#deleteInstrumentBag").click(function(){ $('#discardModel').modal('show'); @@ -721,361 +633,7 @@ $('#teachImgModel').modal('show'); $("#teachImgModel .modal-title").text("教学图片"); }) - /* left top table start*/ - var tabH = documentHeight-39-123; - var tableHTop = tabH*0.45; - var tableHFoot = tabH*0.55; - $("#tableTopBox").css({"height":tableHTop+"px"}); - $("#tableFootBox").css({"height":tableHFoot+"px"}); - 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); - /*在篮筐中输入条码*/ - $("#searchBarcode").keydown(function(e){ - if (e.keyCode == 13) { - var searchBarcodeVal = $("#searchBarcode").val(); - if(searchBarcodeVal == ""){ - alert("请扫描篮筐条码"); - return; - } - $.ajax({ - url: "/disinfectSystem/packingController/getPackingTaskList.mhtml", - dataType: "json", - async: true, - data: {"taskGroup":taskGroup,"basketBarcode":searchBarcodeVal}, - type: "post", - beforeSend: function() { - //console.log('start'); - }, - success: function(result) { - if(result.success == true){ - assemblyTaskLeftTopTableCon = result.data; - $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格 - - //$("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); - /* if(!$('#assemblyTaskLeftTopTable')){ - $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); - }*/ - assemblyTaskLeftTopload(result.data,assemblyTaskLeftTopTable_columns); - $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ - "padding-bottom":"2px", - "padding-top":"2px" - }); - $(".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":"29px"}); - subText("assemblyTaskLeftTopTable"); - - }else{ - alert(result.message); - } - - } - }); - - - //把表格高度变小 - $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"}); - $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ - "padding-bottom":"2px", - "padding-top":"2px" - }); - $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({ - "line-height":"0", - "margin-top":"4px", - "margin-bottom":"4px" - }); - // subText("assemblyTaskleftTopTable"); - // $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); - //topTableRowClickEvent(); - } - }) - - - - //中间的高度 - //计算table的高度 - var taskmiddleTop = $(".assembly-task-middlefoot").offset().top; - taskmiddleH = documentHeight - taskmiddleTop-123; - $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); - //var winH = $(window).height(); - /*setInterval(function(){ - var tableHTop = 0; - var tableHFoot = 0; - var resultHTop = 0; - var resultHFoot = 0; - var parentH = $(window.parent.document).find(".head-index").height(); - var taskmiddleTop = $(".assembly-task-middlefoot").offset().top; - var taskmiddleH = ""; - console.log("parentH"+parentH); - if(parentH == 0){ - taskmiddleH = documentHeight - taskmiddleTop-43; - tabH = winH-39-33; - tableHTop = tabH*0.45; - tableHFoot = tabH*0.55; - resultHTop = tableHTop-40; - //resultHFoot = tableHFoot-38; - //$("#assemblyTaskleftFootTableWrapp .fixed-table-container").css("padding-bttom","0"); - }else if(parentH == 87){ - taskmiddleH = documentHeight - taskmiddleTop-130; - tabH = winH-39-122; - tableHTop = tabH*0.45; - tableHFoot = tabH*0.55; - resultHTop = tableHTop-40; - resultHFoot = tableHFoot-76; - }*/ - - /* $("#tableTopBox").css({"height":tableHTop+"px"}); - $("#tableFootBox").css({"height":tableHFoot+"px"}); - - $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); - - $("#assemblyTaskLeftTopTable").bootstrapTable("resetView", {height:resultHTop}); - //$("#assemblyTaskLeftFootTable").bootstrapTable("resetView", {height:resultHFoot}); - - //$("#assemblyTaskLeftFootTable").bootstrapTable("destroy"); - },100);*/ - /* var topTaboffset = $("#assemblyTaskLeftTopTableWrapp").offset().top;*/ - //console.log("winH"+documentHeight); - - function assemblyTaskLeftTopload(tableDate,columns){ - $("#assemblyTaskLeftTopTable").bootstrapTable('destroy'); - $("#assemblyTaskLeftTopTable").bootstrapTable( - { - data:tableDate, - method : 'get', - dataType : "json", - dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行 - striped : true,// 设置为 true 会有隔行变色效果 - undefinedText : " ",// 当数据为 undefined 时显示的字符 - data_local : "zh-US",// 表格汉化 - // responseHandler : "", - detailView: true,//父子表 - search:false, - toolbar:'#printClass', - sortable: true,//是否启用排序 - sortOrder: "desc",//排序方式 - sortName: 'appTime',//排序字段 - showColumns: true,//删选列按钮 - silent: true, //刷新事件必须设置 - clickToSelect:true,//选中行时帮我选中复选框 - formatLoadingMessage: function () { - return "请稍等，正在加载中..."; - }, - formatNoMatches:function(){ //未找到匹配记录 - //return " "; - }, - /* idField : "id",*/ - columns : columns,//表头 - onExpandRow: function (index, row, $detail) { - var thW = $("#assemblyTaskLeftTopTable").find("th"); - var childrens = row.children; - var table=""; - for(var i=0;i"; - //table += ""//simon-test - table += ""//simon-test - +"" - +""; - if(childrens[i].status == '待装配'){ - var supplent = true; - for(var j = 0;j < childrens[i].errors.length ; j++) { - if(errorTypeAdd != childrens[i].errors[j].errorType && ((childrens[i].errors[j].amount - childrens[i].errors[j].additionalAmount) != 0)) { - supplent = false; - } - } - if(!supplent){ - operateHtml += ""; - tipsColor = "style='color:red;'" - } - - if(childrens[i].damages.length > 0){ - operateHtml += ""; - tipsColor = "style='color:red;'" - } - } - - table += "" - +"" - +"" - +"" - +"" - +"" - +"" - +"" - +"" - +"" - +"" - } - table +="
"+childrens[i].tousseName+""+childrens[i].amount+""+childrens[i].urgentAmount+""+childrens[i].urgentLevel+""+childrens[i].basketName+""+operateHtml+""+childrens[i].department+""+childrens[i].washTime+""+childrens[i].status+""+childrens[i].dateTime+"
"; - $detail.html(table); - subText("assemblyTaskleftTopTableSub"); - var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr"); - materialListSub(topTableSubTr,row);//子级材料清单 - metarilsFocus();//显示功能检查 - }, - onClickRow: function(row,element){ - $("#sterilingType").val(row.sterilingMethod); - //根据灭菌程序设置灭菌方式的值 - $("#sterilingType").change(); - packageTypeRequest();//包裝類型 - sterilizerNameRequest();//灭菌炉 - //父材料清单 - materialList(row); - }, - onCheck:function(row){//top - packPrintChange(); - }, - onUncheck:function(row){ - packPrintChange(); - } - /* onCheckAll:function(row){ - packPrintChange(); - }, - onUncheckAll:function(row){ - packPrintChange(); - }*/ - - }); - } - /*var assemblyTaskLeftTopTable = "
"; - $("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); */ - 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"}); - function reloadPackingLeftTopTasks() { - $("#assemblyTaskleftTopTable").bootstrapTable("destroy"); - loadPackingLetTopTasks(); - } - window.reloadPackingLeftTopTasks = reloadPackingLeftTopTasks; - function loadPackingLetTopTasks() { -// $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格 - assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns); - $("#assemblyTaskLeftTopTable").bootstrapTable("refresh"); - $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ - "padding-bottom":"2px", - "padding-top":"2px" - }); - $(".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":"29px"}); - subText("assemblyTaskLeftTopTable"); - } - /*left top table end*/ + /*left foot table start*/ var assemblyTaskleftFootTable_columns=[ { @@ -1209,6 +767,7 @@ }, success: function(result) { //result2 = result; + console.log("父级result...",result); if(result.success == true){ var mapParent = {}; for(var i=0;i"; - table += "" + var operateHtml = ""; + table += "" +"" +""; if(childrens[i].status == '待装配'){ @@ -1295,12 +856,12 @@ } } if(!supplent){ - operateHtml += ""; + operateHtml += ""; tipsColor = "style='color:red;'" } if(childrens[i].damages.length > 0){ - operateHtml += ""; + operateHtml += ""; tipsColor = "style='color:red;'"; } } @@ -1347,88 +908,10 @@ } }); } - //父级材料清单 - function materialList(rows){ - $.ajax({ - url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml", - dataType: "json", - async: true, - data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.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); - } - } - - }) - } - //子级材料清单 - function materialListSub(subTr,rows){ - for(var i=0;i0){ - $("#packPrint").show(); - return; - } - var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections'); - var show = false; - for(var i=0;i"+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=[ { @@ -2083,10 +1500,6 @@ }); } -//left top table 删除按钮 -/*function confirmDeleteTop(){ - $('.deleteMsgModel').modal('show'); -}*/ //left top table 报损按钮 function addBreakageTableBtnTop(){ @@ -2099,14 +1512,11 @@ $('.addLoseModel').modal('show'); $(".addLoseModel .modal-title").text("器械补充"); } - -//left foot table 删除按钮 -function confirmDeleteFoot(){ - $('.deleteMsgModel').modal('show'); -} -//点击删除按钮 删除左下的装配任务 -$("#confirmDelete").click(function(){ - var ids = "";//装配任务id +/*删除装配任务start*/ +//删除按钮弹框,删除左下表格 +$("#deleteMsg").click(function(){ + $('.deleteMsgModel').modal('show'); + var ids = "";//装配任务id var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections'); //遍历父级tr for(var j=0;j请选择器械类型"); if(departTypeName != '请选择分类类型'){ @@ -3108,8 +2544,137 @@ }) +}; +//左上每行表格的丢失按钮 +function addLoseTopTableBtn(that){ + loseOrDameage_packingTaskId =$(that).parent().parent().attr("topTaskId"); + type = "丢失"; + loseOrDamageModel("丢失",loseOrDameage_packingTaskId); + } +//左上每行表格的报损按钮 +function addDamageTopTableBtn(that){ + loseOrDameage_packingTaskId =$(that).parent().parent().attr("topTaskId"); + type = "报损"; + loseOrDamageModel("报损",loseOrDameage_packingTaskId); +} +//左下每行表格的丢失按钮 +function addloseFootTableBtn(that){ + loseOrDameage_packingTaskId =$(that).parent().parent().attr("taskId"); + type = "丢失"; + loseOrDamageModel("丢失",loseOrDameage_packingTaskId); + +} +//左下每行表格的报损按钮 +function addDameageFootTableBtn(that){ + loseOrDameage_packingTaskId =$(that).parent().parent().attr("taskId"); + type = "报损"; + loseOrDamageModel("报损",loseOrDameage_packingTaskId); + +} +//确定补充 +function registerLoseOrDamageSubmitHandler(id){ + $("#"+id).click(function(){ + var addLoseTableData = $('#addLoseTable').bootstrapTable('getData'); + if(addLoseTableData.length == 0){ + //$('.addLoseModel').modal('hide'); + var addNumHtml= "
" + + "
提示
" + + "
" + + "没有待补充的器械！" + + "
" + + "
"; + $("body").append(addNumHtml); + //showResult("没有待补充的器械！" , null , sstsConfig.messagePauseTimeOnPackingPage); + return false; + } + var materialArray = []; + for(var i=0;i提示" + + "
" + + ""+result.message+"" + + "
" + + ""; + $("body").append(addNumHtml); + loseAndDamageNum();//请求数字 + reloadTopTableMoreborde(basketBarcodes.join(";"));//丢失或报损的补充 + reloadPackingTasks();//刷新左下表格 + //reloadPackingLeftTopTasks(); + + }else{ + alert(result.message); + } + + } + }); + + }); + +} +//补充丢失/报损器械弹框end +//补充丢失和报损按钮的数字 +function loseAndDamageNum(){ + $.ajax({ + url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml", + type: "get", + async:true, + success:function(result){ + var result = JSON.parse(result); + if(result.success == true){ + $("#addLose b").text(result.errorCount); + $("#addBreakage b").text(result.damageCount); + }else{ + alert(result.message); + } + + } + }); +}; + + /*function prevPage(num){ var countPage = parseInt($("#goodsImg").attr("imgcount")); if(countPage<2){ @@ -3134,6 +2699,511 @@ $("#goodsImg").attr("startindex", indexPage); }*/ +function reloadTopTableMoreborde(searchBarcode){ + $.ajax({ + url: "/disinfectSystem/packingController/getPackingTaskList.mhtml", + dataType: "json", + async: true, + data: {"taskGroup":taskGroup,"basketBarcodes":searchBarcode}, + type: "post", + beforeSend: function() { + //console.log('start'); + }, + success: function(result) { + console.log("刷新结果===",result); + if(result.success == true){ + assemblyTaskLeftTopTableCon = result.data; + $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格 + assemblyTaskLeftTopload(result.data,assemblyTaskLeftTopTable_columns); + $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ + "padding-bottom":"2px", + "padding-top":"2px" + }); + $(".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":"29px"}); + subText("assemblyTaskLeftTopTable"); + + }else{ + alert(result.message); + } + + } + }); +} + + +/* left top table start*/ +var tabH = documentHeight-39-123; +var tableHTop = tabH*0.45; +var tableHFoot = tabH*0.55; +$("#tableTopBox").css({"height":tableHTop+"px"}); +$("#tableFootBox").css({"height":tableHFoot+"px"}); +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); + /*在篮筐中输入条码*/ + $("#searchBarcode").keydown(function(e){ + if (e.keyCode == 13) { + var searchBarcodeVal = $("#searchBarcode").val(); + + if(searchBarcodeVal == ""){ + alert("请扫描篮筐条码"); + return; + } + console.log("扫描的值",searchBarcodeVal); + + $("#searchBarcodeHidden").val(searchBarcodeVal); + searchBarcodeHidden = $("#searchBarcodeHidden").val(); + $("#searchBarcode").val(""); + reloadTopTableMoreborde(searchBarcodeHidden); + //把表格高度变小 + $("#assemblyTaskLeftTopTable").css({"min-width": "1100px"}); + $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ + "padding-bottom":"2px", + "padding-top":"2px" + }); + $(".fixed-table-toolbar .columns,.fixed-table-toolbar .bs-bars").css({ + "line-height":"0", + "margin-top":"4px", + "margin-bottom":"4px" + }); + // subText("assemblyTaskleftTopTable"); + // $("#assemblyTaskLeftTopTableWrapp .fixed-table-container").css({"padding-bottom":"25px"}); + //topTableRowClickEvent(); + } +}) + + + + //中间的高度 +//计算table的高度 + var taskmiddleTop = $(".assembly-task-middlefoot").offset().top; + taskmiddleH = documentHeight - taskmiddleTop-123; + $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); +//var winH = $(window).height(); +/*setInterval(function(){ + var tableHTop = 0; + var tableHFoot = 0; + var resultHTop = 0; + var resultHFoot = 0; + var parentH = $(window.parent.document).find(".head-index").height(); + var taskmiddleTop = $(".assembly-task-middlefoot").offset().top; + var taskmiddleH = ""; + console.log("parentH"+parentH); + if(parentH == 0){ + taskmiddleH = documentHeight - taskmiddleTop-43; + tabH = winH-39-33; + tableHTop = tabH*0.45; + tableHFoot = tabH*0.55; + resultHTop = tableHTop-40; + //resultHFoot = tableHFoot-38; + //$("#assemblyTaskleftFootTableWrapp .fixed-table-container").css("padding-bttom","0"); + }else if(parentH == 87){ + taskmiddleH = documentHeight - taskmiddleTop-130; + tabH = winH-39-122; + tableHTop = tabH*0.45; + tableHFoot = tabH*0.55; + resultHTop = tableHTop-40; + resultHFoot = tableHFoot-76; + }*/ + + /* $("#tableTopBox").css({"height":tableHTop+"px"}); + $("#tableFootBox").css({"height":tableHFoot+"px"}); + + $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); + + $("#assemblyTaskLeftTopTable").bootstrapTable("resetView", {height:resultHTop}); + //$("#assemblyTaskLeftFootTable").bootstrapTable("resetView", {height:resultHFoot}); + + //$("#assemblyTaskLeftFootTable").bootstrapTable("destroy"); +},100);*/ +/* var topTaboffset = $("#assemblyTaskLeftTopTableWrapp").offset().top;*/ +//console.log("winH"+documentHeight); + +function assemblyTaskLeftTopload(tableDate,columns){ + $("#assemblyTaskLeftTopTable").bootstrapTable('destroy'); + $("#assemblyTaskLeftTopTable").bootstrapTable( + { + data:tableDate, + method : 'get', + dataType : "json", + dataField : "data",// 这是返回的json数组的key.默认好像是"rows".这里只有前后端约定好就行 + striped : true,// 设置为 true 会有隔行变色效果 + undefinedText : " ",// 当数据为 undefined 时显示的字符 + data_local : "zh-US",// 表格汉化 + // responseHandler : "", + detailView: true,//父子表 + search:false, + toolbar:'#printClass', + sortable: true,//是否启用排序 + sortOrder: "desc",//排序方式 + sortName: 'appTime',//排序字段 + showColumns: true,//删选列按钮 + silent: true, //刷新事件必须设置 + clickToSelect:true,//选中行时帮我选中复选框 + formatLoadingMessage: function () { + return "请稍等，正在加载中..."; + }, + formatNoMatches:function(){ //未找到匹配记录 + //return " "; + }, + /* idField : "id",*/ + columns : columns,//表头 + onExpandRow: function (index, row, $detail) { + var thW = $("#assemblyTaskLeftTopTable").find("th"); + var childrens = row.children; + var table=""; + for(var i=0;i"//simon-test + table += ""//simon-test + +"" + +""; + if(childrens[i].status == '待装配'){ + var supplent = true; + for(var j = 0;j < childrens[i].errors.length ; j++) { + if(errorTypeAdd != childrens[i].errors[j].errorType && ((childrens[i].errors[j].amount - childrens[i].errors[j].additionalAmount) != 0)) { + supplent = false; + } + } + if(!supplent){ + operateHtml += ""; + tipsColor = "style='color:red;'" + } + + if(childrens[i].damages.length > 0){ + operateHtml += ""; + tipsColor = "style='color:red;'" + } + } + + table += "" + +"" + +"" + +"" + +"" + +"" + +"" + +"" + +"" + +"" + +"" + } + table +="
"+childrens[i].tousseName+""+childrens[i].amount+""+childrens[i].urgentAmount+""+childrens[i].urgentLevel+""+childrens[i].basketName+""+operateHtml+""+childrens[i].department+""+childrens[i].washTime+""+childrens[i].status+""+childrens[i].dateTime+"
"; + $detail.html(table); + subText("assemblyTaskleftTopTableSub"); + var topTableSubTr = $detail.find("#assemblyTaskleftTopTableSub tbody tr"); + materialListSub(topTableSubTr,row);//子级材料清单 + metarilsFocus();//显示功能检查 + }, + onClickRow: function(row,element){ + $("#sterilingType").val(row.sterilingMethod); + //根据灭菌程序设置灭菌方式的值 + $("#sterilingType").change(); + packageTypeRequest();//包裝類型 + sterilizerNameRequest();//灭菌炉 + //父材料清单 + materialList(row); + }, + onCheck:function(row){//top + packPrintChange(); + }, + onUncheck:function(row){ + packPrintChange(); + } + /* onCheckAll:function(row){ + packPrintChange(); + }, + onUncheckAll:function(row){ + packPrintChange(); + }*/ + + }); +} +/*var assemblyTaskLeftTopTable = "
"; +$("#assemblyTaskLeftTopTableWrapp").append(assemblyTaskLeftTopTable); */ +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"}); +function reloadPackingLeftTopTasks() { + $("#assemblyTaskleftTopTable").bootstrapTable("destroy"); + loadPackingLetTopTasks(); +} +window.reloadPackingLeftTopTasks = reloadPackingLeftTopTasks; +function loadPackingLetTopTasks() { +// $("#assemblyTaskLeftTopTable").bootstrapTable('destroy');//销毁表格 + assemblyTaskLeftTopload(assemblyTaskLeftTopTableCon,assemblyTaskLeftTopTable_columns); + $("#assemblyTaskLeftTopTable").bootstrapTable("refresh"); + $("#assemblyTaskLeftTopTable th,#assemblyTaskLeftTopTable td").css({ + "padding-bottom":"2px", + "padding-top":"2px" + }); + $(".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":"29px"}); + subText("assemblyTaskLeftTopTable"); +} +/*left top table end*/ +//父级材料清单 +function materialList(rows){ + $.ajax({ + url: "/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml", + dataType: "json", + async: true, + data: {"tousseName":rows.tousseName,"tousseDefinitionId":rows.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); + } + } + + }) +} +//子级材料清单 +function materialListSub(subTr,rows){ + for(var i=0;i0){ + $("#packPrint").show(); + return; + } + var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections'); + var show = false; + for(var i=0;i"+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*/ + $(function(){ setInterval(function(){ var boxW = $(".assembly-task-middlefoot").width();