" + "

提示

" @@ -345,7 +347,7 @@ assemblyTaskLeftTopTableCon = assembleArray; reloadPackingLeftTopTasks();//刷新左上表格 leftFootLoad();//刷新左下表格 - //printLabelsAfterPacking();//打印标签 + printLabelsAfterPacking();//打印标签 }); function hidePackingTousseBtnClick_mask(){ @@ -625,6 +627,9 @@ } }) + //补充丢失 + /*loseColums(); + gridLose = new Slick.Grid("#addLoseTable",[], visibleColumns_Lose, optionsLose);*/ //材料清单 materialsTableLoad(); $("#materialsMenuTable").css("height",($(window).height()-216)+"px"); @@ -740,11 +745,11 @@ } } if(!supplent){ - operateHtml += ""; + operateHtml += ""; } if(dc.damages.length > 0){ - operateHtml += ""; + operateHtml += ""; } } return operateHtml; @@ -829,16 +834,51 @@ //父级材料清单 var parTopData = dataViewTopTable.getItem(args.row); requestMaterialsDataParent(parTopData.tousseName,parTopData.tousseID); + + //判断包装类型,灭菌程序 + if ($(inputEle).is(':checked')) { + topTableLastestSelects.push(JSON.stringify(parTopData)); + } else { + // 不选中就删除 + if (topTableLastestSelects.length > 0) { + var tempTopTableParentRows = []; + for(var i = 0; i < topTableLastestSelects.length; i++) { + if (topTableLastestSelects[i] != JSON.stringify(parTopData)) { + tempTopTableParentRows.push(topTableLastestSelects[i]); + continue; + } + } + topTableLastestSelects = tempTopTableParentRows; + } + } }else if(dataViewTopTable.getItem(args.row).parent != null){ childTopData = dataViewTopTable.getItem(args.row); - $("#sterilingType").val(childTopData.sterilingMethod); - $("#sterilingType").change(); - - sterilizerNameRequest();//灭菌炉 - packageTypeRequest();//包裝類型 - $("#packageType").val(childTopData.packageType); //子级材料清单 requestMaterialsDataChild(childTopData.tousseName,childTopData.tousseID); + + //判断包装类型,灭菌程序 + for (var k = args.row - 1; k >=0; k--) { + var ToptempParent = dataViewTopTable.getItem(k); + if (ToptempParent.parent == null) { + if (topTableLastestSelects.indexOf(JSON.stringify(ToptempParent)) == -1) { + topTableLastestSelects.push(JSON.stringify(ToptempParent)); + } else { + // 找到了 + var tempTopTableLastestSelects = []; + if (topTableLastestSelects.length > 0) { + for (var i = 0; i < topTableLastestSelects.length; i++) { + if (topTableLastestSelects[i] != JSON.stringify(ToptempParent)) { + tempTopTableLastestSelects.push(topTableLastestSelects[i]); + } + }; + } + topTableLastestSelects = tempTopTableLastestSelects; + topTableLastestSelects.push(JSON.stringify(ToptempParent)); + } + break; + } + } + } multiSelectTopData = []; var inputCheckBox = $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").find("input[type='checkbox']:checked"); @@ -852,19 +892,20 @@ var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length; $("#checkboxAllToptable").prop("checked", checkboxBoxAllChecked); - packPrintChange("", "top"); - //灭菌程序 - if(multiSelectTopData.length>0){ - var num; - for(var i=0;i0){ + var numTop = JSON.parse(topTableLastestSelects[topTableLastestSelects.length -1]); + $("#sterilingType").val(numTop.sterilingMethod); $("#sterilingType").change(); + sterilizerNameRequest();//灭菌炉 packageTypeRequest();//包裝類型 - $("#packageType").val(num.packageType); + $("#packageType").val(numTop.packageType); } + + //判断按钮 + packPrintChange("", "top"); + if ($(e.target).hasClass("toggle")) { var item = dataViewTopTable.getItem(args.row); if (item) { @@ -938,6 +979,7 @@ data: {"taskGroup":taskGroup,"basketBarcodes":searchBarcode}, type: "post", success: function(result) { + topTableLastestSelects = []; if(result.success == true){ assemblyTaskLeftTopTableCon = result.data; var datas =result.data; @@ -1058,14 +1100,6 @@ }*/ } - - - - - - - - if (loadDataTop[idx + 1] && loadDataTop[idx + 1].indent > loadDataTop[idx].indent) { //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进 if (dataContext._collapsed) { @@ -1106,8 +1140,6 @@ enableForHeaderCells:true, asyncEditorLoading: false }; - //$.support.cors = true; - assemblyTaskleftFootTable_columns = []; assemblyTaskleftFootTable_columns.push( { @@ -1260,16 +1292,17 @@ } } - loadPackingTasks(); + reloadFootTable(); } -function loadPackingTasks(){ +function reloadFootTable(){ $.ajax({ url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml", dataType: "json", type:'get', cache:false,//解决ie data: {"taskGroup":taskGroup}, success:function(data){ + footTableLastestSelects = []; var datas =data.data; loadData = []; loadData = requestData(datas);//加载数据 @@ -1281,6 +1314,7 @@ }) leftFootTable(); } + function leftFootTable(){ dataView = new Slick.Data.DataView({ inlineFilters: true }); grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); @@ -1308,17 +1342,56 @@ var parData = dataView.getItem(args.row); requestMaterialsDataParent(parData.tousseName,parData.tousseID); + + if ($(inputEle).is(':checked')) { + footTableLastestSelects.push(JSON.stringify(parData)); + } else { + // 不选中就删除 + if (footTableLastestSelects.length > 0) { + var tempFootTableParentRows = []; + for(var i = 0; i < footTableLastestSelects.length; i++) { + if (footTableLastestSelects[i] != JSON.stringify(parData)) { + tempFootTableParentRows.push(footTableLastestSelects[i]); + continue; + } + } + footTableLastestSelects = tempFootTableParentRows; + } + } + }else if(dataView.getItem(args.row).parent != null){ var childData = dataView.getItem(args.row); - $("#sterilingType").val(childData.sterilingMethod); - $("#sterilingType").change(); + //$("#sterilingType").val(childData.sterilingMethod); + //$("#sterilingType").change(); - sterilizerNameRequest();//灭菌炉 - packageTypeRequest();//包裝類型 - $("#packageType").val(childData.packageType); + //sterilizerNameRequest();//灭菌炉 + //packageTypeRequest();//包裝類型 + //$("#packageType").val(childData.packageType); //子级材料清单 requestMaterialsDataChild(childData.tousseName,childData.tousseID); + for (var k = args.row - 1; k >=0; k--) { + var tempParent = dataView.getItem(k); + if (tempParent.parent == null) { + if (footTableLastestSelects.indexOf(JSON.stringify(tempParent)) == -1) { + footTableLastestSelects.push(JSON.stringify(tempParent)); + } else { + // 找到了 + var tempFootTableLastestSelects = []; + if (footTableLastestSelects.length > 0) { + for (var i = 0; i < footTableLastestSelects.length; i++) { + if (footTableLastestSelects[i] != JSON.stringify(tempParent)) { + tempFootTableLastestSelects.push(footTableLastestSelects[i]); + } + }; + } + footTableLastestSelects = tempFootTableLastestSelects; + footTableLastestSelects.push(JSON.stringify(tempParent)); + } + break; + } + } + } multiSelectFootData = []; @@ -1336,19 +1409,17 @@ var checkboxBoxAllChecked = inputCheckBox.length == allCheckBoxes.length; $("#checkboxAllFoottable").prop("checked", checkboxBoxAllChecked); - //灭菌程序 - if(multiSelectFootData.length>0){ - var num; - for(var i=0;i0){ + var num = JSON.parse(footTableLastestSelects[footTableLastestSelects.length -1]); $("#sterilingType").val(num.sterilingMethod); $("#sterilingType").change(); sterilizerNameRequest();//灭菌炉 packageTypeRequest();//包裝類型 $("#packageType").val(num.packageType); } + if ($(e.target).hasClass("toggle")) { var item = dataView.getItem(args.row); if (item) { @@ -1449,9 +1520,9 @@ //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进 if (dataContext._collapsed) { - return spacer + " "+value+"" ;//收缩 + return spacer + " "+value+"" ;//收缩 } else { - return spacer + " "+value+"";//展开 + return spacer + " "+value+"";//展开 } } else { return spacer + " "+value+""; @@ -1600,7 +1671,382 @@ }) } +/*删除装配任务end*/ +/*补充丢失start*/ +//补充按钮丢失弹框 +$("#addLose").click(function(){ + $(".addLoseModel").modal('show'); + loseOrDamageModel("丢失",""); +}); +//补充报损器械弹框 +$("#addBreakage").click(function(){ + loseOrDamageModel("报损",""); +}) +//左上每行表格的丢失按钮 +function addLoseTopTableBtn(that){ + loseOrDameage_packingTaskId = $(that).parent().prevAll().children(".sava_TopTaskId").attr("ToptaskId"); + type = "丢失"; + loseOrDamageModel("丢失",loseOrDameage_packingTaskId); +} +//左上每行表格的报损按钮 +function addDamageTopTableBtn(that){ + loseOrDameage_packingTaskId = $(that).parent().prevAll().children(".sava_TopTaskId").attr("ToptaskId"); + type = "报损"; + loseOrDamageModel("报损",loseOrDameage_packingTaskId); + +} +//左下每行表格的丢失按钮 +function addloseFootTableBtn(that){ + loseOrDameage_packingTaskId = $(that).parent().prevAll().children(".sava_FootTaskId").attr("taskId"); + type = "丢失"; + loseOrDamageModel("丢失",loseOrDameage_packingTaskId); + +} +//左下每行表格的报损按钮 +function addDameageFootTableBtn(that){ + loseOrDameage_packingTaskId = $(that).parent().prevAll().children(".sava_FootTaskId").attr("taskId"); + type = "报损"; + loseOrDamageModel("报损",loseOrDameage_packingTaskId); + +} +function loseColums(){ + optionsLose = { + enableCellNavigation: true, + enableColumnReorder: false, + rowHeight: 28, + editable: true, + enableAddRow: false, + forceFitColumns: false, + checked:true, + enableForHeaderCells:true, + asyncEditorLoading: false + }; + lose_colums = []; + lose_colums.push( + { + field: 'id', + name: 'ID', + align:'center', + sortable: true, + }, + { + id: "", + name : '序号', + field:"", + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 100, + resizable: false, + formatter:function(row, cell, value, columnDef, dataContext){ + return row+1; + } + }, + { + id:"materialName", + name : '器械名称', + field : 'materialName', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 150, + resizable: false + }, + { + id:"amount", + name : '待补充数量', + field : 'amount', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 100, + resizable: false + }, + { + id:"", + name : '分类类型', + field : '', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 200, + resizable: false, + formatter:function(row, cell, value, columnDef, dataContext){ + return ""; + } + }, + { + id:"", + name : '器械类型', + field : '', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 200, + resizable: false, + formatter:function(row, cell, value, columnDef, dataContext){ + return ""; + } + }, + { + id:"", + name : '操作', + field : '', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth: 100, + resizable: false, + formatter:function(row, cell, value, columnDef, dataContext){ + return "

"; + } + } + ) + //将id列隐藏 + visibleColumns_Lose = [];//定义一个数组存放显示的列 + for (var i = 0; i < lose_colums.length; i++) { + if (i!=0){ + visibleColumns_Lose.push(lose_colums[i]);//将columns的列push进去 + } + + } + + //補充丟失分类类型 + var addLoseClassifyTypeOptions = ""; + $.ajax({ + url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/getDamageErrorDepartType.mhtml", + type: "get", + async:true, + success:function(result){ + if(result.success == true){ + for(var i=0;i"+result.rows[i].value+""; + } + }else{ + //alert(result.message); + } + } + }); +} + +//補充丟失删除行 +function deleteLoseRow(id){ + var LoseTableDelData = gridLose.getData(); + var newData = []; + for(var i=0;i提示