装配管理

扫描篮筐条码: @@ -126,11 +126,11 @@

" - + "" - + "

" - + "

" - } + focusable: false, + formatter:amountFormatterTopTable }, { id: "urgentAmount", @@ -1106,8 +1131,29 @@ align : 'center', sortable:true, //正序,逆序 cssClass: "cell-title", - minWidth: 100, - resizable: false + minWidth: 200, + resizable: false, + formatter:function(r, c, v, cd, dc){ + if(dc.parent != null){ + 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 += ""; + } + + if(dc.damages.length > 0){ + operateHtml += ""; + } + } + return operateHtml; + } + } }, { id: "department", @@ -1159,23 +1205,127 @@ } } +function leftToploadTable(){ + dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); + gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable); + gridTopTable.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + /*隐藏子菜单checkbox*/ + gridTopTable.registerPlugin(new Slick.AutoTooltips({ enableForHeaderCells: true })); + gridTopTable.registerPlugin(checkboxSelectorTopTable); + //$(".slick-viewport").css({"overflow":"auto"}); + //subText("assemblyTaskLeftTopTable"); + gridTopTable.init(); + //获取选中行数据var selectedRowsTop; + //var selectDataTop = []; + gridTopTable.onSelectedRowsChanged.subscribe(function(){ + selectedRowsTop = gridTopTable.getSelectedRows();//点击选中的数据 + selectDataTop = []; + if(selectedRowsTop==''){ + }else{ + dataviewsTop = dataViewTopTable.getItems(); + for(var i =0;i0){ + 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"; + }); +} function reloadTopTableMoreborde(searchBarcode){ - leftTopload(); $.ajax({ url:WWWROOT+"/disinfectSystem/packingController/getPackingTaskList.mhtml", dataType: "json", async: true, cache:false,//解决ie data: {"taskGroup":taskGroup,"basketBarcodes":searchBarcode}, type: "post", - beforeSend: function() { - }, success: function(result) { if(result.success == true){ assemblyTaskLeftTopTableCon = result.data; - console.log("数据",assemblyTaskLeftTopTableCon); - var datas =assemblyTaskLeftTopTableCon; + var datas =result.data; var tempId = 0; 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(); }else{ alert(result.message); } } }); + leftToploadTable(); + } +function reloadPackingLeftTopTasks() { + var datas =assemblyTaskLeftTopTableCon; + var tempId = 0; + for(var i=0;i 0) { + //var tipsColor = ""; + // var operateHtml = "

"; + for(var j=0; j < childrens.length; j++){ + var k = (loadDataTop[tempId] = {}); + k["id"] = (Math.random()*10000000); + k["indent"] = 1; + k["parent"] = parentId; + k["tousseName"]=childrens[j].tousseName; + k["amount"]=childrens[j].amount; + k["urgentAmount"]=childrens[j].urgentAmount; + k["urgentLevel"]=childrens[j].urgentLevel; + k["basketName"]=childrens[j].basketName; + //k["operate"]=operateHtml; + k["department"]=childrens[j].department; + k["washTime"]=childrens[j].washTime; + k["status"]=childrens[j].status; + k["dateTime"]=childrens[j].dateTime; + + + k["errors"]=childrens[j].errors; + k["damages"]=childrens[j].damages; + k["taskType"]=childrens[j].taskType; + + tempId ++; + } + } + + } + + gridTopTable.invalidateAllRows(); + dataViewTopTable.beginUpdate(); + dataViewTopTable.setItems(loadDataTop); + dataViewTopTable.setFilter(myFilterTopTable); + dataViewTopTable.endUpdate(); + +} +function amountFormatterTopTable(row, cell, value, columnDef, dataContext){ + if(dataContext.parent == null){ + var inputId = 'inputTop_'+dataContext.tousseID; + return "

" + + "" + + "

" + + "" + + "" + + "

" + + "

" + }else{ + return value; + } +} function tousseNameFormatterTopTable(row, cell, value, columnDef, dataContext){ //如果没有数据，就都返回 if (value == null || value == undefined || dataContext === undefined) { return ""; } @@ -1326,10 +1479,10 @@ //根据ID获取此行内容的索引值 - var idx = dataView.getIdxById(dataContext.id); + var idx = dataViewTopTable.getIdxById(dataContext.id); //判断星星父菜单 - if(dataContext.parent == null){ + /* if(dataContext.parent == null){ var child = dataContext.children; for(var i=0;i loadDataTop[idx].indent) { //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进 if (dataContext._collapsed) { @@ -1371,14 +1524,7 @@ return true; } - - - - - - - - +/*左上表格end*/ /*数量增减start*/ function addNum(that){ var numVals = parseInt($(that).parent().siblings("input").val()); @@ -1449,25 +1595,33 @@ }; //判断按钮显示 -function packPrintChange(selectRowDatas){ +function packPrintChange(selectRowDatas,selectRowDatasTop){ //左上表格 -/* var selectionsTop = $("#assemblyTaskLeftTopTable").bootstrapTable('getSelections'); + var selectionsTop = selectRowDatasTop; if(selectionsTop.length>0){ $("#packPrint").show(); return; - }*/ + } //左下表格 var selections = selectRowDatas; var show = false; for(var i=0;i +<%@ include file="/common/taglibs.jsp"%> +<%@page import="com.forgon.disinfectsystem.entity.customform.formdefinition.FormDefinition"%> +<%@page import="com.forgon.disinfectsystem.entity.recyclingdamagerecord.RecyclingDamageItem"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.supplier.Supplier,com.forgon.disinfectsystem.entity.basedatamanager.supplyroomconfig.SupplyRoomConfig"%> +<%@page import="com.forgon.disinfectsystem.entity.packing.PackingTask"%> +<%@page import="java.util.Map"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.imagefilemanager.ImageFile"%> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.container.Container"%> +<%@page import="com.forgon.disinfectsystem.entity.recyclingerror.RecyclingError"%> +<%@page import="com.forgon.disinfectsystem.common.Constants"%> +<%@page import="java.util.Date"%> +<%@page import="java.text.SimpleDateFormat"%> +<%@page import="java.util.List"%> +<%@page import="com.forgon.disinfectsystem.common.*"%> +<%@page import="com.forgon.disinfectsystem.basedatamanager.supplyroomconfig.service.SupplyRoomConfigManager"%> +<%@page import="com.forgon.disinfectsystem.entity.qualitymonitoringmanager.qualitymonitoringconfig.QualityMonitoringDefinition" %> +<%@page import="com.forgon.disinfectsystem.entity.basedatamanager.toussedefinition.TousseDefinition" %> + + + + + +<%@ include file="../commons/tagLibsPath.jsp"%> +装配管理 + + + + + + + + + + + +<%-- bootstrap-datetimepicker --%> + + + + + + + + + + + + + + + + + + + + + + + + + + +

+ 待装配任务 +
+ 今天本组装配记录 +

+ +

+ 扫描篮筐条码: + +

+ 打印分组类型: + +

+ + + +

+ +

手术包

+ +

+ 配包注意事项 + 说明书 + 教学图片 + 配包视频 + « + » +

+ +

+ 配包人条码: +

+ +

+ 配包人: +

+ +

+ 审核人条码: +

+ +

+ 审核人: +

+ +

+ + +

+ 灭菌程序: +

+ +

+ 灭菌方式: +

+ +

+ 包装类型: +

+ +

+ 灭菌炉: +

+ +

+ 炉次: +

+ +

+ + +

+ 灭菌日期: +

+ + +

+ 备注: +

+ +

材料清单

+ 器械总数 + 一次性物品总数 + 添加质量监测 +

+ +

+ + + +

+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +<%-- + --%> + +<%-- bootstrap-datetimepicker --%> + + + + +<%-- --%> +<%-- --%> + + + +<%@ include file="/disinfectsystem/print/print2.jsp"%> + + + + + + + + + + + + + + Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/systemManage/roleList.css =================================================================== diff -u --- ssts-web/src/main/webapp/dx-disinfectsystem/css/systemManage/roleList.css (revision 0) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/systemManage/roleList.css (revision 24844) @@ -0,0 +1,186 @@ +a:hover{text-decoration: none;} +.dx-btn-lg { + height: 31px; +} +.content-toolbar-btn:hover{ + text-decoration: none; +} +/* 角色列表start */ +.role-list-wrapp,.add-role-wrapp,.amend-role-wrapp,.distribution-auth-wrapp{ + width: 100%; + border:1px solid #afd7af; + display:none; +} +.comon-title{ + padding-left:4px; +} +.role-list-wrapp .log-management-form{ + background:#f1faf0; + height: 34px; + border-bottom:1px solid #afd7af; +} +.role-list-wrapp .log-management-form input{ + height: 26px; +} +.role-list-wrapp .log-management-form .form-inline{ + width:100%; + display: inline-block; +} +.role-list-wrapp .log-management-form .form-inline select{ + width:113px; + font-size: 12px; +} +.role-list-wrapp .log-management-date div{ + position: relative; + display:inline-block; +} +.role-list-wrapp log-management-date div span{ + top: -3px; + right: -5px; +} +.role-list-wrapp .log-management-date .form-control{ + width:113px +} +.role-list-wrapp .username .form-control{ + width:80px; +} +.role-list-wrapp .w130{ + width:130px; +} +/* 增加角色列表 */ +.add-role{ + margin-top:16px; +} + +.add-role .form-inline .form-group{ + display:block; +} +.add-role .panel{ + width: 600px; + margin: 0px auto; +} +.add-role .panel .form-inline label{ + width:90px; + text-align:right; +} +.add-role .panel .form-inline .form-group { + width:100%; +} +.add-role .panel .form-inline .form-group .form-control{ + width: 75%; + height:26px; +} +.add-role .panel .form-inline .form-group div .form-control{ + width:100%; + font-size:0; +} +.add-role .panel .form-inline .form-group div{ + display:inline-block; + position:relative; + width: 75%; +} +.add-role .panel .form-inline .form-group div span{ + top: 0px; + right: 0px; + width: 19px; + height: 26px; + background-image: url(../../img/search-trigger.gif); + background-position: -15px 0px; + pointer-events:auto; + cursor: pointer; +} +.add-role .panel .panel-footer{ + text-align: center; + background:#f1faf0; +} +.roleName-wrapp span,.roleId-wrapp span{ + display:none; + color: #ff7870; +} +.roleName-wrapp.on span,.roleId-wrapp.on span{ + display:inline-block; +} +.roleName-wrapp.on input,.roleId-wrapp.on input{ + background-color: #fee; + border: 1px solid #ff7870; +} +/* 继承角色start */ +.extend-roel{ + width:600px; + height:210px; +} +.wait-role,.select-success-role{ + width:216px; + height:180px; +} +.wait-role ul,.select-success-role ul{ + border:1px solid #000; + height:154px; + overflow:auto; +} +.wait-role ul li,.select-success-role ul li{ + cursor:pointer; +} +.wait-role ul li.on,.select-success-role ul li.on{ + background:#73B043; +} +.wait-role ul li:hover,.select-success-role ul li:hover{ + background:#ccc; +} +.add-del{ + width: 134px; + margin-top:20px; +} +.add-del .btn{ + display:block; + margin: 0px auto; + margin-bottom:10px; +} +.modal-footer{ + text-align: center; +} +/* 包含用户start */ +.include-user-wrapp{ + width:680px; +} +.include-user{ + height:454px; +} +.include-user-left,.include-user-right{ + width:250px; + height:300px; + border:1px solid #000; +} +.include-user .form-group{ + display:block; + margin-bottom:10px; +} +.include-user .add-del{ + margin-top: 68px; +} +/* 分配权限start */ +.distribution-auth-wrapp{ + overflow:auto; +} +.distribution-auth{ + background:#f1faf0; + margin-bottom: 10px; +} +.distribution-auth h4{ + color: rgb(54, 127, 33); + font-size: 16px; + font-weight: bold; + margin-top:8px; + margin-bottom:8px; + margin-left: 6px; +} +.disinfect-system-list{ + border:1px solid #ccc; +} +.disinfect-system-list .row{ + margin-left: 0; + margin-right: 0; +} +.disinfect-system-list input{ + width:auto; +} \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r24754 -r24844 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24754) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24844) @@ -89,7 +89,14 @@ var str = "星期" + "日一二三四五六".charAt(new Date().getDay()); var $loginDate =$(".head-index-right-login-date"); $loginDate.text(year+"年"+month+"月"+date+"日"+str); - + + + $(".head-index-right").mouseover(function(){ + $(".head-index-user-list").show(); + }) + $(".head-index-user-list").mouseout(function(){ + $(this).hide(); + }) //首页切换屏幕按钮 $(".content-index-toggle-off").click(function(){ Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css =================================================================== diff -u -r24754 -r24844 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css (.../assemblyManagement.css) (revision 24754) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css (.../assemblyManagement.css) (revision 24844) @@ -1,4 +1,5 @@ .datetimepicker-dropdown-bottom-right{z-index: 200000000;} +.row{margin-left:-15px;} table tr{ height:30px !important; } @@ -64,7 +65,6 @@ .fixed-table-pagination{ background: #C6E3CA; position: fixed; - /* bottom: 0px; */ left: 0px; width: 100%; } Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/roleList.js =================================================================== diff -u -r24754 -r24844 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/roleList.js (.../roleList.js) (revision 24754) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/systemManage/auth/roleList.js (.../roleList.js) (revision 24844) @@ -1,9 +1,5 @@ $(function(){ - //计算高度 - var parentHead = window.parent.$(".head-index"); - var navbar = window.parent.$(".content-index"); - var systemInforWrapp_Height = $(window).height() - parentHead.height() - navbar.height() - 20; - $(".authority-management-wrapp").css("height",systemInforWrapp_Height+"px"); - - + $(".role-list-wrapp").show(); + sysMamHeight(".role-list-wrapp"); + resizeComon(".role-list-wrapp"); }) \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js =================================================================== diff -u -r24754 -r24844 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24754) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24844) @@ -254,7 +254,7 @@ packingTaskArray = packingTaskArray.concat(packingTasks); } alert(result.message); - processAfterPacking(false,result,tousseName,inputAmount); + //processAfterPacking(false,result,tousseName,inputAmount); }else{ var addNumHtml= "

" + "

提示

" @@ -305,7 +305,7 @@ assemblyTaskLeftTopTableCon = assembleArray; reloadPackingLeftTopTasks();//刷新左上表格 - printLabelsAfterPacking();//打印标签 + //printLabelsAfterPacking();//打印标签 }); function hidePackingTousseBtnClick_mask(){ @@ -544,7 +544,8 @@ loseAndDamageNum();//丢失和报损的数字 var documentHeight = $(window).height(); var tabH = documentHeight-39-123; - var tableHFoot = tabH-250; + //var tableHFoot = tabH-250; + var tableHFoot = tabH; $("#tableFootBox").css({"height":tableHFoot+"px"}); var resultHFoot = tableHFoot-76; @@ -611,13 +612,17 @@ /*材料清单 table end*/ //补充丢失/报损表格 - var addLoseTable="

"; - $('#addLoseTableWrapper').append(addLoseTable); - registerLoseOrDamageSubmitHandler("comfirmAddlose"); - //补充丢失弹框 - $("#addLose").click(function(){ + /* var addLoseTable="

"; + $('#addLoseTableWrapper').append(addLoseTable);*/ + // registerLoseOrDamageSubmitHandler("comfirmAddlose"); + //补充丢失器械弹框 + /* $("#addLose").click(function(){ + addLoseLoadTable([],addLoseModel_columns); + window.parent.$("#parentModal").children().remove(); + window.parent.$('#parentModal').modal('show'); + window.parent.$("#parentModal").append($("#addLoseModel").html()); loseOrDamageModel("丢失",""); - }); + })*/ //补充报损器械弹框 $("#addBreakage").click(function(){ loseOrDamageModel("报损",""); @@ -901,6 +906,8 @@ $("#sterilingType").val(row.sterilingMethod); //根据灭菌程序设置灭菌方式的值 $("#sterilingType").change(); + + console.log("row.sterilingMethod",row.sterilingMethod); }, onCheck:function(row){//foot $("#sterilingType").val(row.sterilingMethod); @@ -1358,15 +1365,16 @@ //今天本组装配 $(function(){ - /*$("#addLose").click(function(){ - addLoseLoadTable([],addLoseModel_columns); - window.parent.$("#parentModal").children().remove(); - window.parent.$('#parentModal').modal('show'); - window.parent.$("#parentModal").append($("#addLoseModel").html()); - loseOrDamageModel("丢失",""); - - })*/ - + + //模态框关闭,取消按钮 + $("button[class = close]").click(function(){ + window.parent.$("#fullScreenModal").modal('hide'); + }); + //模态框取消按钮 + $(".cancel-btn").click(function(){ + window.parent.$("#fullScreenModal").modal('hide'); + }); + /*$("#aa").select2({ language: "zh-CN", placeholder:'关键词搜素', @@ -2068,31 +2076,7 @@ } } ]; -function addLoseLoadTable(tableDate,columns){ - $("#addLoseTable").bootstrapTable('destroy');//销毁表格 - $("#addLoseTable").bootstrapTable( - { - data:tableDate, - method : 'get', - striped : true,// 设置为 true 会有隔行变色效果 - undefinedText : " ",// 当数据为 undefined 时显示的字符 - data_local : "zh-US",// 表格汉化 - responseHandler : "", - sortable: true,//是否启用排序 - sortOrder: "desc",//排序方式 - sortName: 'appTime',//排序字段 - //idField : "id", - uniqueId: "id",//对每一行指定唯一标识符。 - formatLoadingMessage: function () { - return "请稍等，正在加载中..."; - }, - formatNoMatches:function(){ //未找到匹配记录 - //return " "; - }, - columns : columns - }); - -} + //補充丟失器械類型 function addLOseInstrumentTypeSelect(className){ $("."+className).on('change',function(){ @@ -2130,176 +2114,7 @@ } }) }; -function loseOrDamageModel(type,loseOrDameage_packingTaskId){ - loseOrDameage_type = type; - addPaddingBottom("addLoseModel"); - //清空 - $("#addLoseBarcodeHidden").next("span").text(""); - //篮筐 - $("#addLoseBarcode").keydown(function(e){ - if (e.keyCode == 13) { - var barcode = $("#addLoseBarcode").val(); - if(barcode != "" && barcode != null){ - //补充丢失加载清洗篮筐 - $.ajax({ - url:WWWROOT+"/disinfectSystem/washAndDisinfect/washAndDisinfectRecordController/loadClassifyBasket.mhtml", - type: "get", - async:true, - data:{basketBarcode:barcode}, - success:function(result){ - if(result.success == true){ - $("#addLoseBarcodeHidden").val(barcode);//条码存入隐藏域 - $("#addLoseBarcodeHidden").next("span").show(); - $("#addLoseBarcodeHidden").next("span").text("清洗篮筐名称:"+result.data.containerName); - $("#addLoseBarcode").val("");//清空 - }else{ - alert(result.message); - } - } - }); - }else{ - var addNumHtml= "

" - + "

提示

" - + "

" - + "请扫描篮筐条码！" - + "

" - + "

"; - $("body").append(addNumHtml); - //showResult('请扫描篮筐条码！' , null , sstsConfig.messagePauseTimeOnPackingPage); - } - } - }); - //丢失补充列表 - - $.ajax({ - url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml", - type: "get", - async:true, - cache:false,//解决ie - data:{ - "type":type, - "packingTaskId":loseOrDameage_packingTaskId//这里就是传空的 - }, - success:function(result){ - if(result.success == true){ - //addLOseClassifyTypeResult = result.rows; - addLoseLoadTable(result.rows,addLoseModel_columns); - addLOseInstrumentTypeSelect("addLOse_instrument"); - $("#addLoseTableWrapper .fixed-table-container").css({"padding-bottom":"45px"}); - }else{ - alert(result.message); - } - } - }); -} -//左上每行表格的丢失按钮 -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();//请求数字 - reloadPackingTasks();//刷新左下表格 - //当没有扫条码，上面表格不刷新 - if(!Tools.ArrayUtils.isNotEmpty(basketBarcodes) || searchBarcodeHidden !=""){ - reloadTopTableMoreborde(basketBarcodes.join(";"));//左上表格的刷新 - } - - }else{ - alert(result.message); - } - } - }); - }); -} //补充丢失/报损器械弹框end @@ -2543,6 +2358,7 @@ }, onClickRow: function(row,element){ $("#sterilingType").val(row.sterilingMethod); + //根据灭菌程序设置灭菌方式的值 $("#sterilingType").change(); packageTypeRequest();//包裝類型 @@ -2672,11 +2488,13 @@ //判断按钮显示 function packPrintChange(){ var selectionsTop = $("#assemblyTaskLeftTopTable").bootstrapTable('getSelections'); + if(selectionsTop.length>0){ $("#packPrint").show(); return; } var selections = $("#assemblyTaskleftFootTable").bootstrapTable('getSelections'); + console.log("selections",selections); var show = false; for(var i=0;i

材料清单

质量,功能检查