Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js =================================================================== diff -u -r24846 -r24866 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js (.../assemblyManagementSlick2.js) (revision 24846) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js (.../assemblyManagementSlick2.js) (revision 24866) @@ -1,15 +1,4 @@ -var grid,dataView; -var loadData=[]; -var assemblyTaskleftFootTable_columns = []; -var checkboxSelector; -var visibleColumns; -var selectedRows; -var dataviews; -var options; -var addVal = ""; -var multiSelectFootData = []; -var selectionTopOrFoot;//判断上下表格装配 - +//左上 var dataViewTopTable; var gridTopTable; var optionsTopTable; @@ -23,6 +12,33 @@ var multiSelectTopData = []; var dataviewsTop; var childTopData; + +//左下 +var grid,dataView; +var loadData=[]; +var assemblyTaskleftFootTable_columns = []; +var checkboxSelector; +var visibleColumns; +var selectedRows; +var dataviews; +var options; +var addVal = ""; +var multiSelectFootData = []; +var selectionTopOrFoot;//判断上下表格装配 + +//材料清单 +var gridMaterials; +var dataViewMaterials; +var optionsMaterials; +var materials_columns = []; +var visibleColumns_Materials; +var materials_checkboxSelector; +var loadMaterials_ParData = []; +var loadMaterials_ChildData = []; + +//删除 +var footTabelids; + //打印标签部分 var packingTasks; var packing = false; @@ -538,24 +554,29 @@ $(function(){ //页面一加载就获取焦点 $("#searchBarcode").focus(); + $("#searchBarcode").val(""); loseAndDamageNum();//丢失和报损的数字 $("#tableTopBox").show(); $("#tableFootBox").show(); topOrFootTableWrappHeight();//上下table父级的高度 - leftFootLoad();//左下表格 + + //左下表格 + $("#assemblyTaskleftFootTable").css("height",($("#tableFootBox").height()-75)+"px"); + leftFootLoad(); $("#refreshFootTable").click(function(){ leftFootLoad(); }) + /*左上表格 start*/ leftTopload(); + $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-56)+"px"); dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", [], visibleColumnsTopTable, optionsTopTable); $(".slick-viewport").css({"overflow":"auto"}); //subText("assemblyTaskLeftTopTable"); gridTopTable.init(); /*左上在篮筐中输入条码*/ - //reloadTopTableMoreborde(""); $("#searchBarcode").keydown(function(e){ if (e.keyCode == 13) { var searchBarcodeVal = $("#searchBarcode").val(); @@ -571,10 +592,6 @@ //topTableRowClickEvent(); } }) - - - - //点击左下全选 $("#checkboxAllFoottable").click(function(){ var checkedFlag = $(this).is(":checked"); @@ -591,7 +608,6 @@ } } }) - //点击左上全选 $("#checkboxAllToptable").click(function(){ var checkedFlag = $(this).is(":checked"); @@ -609,10 +625,15 @@ } }) - + //材料清单 + materialsTableLoad(); + $("#materialsMenuTable").css("height",($(window).height()-216)+"px"); + dataViewMaterials = new Slick.Data.DataView({ inlineFilters: true }); + gridMaterials = new Slick.Grid("#materialsMenuTable",[], visibleColumns_Materials, optionsMaterials); + gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + gridMaterials.registerPlugin(materials_checkboxSelector); + //gridMaterials.init(); })/*$(function) end*/ - - function topOrFootTableWrappHeight(){ var documentHeight = $(window).height(); var tabH = documentHeight-39-123; @@ -625,390 +646,6 @@ var taskmiddleH = documentHeight -335-123; $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); } -/*左下表格start*/ -function leftFootLoad(){ - options = { - enableCellNavigation: true, - enableColumnReorder: false, - rowHeight: 28, - editable: true, - enableAddRow: false, - forceFitColumns: false, - checked:true, - enableForHeaderCells:true, - asyncEditorLoading: false - }; - //$.support.cors = true; - - assemblyTaskleftFootTable_columns = []; - assemblyTaskleftFootTable_columns.push( - { - field: 'id', - name: 'ID', - align:'center', - sortable: true, - minWidth: 100 - }, - { - id: "tousseName", - name : '物品名称', - field : 'tousseName', - align : 'center', - sortable:true, //正序,逆序 - cssClass: "cell-title", - minWidth: 100, - resizable: false, - formatter:tousseNameFormatter - - }, - { - id:"amount", - name : '数量', - field : 'amount', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100, - formatter:function(r, c, v, cd, dc){ - if(dc.parent == null){ - var inputId = 'input_'+dc.tousseID; - return "
" - + "" - + "
" - + "" - + "" - + "
" - + "
" - }else{ - return v; - } - }, - focusable: false - }, - { - id:"urgentAmount", - name : '加急数量', - field : 'urgentAmount', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100 - }, - { - id:"urgentLevel", - name : '加急等级', - field : 'urgentLevel', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100 - }, - { - id:"basketName", - name : '清洗篮筐', - field : 'basketName', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100 - }, - { - id:"operate", - name : '操作', - field : 'operate', - align : 'center', - sortable:true, - width:300, - cssClass: "cell-title", - minWidth: 200, - formatter:function(r, c, v, cd, dc){ - if(dc.parent != null){ - var tipsColor = ""; - var operateHtml = ""; - if(dc.status == '待装配'){ - var supplent = true; - for(var m = 0;m< dc.errors.length; m++) { - if(errorTypeAdd !=dc.errors[m].errorType && ((dc.errors[m].amount - dc.errors[m].additionalAmount) != 0)) { - supplent = false; - } - } - if(!supplent){ - operateHtml += ""; - tipsColor = "style='color:red;'" - } - - if(dc.damages.length > 0){ - operateHtml += ""; - tipsColor = "style='color:red;'"; - } - } - return operateHtml; - } - } - }, - { - id:"department", - name : '申请科室', - field : 'department', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100 - }, - { - id:"washTime", - name : '清洗时间', - field : 'washTime', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100 - }, - { - id:"status", - name : '状态', - field : 'status', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth: 100 - }, - { - id:"dateTime", - name : '回收时间', - field : 'dateTime', - align : 'center', - sortable:true, - cssClass: "cell-title", - minWidth:150 - } - ); - //将id列隐藏 - visibleColumns = [];//定义一个数组存放显示的列 - for (var i = 0; i < assemblyTaskleftFootTable_columns.length; i++) { - if (i!=0){ - visibleColumns.push(assemblyTaskleftFootTable_columns[i]);//将columns的列push进去 - } - - } - loadPackingTasks(); -} -function loadPackingTasks(){ - $.ajax({ - url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml", - dataType: "json", - type:'get', - cache:false,//解决ie - data: {"taskGroup":taskGroup}, - success:function(data){ - var datas =data.data; - loadData = []; - loadData = requestData(datas);//加载数据 - dataView.beginUpdate(); - dataView.setItems(loadData); - dataView.setFilter(myFilter); - dataView.endUpdate(); - } - }) - leftFootTable(); -} - - -function leftFootTable(){ - $("#assemblyTaskleftFootTable").css("height",($("#tableFootBox").height()-75)+"px"); - dataView = new Slick.Data.DataView({ inlineFilters: true }); - grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); - /* $(".slick-viewport").css({ - "overflow-y": "auto" - });*/ - - //获取选中行数据 - /* grid.onSelectedRowsChanged.subscribe(function(){ - }) - */ - grid.onClick.subscribe(function (e, args) { - grid.setSelectionModel(new Slick.RowSelectionModel());//选中行 - - // 上下table选择互斥 assemblyTaskleftTopTable - $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content") - .find("input[type='checkbox']").each(function(inputIndex, inputEle){ - $(inputEle).prop("checked", false); - }); - multiSelectTopData = []; - - if (dataView.getItem(args.row).parent == null) { - var inputEle = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").eq(args.row).find("input[type='checkbox']"); - if (args.cell == 0) { - $(inputEle).prop("checked", $(inputEle).is(':checked')); - } else { - $(inputEle).prop("checked", !$(inputEle).is(':checked')); - } - }else if(dataView.getItem(args.row).parent != null){ - var childData = dataView.getItem(args.row); - $("#sterilingType").val(childData.sterilingMethod); - $("#sterilingType").change(); - - sterilizerNameRequest();//灭菌炉 - packageTypeRequest();//包裝類型 - $("#packageType").val(childData.packageType); - } - - //multiSelectFootData = []; - var inputCheckBox = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']:checked"); - for (var i = 0; i < inputCheckBox.length; i++) { - var tdEle = $(inputCheckBox[i]).parent().parent(); - multiSelectFootData.push(dataView.getItem($(tdEle).index())); - } - - // 全选与否 - var allCheckBoxes = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']"); - var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length; - $("#checkboxAllFoottable").prop("checked", checkboxBoxAllChecked); - - - //判断按钮 - $('.childrenInput').val(JSON.stringify(multiSelectFootData)); - var childrenInput = $('.childrenInput').val(); - childrenInput = JSON.parse(childrenInput); - packPrintChange(childrenInput,"",""); - //灭菌程序 - if(multiSelectFootData.length>0){ - var num; - for(var i=0;i 0){ - return "tousse-name-color"; - } - - } - }else if(argData.parent == null){ - var children = argData.children; - for(var i=0;i 0){ - return "tousse-name-color"; - } - - } - } - } - return "tousse-name-defaultColor"; - }); - - grid.init(); -} - -/*左下表格end*/ -//判断子菜单start -function tousseNameFormatter(row, cell, value, columnDef, dataContext){ - //如果没有数据,就都返回 - if (value == null || value == undefined || dataContext === undefined) { return ""; } - - value = value.replace(/&/g,"&").replace(//g,">"); - //制造一个占位 - var spacer = ""; - - - //根据ID获取此行内容的索引值 - var idx = dataView.getIdxById(dataContext.id); - - //判断星星父菜单 - if(dataContext.parent == null){ - var child = dataContext.children; - for(var i=0;i loadData[idx].indent) { - //如果data中对应的内容不为空,并且此行缩进大于上一行的缩进 - if (dataContext._collapsed) { - - return spacer + "  "+value+"" ;//收缩 - } else { - return spacer + "   "+value+"";//展开 - } - } else { - return spacer + "  "+value+""; - } -} -function myFilter(item) { - if (item.parent != null) {//代表有子菜单 - var parent = loadData[item.parent]; - while (parent) { - if (parent._collapsed) {//展开 - return false; - } - - parent = loadData[parent.parent]; - } - } - - return true; -} -/*判断子菜单end*/ - /*左上表格start*/ function leftTopload(){ optionsTopTable = { @@ -1020,8 +657,7 @@ checked:true, enableForHeaderCells:true, asyncEditorLoading: false - } - $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-56)+"px"); + } assemblyTaskleftTopTable_columns.push( { field: 'id', @@ -1095,7 +731,7 @@ resizable: false, formatter:function(r, c, v, cd, dc){ if(dc.parent != null){ - var operateHtml = ""; + var operateHtml = ""; if(dc.status == '待装配'){ var supplent = true; for(var m = 0;m< dc.errors.length; m++) { @@ -1189,6 +825,10 @@ } else { $(inputEle).prop("checked", !$(inputEle).is(':checked')); } + + //父级材料清单 + var parTopData = dataViewTopTable.getItem(args.row); + requestMaterialsDataParent(parTopData.tousseName,parTopData.tousseID); }else if(dataViewTopTable.getItem(args.row).parent != null){ childTopData = dataViewTopTable.getItem(args.row); $("#sterilingType").val(childTopData.sterilingMethod); @@ -1197,11 +837,10 @@ sterilizerNameRequest();//灭菌炉 packageTypeRequest();//包裝類型 $("#packageType").val(childTopData.packageType); - //packPrintChange("",childTopData); + //子级材料清单 + requestMaterialsDataChild(childTopData.tousseName,childTopData.tousseID); } - - //multiSelectTopData = []; - + multiSelectTopData = []; var inputCheckBox = $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").find("input[type='checkbox']:checked"); for (var i = 0; i < inputCheckBox.length; i++) { var tdEle = $(inputCheckBox[i]).parent().parent(); @@ -1213,11 +852,7 @@ var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length; $("#checkboxAllToptable").prop("checked", checkboxBoxAllChecked); - - $('.childrenInputTop').val(JSON.stringify(multiSelectTopData)); - var childrenInpuTop = $('.childrenInputTop').val(); - childrenInpuTop = JSON.parse(childrenInpuTop); - packPrintChange("",childrenInpuTop); + packPrintChange("", "top"); //灭菌程序 if(multiSelectTopData.length>0){ var num; @@ -1226,8 +861,6 @@ } $("#sterilingType").val(num.sterilingMethod); $("#sterilingType").change(); - - sterilizerNameRequest();//灭菌炉 packageTypeRequest();//包裝類型 $("#packageType").val(num.packageType); @@ -1418,6 +1051,21 @@ //根据ID获取此行内容的索引值 var idx = dataViewTopTable.getIdxById(dataContext.id); + if(dataContext.parent !=null){ + spacer += ""; + /*if(dataContext.taskType != taskType_recyclingRecord){ + spacer += ""; + }*/ + } + + + + + + + + + if (loadDataTop[idx + 1] && loadDataTop[idx + 1].indent > loadDataTop[idx].indent) { //如果data中对应的内容不为空,并且此行缩进大于上一行的缩进 if (dataContext._collapsed) { @@ -1444,7 +1092,388 @@ return true; } +/*左上表格end*/ +/*左下表格start*/ +function leftFootLoad(){ + options = { + enableCellNavigation: true, + enableColumnReorder: false, + rowHeight: 28, + editable: true, + enableAddRow: false, + forceFitColumns: false, + checked:true, + enableForHeaderCells:true, + asyncEditorLoading: false + }; + //$.support.cors = true; + + assemblyTaskleftFootTable_columns = []; + assemblyTaskleftFootTable_columns.push( + { + field: 'id', + name: 'ID', + align:'center', + sortable: true, + minWidth: 100 + }, + { + id: "tousseName", + name : '物品名称', + field : 'tousseName', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 100, + resizable: false, + formatter:tousseNameFormatter + }, + { + id:"amount", + name : '数量', + field : 'amount', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100, + formatter:function(r, c, v, cd, dc){ + if(dc.parent == null){ + var inputId = 'input_'+dc.tousseID; + return "
" + + "" + + "
" + + "" + + "" + + "
" + + "
" + }else{ + return v; + } + }, + focusable: false + }, + { + id:"urgentAmount", + name : '加急数量', + field : 'urgentAmount', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100 + }, + { + id:"urgentLevel", + name : '加急等级', + field : 'urgentLevel', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100 + }, + { + id:"basketName", + name : '清洗篮筐', + field : 'basketName', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100 + }, + { + id:"operate", + name : '操作', + field : 'operate', + align : 'center', + sortable:true, + width:300, + cssClass: "cell-title", + minWidth: 200, + formatter:function(r, c, v, cd, dc){ + if(dc.parent != null){ + + var tipsColor = ""; + var operateHtml = ""; + if(dc.status == '待装配'){ + var supplent = true; + for(var m = 0;m< dc.errors.length; m++) { + if(errorTypeAdd !=dc.errors[m].errorType && ((dc.errors[m].amount - dc.errors[m].additionalAmount) != 0)) { + supplent = false; + } + } + if(!supplent){ + operateHtml += ""; + tipsColor = "style='color:red;'" + } + + if(dc.damages.length > 0){ + operateHtml += ""; + tipsColor = "style='color:red;'"; + } + } + return operateHtml; + } + } + }, + { + id:"department", + name : '申请科室', + field : 'department', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100 + }, + { + id:"washTime", + name : '清洗时间', + field : 'washTime', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100 + }, + { + id:"status", + name : '状态', + field : 'status', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth: 100 + }, + { + id:"dateTime", + name : '回收时间', + field : 'dateTime', + align : 'center', + sortable:true, + cssClass: "cell-title", + minWidth:150 + } + ); + //将id列隐藏 + visibleColumns = [];//定义一个数组存放显示的列 + for (var i = 0; i < assemblyTaskleftFootTable_columns.length; i++) { + if (i!=0){ + visibleColumns.push(assemblyTaskleftFootTable_columns[i]);//将columns的列push进去 + } + + } + loadPackingTasks(); +} +function loadPackingTasks(){ + $.ajax({ + url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml", + dataType: "json", + type:'get', + cache:false,//解决ie + data: {"taskGroup":taskGroup}, + success:function(data){ + var datas =data.data; + loadData = []; + loadData = requestData(datas);//加载数据 + dataView.beginUpdate(); + dataView.setItems(loadData); + dataView.setFilter(myFilter); + dataView.endUpdate(); + } + }) + leftFootTable(); +} +function leftFootTable(){ + dataView = new Slick.Data.DataView({ inlineFilters: true }); + grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); + /* $(".slick-viewport").css({ + "overflow-y": "auto" + });*/ + grid.onClick.subscribe(function (e, args) { + grid.setSelectionModel(new Slick.RowSelectionModel());//选中行 + + // 上下table选择互斥 assemblyTaskleftTopTable + $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content") + .find("input[type='checkbox']").each(function(inputIndex, inputEle){ + $(inputEle).prop("checked", false); + }); + multiSelectTopData = []; + + if (dataView.getItem(args.row).parent == null) { + var inputEle = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").eq(args.row).find("input[type='checkbox']"); + if (args.cell == 0) { + $(inputEle).prop("checked", $(inputEle).is(':checked')); + } else { + $(inputEle).prop("checked", !$(inputEle).is(':checked')); + } + //父级材料清单 + var parData = dataView.getItem(args.row); + requestMaterialsDataParent(parData.tousseName,parData.tousseID); + + }else if(dataView.getItem(args.row).parent != null){ + var childData = dataView.getItem(args.row); + $("#sterilingType").val(childData.sterilingMethod); + $("#sterilingType").change(); + + sterilizerNameRequest();//灭菌炉 + packageTypeRequest();//包裝類型 + $("#packageType").val(childData.packageType); + //子级材料清单 + requestMaterialsDataChild(childData.tousseName,childData.tousseID); + + } + + multiSelectFootData = []; + var inputCheckBox = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']:checked"); + for (var i = 0; i < inputCheckBox.length; i++) { + var tdEle = $(inputCheckBox[i]).parent().parent(); + multiSelectFootData.push(dataView.getItem($(tdEle).index())); + } + + //判断按钮 + packPrintChange(dataView.getItem(args.row), "foot"); + + // 全选与否 + var allCheckBoxes = $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content").find("input[type='checkbox']"); + var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length; + $("#checkboxAllFoottable").prop("checked", checkboxBoxAllChecked); + + //灭菌程序 + if(multiSelectFootData.length>0){ + var num; + for(var i=0;i 0){ + return "tousse-name-color"; + } + + } + }else if(argData.parent == null){ + var children = argData.children; + for(var i=0;i 0){ + return "tousse-name-color"; + } + + } + } + } + return "tousse-name-defaultColor"; + }); + + grid.init(); +} +//判断子菜单start +function tousseNameFormatter(row, cell, value, columnDef, dataContext){ + //如果没有数据,就都返回 + if (value == null || value == undefined || dataContext === undefined) { return ""; } + + value = value.replace(/&/g,"&").replace(//g,">"); + //制造一个占位 + var spacer = ""; + + + //根据ID获取此行内容的索引值 + var idx = dataView.getIdxById(dataContext.id); + + //判断星星父菜单 + if(dataContext.parent == null){ + var child = dataContext.children; + for(var i=0;i"; + if(dataContext.taskType != taskType_recyclingRecord){ + spacer += ""; + } + } + if (loadData[idx + 1] && loadData[idx + 1].indent > loadData[idx].indent) { + //如果data中对应的内容不为空,并且此行缩进大于上一行的缩进 + if (dataContext._collapsed) { + + return spacer + "  "+value+"" ;//收缩 + } else { + return spacer + "   "+value+"";//展开 + } + } else { + return spacer + "  "+value+""; + } +} +function myFilter(item) { + if (item.parent != null) {//代表有子菜单 + var parent = loadData[item.parent]; + while (parent) { + if (parent._collapsed) {//展开 + return false; + } + + parent = loadData[parent.parent]; + } + } + + return true; +} +/*判断子菜单end*/ +/*左下表格end*/ + //上下公共方法数据 function requestData(data){ var renderData = []; @@ -1470,6 +1499,7 @@ d["haveIDCard"]=data[i].haveIDCard; d["sterilingMethod"]=data[i].sterilingMethod; d["packageType"]=data[i].packageType; + d["tousseID"]=data[i].tousseID; tempId ++; var childrens = data[i].children; @@ -1495,14 +1525,281 @@ k["taskType"]=childrens[j].taskType; k["sterilingMethod"]=childrens[j].sterilingMethod; k["packageType"]=childrens[j].packageType; + k["tousseID"]=childrens[j].tousseID; + k["taskId"]=childrens[j].taskId; tempId ++; } } } return renderData; } -/*左上表格end*/ +/*删除装配任务start*/ +//删除按钮弹框,删除左下表格 +$("#deleteMsg").click(function(){ + $('.deleteMsgModel').modal('show'); + var ids = "";//装配任务id + var selections =multiSelectFootData; + //遍历父级tr + for(var j=0;j"+value+""; + } + }, + { + id: "count", + name : '数量', + field : 'count', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + resizable: false, + }, + { + id: "detachable", + name : '是否可拆', + field : 'detachable', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + resizable: false, + minWidth:100 + } + ) + //将id列隐藏 + visibleColumns_Materials = [];//定义一个数组存放显示的列 + for (var i = 0; i < materials_columns.length; i++) { + if (i!=1){ + visibleColumns_Materials.push(materials_columns[i]);//将columns的列push进去 + } + + } + +} +function requestMaterialsDataParent(tousseName,tousseID){ + materialsTableLoad(); + $.ajax({ + url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml", + dataType: "json", + async: true, + data: {"tousseName":tousseName,"tousseDefinitionId":tousseID}, + type: "post", + success: function(result) { + var materialsParData = result.rows; + if(result.success == true){ + loadMaterials_ParData = []; + for (var i = 0; i < materialsParData.length; i++) { + var d = (loadMaterials_ParData[i] = {}); + d["id"] =materialsParData[i].id; + d["name"] = materialsParData[i].name; + d["count"] = materialsParData[i].count; + d["detachable"] =materialsParData[i].detachable; + d["washQualityCheckPoint"] =materialsParData[i].washQualityCheckPoint; + d["washQualityCheckMethod"] =materialsParData[i].washQualityCheckMethod; + d["functionCheck"] =materialsParData[i].functionCheck; + } + gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ParData, visibleColumns_Materials, optionsMaterials); + + //器械总数 + $("#materialTotalAmount").text(result.materialTotalAmount); + //一次性物品总数 + $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount); + metarilsFocus();//显示功能检查 + }else{ + alert(result.message); + } + } + }) + gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + gridMaterials.registerPlugin(materials_checkboxSelector); + +} +function requestMaterialsDataChild(child_tousseName,child_tousseID){ + materialsTableLoad(); + $.ajax({ + url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getMaterialDefinitionByTousseName.mhtml", + dataType: "json", + async: true, + data: {"tousseName":child_tousseName,"tousseDefinitionId":child_tousseID}, + type: "post", + success: function(result) { + var materialsChildData = result.rows; + if(result.success == true){ + loadMaterials_ChildData = []; + for (var i = 0; i < materialsChildData.length; i++) { + var d = (loadMaterials_ChildData[i] = {}); + d["id"] =materialsChildData[i].id; + d["name"] = materialsChildData[i].name; + d["count"] = materialsChildData[i].count; + d["detachable"] =materialsChildData[i].detachable; + d["washQualityCheckPoint"] =materialsChildData[i].washQualityCheckPoint; + d["washQualityCheckMethod"] =materialsChildData[i].washQualityCheckMethod; + d["functionCheck"] =materialsChildData[i].functionCheck; + } + gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ChildData, visibleColumns_Materials, optionsMaterials); + //器械总数 + $("#materialTotalAmount").text(result.materialTotalAmount); + //一次性物品总数 + $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount); + metarilsFocus();//显示功能检查 + }else{ + alert(result.message); + } + } + }) + gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + gridMaterials.registerPlugin(materials_checkboxSelector); +} +//材料清单表格上mouseover显示的表格 +function metarilsFocus(){ + var materialsTr= $("#materialsMenuTable .slick-viewport .grid-canvas .ui-widget-content"); + 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(".slick-cell span").attr("washQualityCheckPoint"); + var washQualityCheckMethod = $(this).find(".slick-cell span").attr("washQualityCheckMethod"); + var functioncheck = $(this).find(".slick-cell 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(); + }) + } +} +/*材料清单表格end*/ /*数量增减start*/ function addNum(that){ var numVals = parseInt($(that).parent().siblings("input").val()); @@ -1573,38 +1870,28 @@ }; //判断按钮显示 -function packPrintChange(selectRowDatas,selectRowDatasTop,childTopData){ - //左上表格 - var selectionsTop = selectRowDatasTop; - //var childTopData = childTopData; - if(selectionsTop.length>0){ - $("#packPrint").show(); - return; - } - //左下表格 - var selections = selectRowDatas; +function packPrintChange(selectRowDatas, direction){ var show = false; - for(var i=0;i 装配管理 - + @@ -345,7 +345,9 @@ 一次性物品总数 添加质量监测 -
+
+
+
@@ -436,20 +438,27 @@ --> - + + - - - - - - - - - - - - @@ -472,16 +481,13 @@ - - - - + @@ -507,6 +513,9 @@ + + + <%-- bootstrap-datetimepicker --%>