Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js =================================================================== diff -u -r25012 -r25077 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js (.../todayAssemblyManagementRecord2.js) (revision 25012) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js (.../todayAssemblyManagementRecord2.js) (revision 25077) @@ -266,33 +266,37 @@ success: function(result) { if( result.success == true){ todayTable_data = []; - for (var i = 0; i < result.rows.length; i++) { - var dataOB = { - //tousseName: i, - depart: result.rows[i].depart, - supplierName: result.rows[i].supplierName, - tousseName: result.rows[i].tousseName, - splitTousseName: result.rows[i].splitTousseName, - amount: result.rows[i].amount, - packer: result.rows[i].packer, - reviewer: result.rows[i].reviewer, - packTimeStr:result.rows[i].packTimeStr, - foreignMaterialsAmount: result.rows[i].foreignMaterialsAmount, - doctor: result.rows[i].doctor - }; - - todayTable_data.push(dataOB); - } + for (var i = 0; i < result.rows.length; i++) { + var dataOB = { + //tousseName: i, + depart: result.rows[i].depart, + supplierName: result.rows[i].supplierName, + tousseName: result.rows[i].tousseName, + splitTousseName: result.rows[i].splitTousseName, + amount: result.rows[i].amount, + packer: result.rows[i].packer, + reviewer: result.rows[i].reviewer, + packTimeStr:result.rows[i].packTimeStr, + foreignMaterialsAmount: result.rows[i].foreignMaterialsAmount, + doctor: result.rows[i].doctor + }; + todayTable_data.push(dataOB); + } } - if(dataViewTodayTable == undefined || dataViewTodayTable == null){ dataViewTodayTable = new Slick.Data.DataView({inlineFilters: true}); } if(gridTodayTable == undefined || gridTodayTable == null){ gridTodayTable = new Slick.Grid("#todayAssemblyRecordTable",todayTable_data, visibleColumns_TodayTable, optionsTodayTable); + if(result.rows.length == 0){ + $("#todayAssemblyRecordTable .slick-viewport .grid-canvas").html("
当前无记录
"); + } }else{ gridTodayTable.setData(todayTable_data); gridTodayTable.render(); + if(todayTable_data.length == 0){ + $("#todayAssemblyRecordTable .slick-viewport .grid-canvas").html("
当前无记录
"); + } } dataViewTodayTable.onRowCountChanged.subscribe(function (e, args) { @@ -501,38 +505,53 @@ initSelectDate("beginSelect"); initSelectDate("endSelect"); -var tag_data = [ - {id:1 ,name:'Chicago Bulls',desc:'芝加哥公牛'}, - {id:2 ,name:'Cleveland Cavaliers',desc:'克里夫兰骑士'}, - {id:3 ,name:'Detroit Pistons',desc:'底特律活塞'}, - {id:4 ,name:'Indiana Pacers',desc:'印第安纳步行者'}, - {id:5 ,name:'Milwaukee Bucks',desc:'密尔沃基雄鹿'}, - {id:6 ,name:'Brooklyn Nets',desc:'布鲁克林篮网'}, - {id:7 ,name:'Boston Celtics',desc:'波士顿凯尔特人'}, - {id:8 ,name:'New York Knicks',desc:'纽约尼克斯'}, - {id:9 ,name:'Philadelphia 76ers',desc:'费城76人'}, - {id:10,name:'Toronto Raptors',desc:'多伦多猛龙'}, - {id:11,name:'Atlanta Hawks',desc:'亚特兰大老鹰'}, - {id:12,name:'Charlotte Hornets',desc:'夏洛特黄蜂'}, - {id:13,name:'Miami Heat',desc:'迈阿密热火'}, - {id:14,name:'Orlando Magic',desc:'奥兰多魔术'}, - {id:15,name:'Washington Wizards',desc:'华盛顿奇才'}, - {id:16,name:'Denver Nuggets',desc:'丹佛掘金'}, - {id:17,name:'Minnesota Timberwolves',desc:'明尼苏达森林狼'}, - {id:18,name:'Oklahoma City Thunder',desc:'俄克拉荷马雷霆'}, - {id:19,name:'Portland Trail Blazers',desc:'波特兰开拓者'}, - {id:20,name:'Utah Jazz',desc:'犹他爵士'}, - {id:21,name:'Golden State Warriors',desc:'金州勇士'}, - {id:22,name:'Los Angeles Clippers',desc:'洛杉矶快船'}, - {id:23,name:'Los Angeles Lakers',desc:'洛杉矶湖人'}, - {id:24,name:'Phoenix Suns',desc:'菲尼克斯太阳'}, - {id:25,name:'Sacramento Kings',desc:'萨克拉门托国王'}, - {id:26,name:'Dallas Mavericks',desc:'达拉斯小牛'}, - {id:27,name:'Houston Rockets',desc:'休斯顿火箭'}, - {id:28,name:'Memphis Grizzlies',desc:'孟菲斯灰熊'}, - {id:29,name:'New Orleans Pelicans',desc:'新奥尔良鹈鹕'}, - {id:30,name:'San Antonio Spurs',desc:'圣安东尼奥马刺'} -]; +//组合框插件 +/*function comBoxPage(ids,url,name){ + $.sexyCombo.create({ + name:name, + id:name, + container:ids, + url:url, + ajaxData:{ + 'limit':10, + 'spell':'', + 'start':0 + } + }); +}*/ +$.sexyCombo.create({ + name:"ajax-combo", + id:"ajax-combo", + container:"#instrumentPackerName", + // url:WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getAllTousseDefinitionData.mhtml", + ajaxData:{ + 'limit':10, + 'spell':'', + 'start':0 + } +}); +$.sexyCombo.create({ + name:"ajax-comb", + id:"ajax-comb", + container:"#departmentsSelect", + //url:WWWROOT+"/disinfectSystem/baseData/supplyRoomConfigController/getApplicationDepartJson.mhtml", + ajaxData:{ + 'limit':10, + 'spell':'', + 'start':0 + } +}); +//comBoxPage("#instrumentPackerName",WWWROOT+"/disinfectSystem/baseData/tousseDefinitionController/getAllTousseDefinitionData.mhtml","aa"); +//comBoxPage("#departmentsSelect",WWWROOT+"/disinfectSystem/baseData/supplyRoomConfigController/getApplicationDepartJson.mhtml",""); + + + + + + + + + /*$('#selectPage').bSelectPage({ /* showField : 'desc', keyField : 'id', Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js =================================================================== diff -u -r25012 -r25077 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js (.../assemblyManagementSlick3.js) (revision 25012) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js (.../assemblyManagementSlick3.js) (revision 25077) @@ -58,7 +58,10 @@ var packedToussesArray = [];// 用于一次打印所有装配的包 var tousseesToPrint = []; //点击装配 -$("#packPrint").click(function(){ +function packingTousseBtnClick(){ + + +//$("#packPrint").click(function(){ packing = true; if(packing){ packingToussesArray = []; // 清除所装配的器械包数组 @@ -105,15 +108,15 @@ //标识牌定义id idCardDefinitionId //炉次 - var frequency =$("#frequency").val(); + /*var frequency =$("#frequency").val();*/ //确认继续 confirmContinue //tousseWeight 器械包重量 //remark 备注 var remark = $("#remark").val(); - if(inspector == ""){ + if($(".inspectorAll").hasClass("on") && inspector == ""){ alert("请扫描检查人条码"); return; } @@ -125,14 +128,49 @@ alert("请扫描审核人条码"); return; } - if(wrapper == ""){ + if($(".wrapperAll").hasClass("on") && wrapper == ""){ alert("请扫描包装人条码"); return; } - if(sterileUserName == ""){ + if($(".sterileUserAll").hasClass("on") && sterileUserName == ""){ alert("请扫描灭菌人条码"); return; } + if($(".sterilingTypeAll").hasClass("on") && sterilingType == ""){ + alert(" 请选择灭菌程序"); + return; + } + + if(packageType == ""){ + alert("请选择包装类型!"); + return; + } + + if($(".sterilizerAll").hasClass("on")){ + if(!sstsConfig.sterilizerNotAllowBlank){ + + }else{ + if($("#sterilizerName").val() == ""){ + alert("请选择灭菌炉!"); + return; + } + + } + } + if($(".frequencyAll").hasClass("on")){ + if(!sstsConfig.sterilizerNotAllowBlank){ + + }else{ + if($("#frequency").val() == ""){ + alert("请填写炉次!"); + return; + }else{ + var frequency = $("#frequency").val(); + } + } + } + + var tempTableId = ""; // 开始构造参数循环调用装配方法 @@ -253,7 +291,7 @@ "remark":remark }; - if(inspector == ""){ + if($(".inspectorAll").hasClass("on") && inspector == ""){ alert("请扫描检查人条码"); return; } @@ -265,14 +303,48 @@ alert("请扫描审核人条码"); return; } - if(wrapper == ""){ + if($(".wrapperAll").hasClass("on") && wrapper == ""){ alert("请扫描包装人条码"); return; } - if(sterileUserName == ""){ + if($(".sterileUserAll").hasClass("on") && sterileUserName == ""){ alert("请扫描灭菌人条码"); return; } + if($(".sterilingTypeAll").hasClass("on") && sterilingType == ""){ + alert(" 请选择灭菌程序"); + return; + } + + if(packageType == ""){ + alert("请选择包装类型!"); + return; + } + + if($(".sterilizerAll").hasClass("on")){ + if(!sstsConfig.sterilizerNotAllowBlank){ + + }else{ + if($("#sterilizerName").val() == ""){ + alert("请选择灭菌炉!"); + return; + } + + } + } + if($(".frequencyAll").hasClass("on")){ + if(!sstsConfig.sterilizerNotAllowBlank){ + + }else{ + if($("#frequency").val() == ""){ + alert("请填写炉次!"); + return; + }else{ + var frequency = $("#frequency").val(); + } + } + } + $.ajax({ url:WWWROOT+"/disinfectSystem/packingController/packingTousse.mhtml", dataType: "json", @@ -294,7 +366,7 @@ } $("#checkboxAllToptable").prop("checked", false); - processAfterPacking(false,result,tousseName,inputAmount); + //processAfterPacking(false,result,tousseName,inputAmount); }else{ var addNumHtml= "
" + "
提示
" @@ -356,8 +428,8 @@ dataViewTopTable.setFilter(myFilterTopTable); dataViewTopTable.endUpdate(); leftFootLoad();//刷新左下表格 - printLabelsAfterPacking();//打印标签 -}); + //printLabelsAfterPacking();//打印标签 +} function hidePackingTousseBtnClick_mask(){ if(packingTousseBtnClick_mask != null){ @@ -431,67 +503,291 @@ } } } +$(function(){ + //配置项处理 + $(".scan-idCard-barcode").show(); + $(".idCard-name").show(); + $(".user-amount").show(); + $(".inspectorAll").show(); + $(".reviewerAll").show(); + $(".wrapperAll").show(); + $(".sterileUserAll").show(); + $(".sterilizerAll").show(); + $(".frequencyAll").show(); + $(".packingWeightAll").show(); + $(".loseMaterialsAll").show(); + $(".errorRemarkAll").show(); + $(".damageMaterialsTip-All").show(); + $(".damageRemarkAll").show(); + $(".recyclingItemRemark-All").show(); + + //标识牌 + if(sstsConfig.disableIdCard){ + $(".scan-idCard-barcode").hide(); + $(".idCard-name").hide();; + }else{ + $(".scan-idCard-barcode").show(); + $(".idCard-name").show(); + } + //使用次数 + if(sstsConfig.disableIdCard){ + $(".user-amount").hide(); + }else{ + $(".user-amount").show(); + } + //检查人条码 + if(!sstsConfig.showInspectorField){ + $(".inspectorAll").hide(); + $(".inspectorAll").removeClass("on"); + }else{ + $(".inspectorAll").show(); + $(".inspectorAll").addClass("on"); + } + + //审核人 + if(sstsConfig.printLabelWhenReviewing || sstsConfig.hideReviewerField){ + $(".reviewerAll").hide(); + }else{ + $(".reviewerAll").show(); + } + + //包装人 + if(!sstsConfig.showWrapperField){ + $(".wrapperAll").hide(); + $(".wrapperAll").removeClass("on"); + }else{ + $(".wrapperAll").show(); + $(".wrapperAll").addClass("on"); + } + + //灭菌程序 + if(sstsConfig.hideSterilingType){ + $(".sterilingTypeAll").hide(); + $(".sterilingTypeAll").removeClass("on"); + }else{ + $(".sterilingTypeAll").show(); + $(".sterilingTypeAll").addClass("on"); + } + + //灭菌方式 + if(sstsConfig.hideSterilingType){ + $(".sterilizationModeAll").hide(); + }else{ + $(".sterilizationModeAll").show(); + } + + //灭菌人 + if(!sstsConfig.showSterileField){ + $(".sterileUserAll").hide(); + + }else{ + $(".sterileUserAll").show(); + $(".sterileUserAll").addClass("on"); + } + + //灭菌炉 + if(!sstsConfig.showSterilizer){ + $(".sterilizerAll").hide(); + $(".sterilizerAll").removeClass("on"); + }else{ + $(".sterilizerAll").show(); + $(".sterilizerAll").addClass("on"); + } + + //炉次 + if(!sstsConfig.showSterilizer){ + $(".frequencyAll").hide(); + $(".frequencyAll").removeClass("on"); + }else{ + $(".frequencyAll").show(); + $(".frequencyAll").addClass("on"); + } + + //灭菌日期 + if(sstsConfig.printLabelWhenReviewing || sstsConfig.hideSterileDate){ + $(".sterilizeDate").hide(); + }else{ + $(".sterilizeDate").show(); + } + + //重量 + if(!sstsConfig.showTousseWeight){ + $(".packingWeightAll").hide(); + }else{ + $(".packingWeightAll").show(); + } + + //丢失材料 + if(!sstsConfig.enablePackingMaterialErrorDamageRemark){ + $(".loseMaterialsAll,.errorRemarkAll,.damageMaterialsTip-All,.damageRemarkAll").hide(); + + }else{ + $(".loseMaterialsAll,.errorRemarkAll,.damageMaterialsTip-All,.damageRemarkAll").show(); + } + + //丢失备注 + /*if(!sstsConfig.enablePackingMaterialErrorDamageRemark){ + $(".errorRemarkAll").hide(); + }else{ + $(".errorRemarkAll").show(); + }*/ + + //报损材料 + /*if(!sstsConfig.enablePackingMaterialErrorDamageRemark){ + $(".damageMaterialsTip-All").hide(); + }else{ + $(".damageMaterialsTip-All").show(); + }*/ + + //报损备注 + /*if(!sstsConfig.enablePackingMaterialErrorDamageRemark){ + $(".damageRemarkAll").hide(); + }else{ + $(".damageRemarkAll").show(); + }*/ + + //回收备注 + if(!sstsConfig.enableRecyclingItemRemark){ + $(".recyclingItemRemark-All").hide(); + }else{ + $(".recyclingItemRemark-All").show(); + } +}) + +function processActionBarcode(field){ + var barcode = field.val(); + if(barcode == BARCODE_ACTION_PACKING_AND_PRINT){ + field.val(""); + setTimeout(processActionBarcode_BARCODE_ACTION_PACKING_AND_PRINT,100); + return true; + } + return false; +} +function processActionBarcode_BARCODE_ACTION_PACKING_AND_PRINT(){ + var btn = $("#packPrint"); + packing = true; + btn.disable();//禁用按钮 + packingTousseBtnClick();//调用装配按钮 +} + //检查人条码 $("#inspectorCodeInput").keydown(function(e){ if (e.keyCode == 13) { + if(processActionBarcode($("#inspectorCodeInput"))){ + return; + } + //当前输入条码的那个 + //显示对应人名 + //隐藏域 + //下一个获取焦点的 var inspectorCodeInput = $("#inspectorCodeInput").val(); - requstCode(inspectorCodeInput,"inspectorCodeInput","inspectorInput","inspectorCodeInputHidden"); + requstCode(inspectorCodeInput,"inspectorCodeInput","inspectorInput","inspectorCodeInputHidden",$("#operatorCode")); } }) +var FocusFieldOne; //配包人条码 $("#operatorCode").keydown(function(e){ if (e.keyCode == 13) { + if(processActionBarcode($("#operatorCode"))){ + return; + } + //如果审核人隐藏的话 + //就判断灭菌是否隐藏,true隐藏的话,就拿包装人条码,否则就拿灭菌人条码 + FocusFieldOne = $("#reviewerCode");//审核人条码id + if(sstsConfig.hideReviewerField){//审核人 为true代表隐藏 + if(sstsConfig.showSterileField){//灭菌人 + FocusFieldOne = $("#sterileUserCode");//灭菌人条码 + }else{ + FocusFieldOne = $("#wrapperCode");//包装人条码 + } + } var operatorCode = $("#operatorCode").val(); - requstCode(operatorCode,"operatorCode","operator","operatorCodeHidden"); + requstCode(operatorCode,"operatorCode","operator","operatorCodeHidden",FocusFieldOne); } }) +var FocusFieldTwo; //审核人条码 $("#reviewerCode").keydown(function(e){ if (e.keyCode == 13) { + if(processActionBarcode($("#reviewerCode"))){ + return; + } + var FocusFieldTwo = $("#wrapperCode"); + if(sstsConfig.showSterileField){ + FocusFieldTwo = $("#sterileUserCode"); + } var reviewerCode = $("#reviewerCode").val(); - requstCode(reviewerCode,"reviewerCode","reviewer","reviewerCodeHidden"); + requstCode(reviewerCode,"reviewerCode","reviewer","reviewerCodeHidden",FocusFieldTwo); } }) //包装人条码 $("#wrapperCode").keydown(function(e){ if (e.keyCode == 13) { + if(processActionBarcode($("#wrapperCode"))){ + return; + } var wrapperCode = $("#wrapperCode").val(); - requstCode(wrapperCode,"wrapperCode","wrapper","wrapperCodeHidden"); + requstCode(wrapperCode,"wrapperCode","wrapper","wrapperCodeHidden",null); } }) //灭菌人条码 $("#sterileUserCode").keydown(function(e){ if (e.keyCode == 13) { + if(processActionBarcode($("#sterileUserCode"))){ + return; + } var sterileUserCode = $("#sterileUserCode").val(); - requstCode(sterileUserCode,"sterileUserCode","sterileUserName","sterileUserCodeHidden"); + requstCode(sterileUserCode,"sterileUserCode","sterileUserName","sterileUserCodeHidden",null); } }) -function requstCode(barcode,clearId,name,namecode){ - $.ajax({ +function requstCode(barcode,clearId,name,namecode,focusId){ + //barcode 当前输入条码的那个,传参 + //clearId 清空输入值的id + //name //显示对应人名,例如检查人 + //namecode 隐藏域 + if(barcode == null || name == null || namecode == null){ + alert("参数错误,请联系管理员!" , null , sstsConfig.messagePauseTimeOnPackingPage); + return; + } + + var peopleOfBarcode = barcode; + if(peopleOfBarcode){ + $.ajax({ url:WWWROOT+"/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); - } + if(result != null && result != ""){ + if(result.success == true){ + $("#"+name).val(result.fullName);//名字,例如检查人 + $("#"+namecode).val(result.name);//工号放入隐藏域在提交装配时传参 + $("#"+clearId).val("");//清空检查人条码 + if(focusId != null){ + focusId.focus();//获取焦点 + } + //$("#"+name).parent().parent().parent().next().children("div:first-child").children().children("input").focus(); + }else{ + result.isNotSameOrgUnit?alert("不允许登记非本科室人员,请扫描本科室人员条码"):alert("输入的条码有误!" , null , sstsConfig.messagePauseTimeOnPackingPage); } + $("#"+clearId).val(""); + }else{ + showResult('找不到该条码所对应的人员信息' , null , sstsConfig.messagePauseTimeOnPackingPage); + userNameField.setValue(); + } } }) + } + } //灭菌方式 $("#sterilingType").change(function(){ var sterilizationMode = $("#sterilingType option:selected").attr("data-mode"); $('#sterilizationMode').val(sterilizationMode); }); +sterilizerNameRequest(); //灭菌炉 function sterilizerNameRequest(){ $.ajax({ @@ -502,33 +798,103 @@ $("#sterilizerName").html(""); var result = JSON.parse(result); if(result.success == true){ - for(var i=0;i"+result.rows[i].name+""; - $("#sterilizerName").append(sterilizerOptions); + var sterilizerOptions = "" + for(var i=0;i"+result.rows[i].name+""; } + $("#sterilizerName").append(sterilizerOptions); }else{ alert(result.message); } } }); } -//灭菌程序 +//灭菌炉,灭菌程序,灭菌方式,炉次的关联 var sterilizerName = $("#sterilizerName option:selected").val(); +//灭菌炉发生改变的时候 +$("#sterilizerName").change(function(){ + var sterilizerName = $("#sterilizerName option:selected").val(); + $.ajax({ + url:WWWROOT+'/disinfectSystem/sterilization/sterilizationRecordController/getMaxFrequency.mhtml', + dataType:'json', + type:'get', + async:false, + data:{sterilizerName:sterilizerName}, + success:function(data){ + if(data.success===true){ + $('#frequency').val(data.data.maxFrequency); + }else { + alert(data.message) + } + } + }) + + $.ajax({ + url:WWWROOT+"/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml", + type: "get", + data:{"sterilizerName":sterilizerName}, + success:function(result){ + if(result.success == true){ + $("#sterilingType").html(""); + var options =""; + for(var i=0;i"+sterilisationAndpurposeStr+""; + + } + $("#sterilingType").html(options); + }else{ + alert(result.message); + } + + } + }) + + }) + +//灭菌程序 $.ajax({ url:WWWROOT+"/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml", type: "get", data:{"sterilizerName":sterilizerName}, success:function(result){ if(result.success == true){ + $("#sterilingType").html(""); + var options =""; for(var i=0;i"+result.rows[i].sterilisation+""; - $("#sterilingType").append(options); - + options += ""; + } + $("#sterilingType").html(options); }else{ alert(result.message); } @@ -562,7 +928,13 @@ var packageTypeVal = $("#packageType option:selected").val(); var validDate = $("#packageType option:selected").attr("data-validDate"); var validDateUnit = $("#packageType option:selected").attr("data-validDateUnit"); - alert(packageTypeVal+"的失效期为"+validDate+validDateUnit); + if(validDate == "undefined" || validDate === '' || validDate == null){ + alert(packageTypeVal+'未配置失效期'); + }else if(validDate == '0'){ + alert(packageTypeVal+'无失效期'); + }else{ + alert(packageTypeVal+"的失效期为"+validDate+validDateUnit); + } }) $(function(){ @@ -574,47 +946,48 @@ //左下表格 $("#assemblyTaskleftFootTable").css("height",($("#tableFootBox").height()-78)+"px"); leftFootLoad(); + + //刷新按钮 $("#refreshFootTable").click(function(){ - leftFootLoad(); + reloadFootTable(); }) /*左上表格 start*/ leftTopload(); $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-60)+"px"); dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); - gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable); + /* if(dataViewTopTable == []){ + $("#assemblyTaskleftTopTable .slick-viewport .grid-canvas").html("
无数据
"); + }*/ + gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable",dataViewTopTable, visibleColumnsTopTable, optionsTopTable); + $(".slick-viewport").css({"overflow":"auto"}); - //subText("assemblyTaskLeftTopTable"); - //gridTopTable.init(); - /*左上在篮筐中输入条码*/ $("#searchBarcode").keydown(function(e){ if (e.keyCode == 13) { - var searchBarcodeVal = $("#searchBarcode").val(); - if(searchBarcodeVal == ""){ - alert("请扫描篮筐条码"); - return; - } - - $("#searchBarcodeHidden").val(searchBarcodeVal); + var searchBarcodeVal = $("#searchBarcode").val(); + if(searchBarcodeVal == ""){ + alert("请扫描篮筐条码"); + return; + } + var dataLen = gridTopTable.getData(); + $("#searchBarcodeHidden").val(searchBarcodeVal); searchBarcodeHidden = $("#searchBarcodeHidden").val(); - //左上表格的刷新 + //左上表格的刷新 var codeList = $("#searchBarcodeHidden").attr("codelist"); - basketBarcodesAll = JSON.parse(codeList); - if (codeList != undefined && codeList != "" && codeList != "[]") { + basketBarcodesAll = JSON.parse(codeList); + if (codeList != undefined && codeList != "" && codeList != "[]") { + if (basketBarcodesAll.indexOf(searchBarcodeHidden) == -1) {//没有 + basketBarcodesAll.push(searchBarcodeHidden); + } - if (basketBarcodesAll.indexOf(searchBarcodeHidden) > -1) { - alert("不能扫描重复条码!"); - return; - }; + $("#searchBarcodeHidden").attr("codelist", JSON.stringify(basketBarcodesAll)); - basketBarcodesAll.push(searchBarcodeHidden); - $("#searchBarcodeHidden").attr("codelist", JSON.stringify(basketBarcodesAll)); + } else { - basketBarcodesAll.push(searchBarcodeVal); - $("#searchBarcodeHidden").attr("codelist", JSON.stringify(basketBarcodesAll)); + basketBarcodesAll.push(searchBarcodeVal); + $("#searchBarcodeHidden").attr("codelist", JSON.stringify(basketBarcodesAll)); } - $("#searchBarcode").val(""); reloadTopTableMoreborde(basketBarcodesAll.join(";")); // subText("assemblyTaskleftTopTable"); @@ -1010,6 +1383,22 @@ } return "tousse-name-defaultColor"; }); + + gridTopTable.onMouseEnter.subscribe(function (e,args){ + var rowAndCellByEvent = gridTopTable.getCellFromEvent(e);//根据事件返回触发的行和列下标:row,cell + var columns = gridTopTable.getColumns(); //列表每个列的定义 + var cssRow = {}; //用于修改行样式 + var changeRow = {}; + for (var i = 0; i < columns.length; i++) { + var column = columns[i]; + changeRow[column.id] = "height-bg";//设置定义的css + } + cssRow[rowAndCellByEvent.row] = changeRow; + gridTopTable.setCellCssStyles("height-bgName", cssRow); + }) + gridTopTable.onMouseLeave.subscribe(function (e, args){ + gridTopTable.removeCellCssStyles("height-bgName"); + }) } function reloadTopTableMoreborde(searchBarcode){ @@ -1024,33 +1413,59 @@ topTableLastestSelects = []; if(result.success == true){ //assemblyTaskLeftTopTableCon = result.data; - var datas =result.data; - var nLength = datas?datas.length:0; - if(nLength == 0){ + var datas =result.data; + var loadedCount = 0; + for (var m = 0; m < loadDataTop.length; m++) { + if (loadDataTop[m].parent == null) { + loadedCount += loadDataTop[m].amount; + }; + }; + var nowLoadCount = 0; + for (var m = 0; m < datas.length; m++) { + if (datas[m].parent == null) { + nowLoadCount += datas[m].amount; + }; + }; + if (loadedCount == nowLoadCount) { + basketBarcodesAll.pop(); + $("#searchBarcodeHidden").attr("codelist", JSON.stringify(basketBarcodesAll)); + alert('该篮筐在'+taskGroup+'内无装配任务!'); + return; + } + + /*if(nLength == 0){ //showResult('该篮筐在'+taskGroup+'内无装配任务!' , null , sstsConfig.messagePauseTimeOnPackingPage); alert('该篮筐在'+taskGroup+'内无装配任务!'); - } - var tempLeftTopTableInputArray = []; - var tempTousseNameArray = []; - var tempDatas = []; + }*/ + + //console.log("loadDataTop--", loadDataTop); + + + + + var tempLeftTopTableInputArray = [];//不重复的数据 + var tempTousseNameArray = []; //不重复的物品名称 + var tempDatas = [];//重复的数据 + + for (var i = 0; i < datas.length; i++) { - if (tempLeftTopTableInputArray.length == 0 || tempTousseNameArray.indexOf(datas[i].tousseName) == -1) {//未找到 + //把后台返回的数据,不重复的名字放到一个新数组tempTousseNameArray + if (tempLeftTopTableInputArray.length == 0 || tempTousseNameArray.indexOf(datas[i].tousseName) == -1) {//未找到,不重复 tempLeftTopTableInputArray.push(datas[i]); tempTousseNameArray.push(datas[i].tousseName); continue; } - - if (tempTousseNameArray.indexOf(datas[i].tousseName) != -1) {//找到 + if (tempTousseNameArray.indexOf(datas[i].tousseName) != -1) {//找到,重复就放新数组 tempDatas.push(datas[i]); } } - + //重复与不重复的作对比 var tempIndexArray = []; for (var k = 0; k < tempLeftTopTableInputArray.length; k++) { for(var m = 0; m < tempDatas.length; m++) { - if (tempIndexArray.indexOf(m) != -1) { + if (tempIndexArray.indexOf(m) != -1) {//找到,证明对比过,所以跳出 continue; } if (tempLeftTopTableInputArray[k].tousseName == tempDatas[m].tousseName) { @@ -1060,20 +1475,26 @@ } } } - - + + datas = tempLeftTopTableInputArray; assemblyTaskLeftTopTableCon = datas; var tempId = 0; loadDataTop = []; loadDataTop = requestData(datas);//加载数据 + + var filterTopTable = new Slick.Controls.ColumnPicker(visibleColumnsTopTable, gridTopTable, optionsTopTable); gridTopTable.invalidateAllRows(); dataViewTopTable.beginUpdate(); dataViewTopTable.setItems(loadDataTop); dataViewTopTable.setFilter(myFilterTopTable); dataViewTopTable.endUpdate(); + gridTopTable.render(); }else{ + //var codeList = $("#searchBarcodeHidden").attr("codelist"); + basketBarcodesAll.pop(); + $("#searchBarcodeHidden").attr("codelist", JSON.stringify(basketBarcodesAll)); alert(result.message); } @@ -1085,7 +1506,6 @@ //装配以后刷新 function reloadPackingLeftTopTasks(datas) { - var tempId = 0; var tempLoadDataTop = []; for(var i=0;i  "+value+"" ;//收缩 + return spacer + "   "+value+"" ;//收缩 } else { - return spacer + "   "+value+"";//展开 + return spacer + "   "+value+"";//展开 } } else { - return spacer + "  "+value+""; + return spacer + "  "+value+""; } } function myFilterTopTable(item) { @@ -1388,27 +1808,21 @@ dataView.setItems(loadData); dataView.setFilter(myFilter); dataView.endUpdate(); + grid.render(); } }) leftFootTable(); } function leftFootTable(){ - //头部列筛选 - + //头部列筛选 if (dataView == undefined || dataView == null) { dataView = new Slick.Data.DataView({ inlineFilters: true }); } if(grid == undefined || grid == null){ grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); - }/*else{ - grid.invalidateAllRows(); - }*/ - - /* $(".slick-viewport").css({ - "overflow-y": "auto" - });*/ + } //必须加这段代码,不然表格不能滚动 dataView.onRowCountChanged.subscribe(function (e, args) { grid.updateRowCount(); @@ -1525,14 +1939,21 @@ } }); -/* grid.onMouseEnter.subscribe(function (e, args){ - return "height-bg"; - grid.addCellCssStyles("height-bg",1); - - console.log("111"); - console.log("e",e); - console.log("args",args); - })*/ + grid.onMouseEnter.subscribe(function (e,args){ + var rowAndCellByEvent = grid.getCellFromEvent(e);//根据事件返回触发的行和列下标:row,cell + var columns = grid.getColumns(); //列表每个列的定义 + var cssRow = {}; //用于修改行样式 + var changeRow = {}; + for (var i = 0; i < columns.length; i++) { + var column = columns[i]; + changeRow[column.id] = "height-bg";//设置定义的css + } + cssRow[rowAndCellByEvent.row] = changeRow; + grid.setCellCssStyles("height-bgName", cssRow); + }) + grid.onMouseLeave.subscribe(function (e, args){ + grid.removeCellCssStyles("height-bgName"); + }) //修改样式 grid.onBeforeAppendCell.subscribe(function (e, args) { if (grid.getColumns()[args.cell].id !== 'tousseName') return null; @@ -1618,8 +2039,7 @@ } return "tousse-name-defaultColor"; }); - - //grid.init(); + } //判断子菜单start function tousseNameFormatter(row, cell, value, columnDef, dataContext){ @@ -2287,6 +2707,7 @@ } } +//表格父级 function requestMaterialsDataParent(tousseName,tousseID){ materialsTableLoad(); $.ajax({ @@ -2314,11 +2735,13 @@ // gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ParData, visibleColumns_Materials, optionsMaterials); gridMaterials.setData(loadMaterials_ParData); gridMaterials.render(); + $("#materialsParHidden").val(JSON.stringify(result.rows)); //器械总数 $("#materialTotalAmount").text(result.materialTotalAmount); //一次性物品总数 $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount); - metarilsFocus();//显示功能检查 + metarilsFloatingTable("par");//显示功能检查 + // metarilsFocus(); }else{ alert(result.message); } @@ -2330,8 +2753,11 @@ gridMaterials.updateRowCount(); gridMaterials.render(); });*/ - + //metarilsFloating(); + + } +//表格子级 function requestMaterialsDataChild(child_tousseName,child_tousseID){ materialsTableLoad(); $.ajax({ @@ -2357,11 +2783,12 @@ //gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ChildData, visibleColumns_Materials, optionsMaterials); gridMaterials.setData(loadMaterials_ChildData); gridMaterials.render(); + $("#materialsChildHidden").val(JSON.stringify(materialsChildData)); //器械总数 $("#materialTotalAmount").text(result.materialTotalAmount); //一次性物品总数 $("#diposableGoodsTotalAmount").text(result.diposableGoodsTotalAmount); - metarilsFocus();//显示功能检查 + metarilsFloatingTable("child");//显示功能检查 }else{ alert(result.message); } @@ -2370,53 +2797,65 @@ 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" - }) +function metarilsFloatingTable(vals){ + var resultHidden; + if(vals == "par"){ + resultHidden = JSON.parse($("#materialsParHidden").val()); + }else{ + resultHidden = JSON.parse($("#materialsChildHidden").val()); + } + gridMaterials.onMouseEnter.subscribe(function (e,args){ + var rowIndex = gridMaterials.getCellFromEvent(e);//根据事件返回触发的行和列下标:row,cell + for(var i=0;i清洗质量检查方法清洗质量检查关注点功能检查"); + 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-100); + 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(); - }) - } + $(".metariles-list-tips").show(); + } + }) + + gridMaterials.onMouseLeave.subscribe(function (e, args){ + $(".metariles-list-tips").hide(); + $(".metariles-firstTd").nextAll().remove(); + }) } /*材料清单表格end*/ /*数量增减start*/ @@ -2478,6 +2917,14 @@ } } //增加炉次 +$("#frequency").blur(function(){ + var frequencyVal = $(this).val(); + var text = $(this).val().replace(/[^\d]/g,""); + $(this).val(text); + if (frequencyVal > 0) { + $(this).val(Math.round(frequencyVal)); + }; +}) function addFrequency(that){ var addVal = parseInt($(that).parent().siblings("input").val())+1; if(($(that).parent().siblings("input").val())==""){ @@ -2631,21 +3078,12 @@   minView: 2,   //clearBtn:true,//清除按钮   forceParse: 0, - pickerPosition:direction + pickerPosition:direction, + startDate:new Date() //今天之前的不能选   }); } datePick("dateFrom_breakage","yyyy-mm-dd hh:ii:ss","bottom-right");//添加报损器械 datePick("determineDate","yyyy-mm-dd","top-right");//灭菌日期 datePick("dateFrom_Amend","yyyy-mm-dd hh:ii:ss","bottom-right");//灭菌开始时间 datePick("dateFrom_printBegin","yyyy-mm-dd hh:ii:ss","bottom-right");//打印回收清单开始时间 datePick("dateFrom_printEnd","yyyy-mm-dd hh:ii:ss","bottom-right");//打印回收清单结束时间 -/*window.onload=function(){ - alert(); - var $collapseArray = $("span.collapse"); - for (var i = $collapseArray.length - 1; i >= 0; i--) { - $($collapseArray[i]).trigger("click"); - } -} -function init(){ - -}*/ \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/select-page/examples/index.jsp =================================================================== diff -u -r25053 -r25077 --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/select-page/examples/index.jsp (.../index.jsp) (revision 25053) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/select-page/examples/index.jsp (.../index.jsp) (revision 25077) @@ -41,13 +41,26 @@ 'start':0 } -}); + }); + $.sexyCombo.create({ + name: "ajax-combo", + id: "ajax-combo", + container: "#ajax-containers", + //url: "ceshibox.php", + url: "/disinfectSystem/baseData/supplyRoomConfigController/getApplicationDepartJson.mhtml", -// console.log($); + ajaxData:{ + 'limit':10, + 'spell':'', + 'start':0 + } + }); }); + - +
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r25005 -r25077 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 25005) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 25077) @@ -227,6 +227,7 @@ //科室名称对应 var departmentTitle = $("#departmentTitle").text(); $("#setDepartmentTitle option:selected").text(departmentTitle); + $("#setDepartmentTitle option:selected").val(departmentTitle); $("#setDepartmentTitle").change(function(){ var optionText = ($(this).children('option:selected').val()); $("#departmentTitle").text(optionText); Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp =================================================================== diff -u -r24995 -r25077 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24995) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 25077) @@ -49,6 +49,11 @@ + + + + + @@ -171,144 +176,133 @@ »
-
+
-
- -
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
- - -
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
- -
-
-
- -
- -
-
-
-
-
- -
+
    +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + +
    -
    -
-
- +
+ +
  • +
    - +
    -
  • -
    -
    -
    - -
    - -
    -
    -
    -
    - -
    -
    + +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • +
  • + + +
  • + +
    + +
    @@ -347,17 +341,19 @@
    - - - - +
    + +
    +
    - - +
    + +
    +
    @@ -457,9 +453,9 @@
    - - - + + +
    清洗质量检查方法清洗质量检查关注点功能检查清洗质量检查方法清洗质量检查关注点功能检查
    @@ -791,12 +787,13 @@ + + + - - @@ -834,9 +831,12 @@ - - - + + + + + + <%@ include file="/disinfectsystem/print/print2.jsp"%> @@ -853,7 +853,9 @@ - + + +