Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css =================================================================== diff -u -r24425 -r24445 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24425) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/index/index.css (.../index.css) (revision 24445) @@ -274,6 +274,26 @@ width:30px; height:31px; } +.index-rightbottom-tips{ + width:300px; + position:fixed; + bottom:0; + right:0; + margin-bottom:0; +} +.index-rightbottom-tips .panel-heading{ + height:40px; + line-height:40px; + background: #72b142; + font-size: 17px; + font-weight: bold; + padding:0 15px; + color: #000; +} +.index-rightbottom-tips .panel-body{ + height:200px; + overflow:auto; +} /* 首页end */ /* 装配管理start */ .assembly-manage{ Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp =================================================================== diff -u -r24397 -r24445 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24397) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24445) @@ -233,7 +233,19 @@ - + +
+
+ 公告1 + × +
+
+ Webpack 是当下最热门的前端资源模块化管理和打包工具。它可以将许多松散的模块按照依赖和规则打包成符合生产环境部署的前端资源。 + w3schools.com 是最受欢迎的前端技术教程网站，但是国内用户一直不能访问，并且国内的中文翻译版本十分陈旧。因此做了个镜像，希望英文好的同学直接去看原版教程吧！ + w3schools.com 是最受欢迎的前端技术教程网站，但是国内用户一直不能访问，并且国内的中文翻译版本十分陈旧。因此做了个镜像，希望英文好的同学直接去看原版教程吧！ + w3schools.com 是最受欢迎的前端技术教程网站，但是国内用户一直不能访问，并且国内的中文翻译版本十分陈旧。因此做了个镜像，希望英文好的同学直接去看原版教程吧！ +
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r24430 -r24445 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24430) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24445) @@ -497,6 +497,10 @@ } } }) + //关闭右下角提示 + $("#closeIndexRightBottomTips").click(function(){ + $(this).parent().parent().fadeOut(200); + }) //退出系统 /* $.ajax({ Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js =================================================================== diff -u -r24430 -r24445 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24430) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagement.js (.../assemblyManagement.js) (revision 24445) @@ -209,43 +209,38 @@ $("#inspectorCodeInput").keydown(function(e){ if (e.keyCode == 13) { var inspectorCodeInput = $("#inspectorCodeInput").val(); - $("#inspectorCodeInputHidden").val(inspectorCodeInput); - requstCode(inspectorCodeInput,"inspectorInput","inspectorCodeInput","operatorCode"); + requstCode(inspectorCodeInput,"inspectorInput","inspectorCodeInputHidden"); } }) //配包人条码 $("#operatorCode").keydown(function(e){ if (e.keyCode == 13) { var operatorCode = $("#operatorCode").val(); - $("#operatorCodeHidden").val(operatorCode); - requstCode(operatorCode,"operator","operatorCode","reviewerCode"); + requstCode(operatorCode,"operator","operatorCodeHidden"); } }) //审核人条码 $("#reviewerCode").keydown(function(e){ if (e.keyCode == 13) { var reviewerCode = $("#reviewerCode").val(); - $("#reviewerCodeHidden").val(reviewerCode); - requstCode(reviewerCode,"reviewer","reviewerCode","wrapperCode"); + requstCode(reviewerCode,"reviewer","reviewerCodeHidden"); } }) //包装人条码 $("#wrapperCode").keydown(function(e){ if (e.keyCode == 13) { var wrapperCode = $("#wrapperCode").val(); - $("#wrapperCodeHidden").val(wrapperCode); - requstCode(wrapperCode,"wrapper","wrapperCode","sterileUserCode"); + requstCode(wrapperCode,"wrapper","wrapperCodeHidden"); } }) //灭菌人条码 $("#sterileUserCode").keydown(function(e){ if (e.keyCode == 13) { var sterileUserCode = $("#sterileUserCode").val(); - $("#sterileUserCodeHidden").val(sterileUserCode); - requstCode(sterileUserCode,"sterileUserName","sterileUserCode",""); + requstCode(sterileUserCode,"sterileUserName","sterileUserCodeHidden"); } }) -function requstCode(barcode,name,namecode,focusInput){ +/*function requstCode(barcode,name,namecode,focusInput){ $.ajax({ url:"/disinfectSystem/web/userController/getUserByBarcode.mhtml", dataType: "json", @@ -254,32 +249,124 @@ type: "post", success:function(result){ if(result.success == true){ - $("#"+name).val(result.name); - $("#"+namecode).val(""); + $("#"+name).val(result.fullName); + $("#"+namecode).val(result.name);//工号 $("#"+focusInput).focus(); + }else{ + alert(result.message); } } }) +}*/ +function requstCode(barcode,name,namecode){ + $.ajax({ + url:"/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);//工号 + $("#"+name).parent().parent().parent().next().children("div:first-child").children().children("input").focus(); + }else{ + alert(result.message); + } + } + }) } +//灭菌程序 +var sterilizerName = $("#sterilizerName option:selected").val(); +$.ajax({ + url:"/disinfectSystem/baseData/sterilisationController/getSterilizerType.mhtml", + type: "get", + data:{"sterilingType":sterilizerName}, + success:function(result){ + var result = JSON.parse(result); + if(result.success == true){ + //console.log("resulttrue,,,",result.rows); + for(var i=0;i"+result.rows[i].sterilisation+""; + $("#sterilingType").append(options); + + } + }else{ + alert(result.message); + } + + } +}); +//灭菌方式 +$("#sterilingType").change(function(){ + var sterilizationMode = $("#sterilingType option:selected").attr("data-mode"); + $('#sterilizationMode').val(sterilizationMode); +}); + + +//灭菌炉 +$.ajax({ + url:"/disinfectSystem/baseData/sterilizerController/getAllSterilizer.mhtml", + type: "get", + async:true, + success:function(result){ + var result = JSON.parse(result); + if(result.success == true){ + for(var i=0;i"+result.rows[i].name+""; + $("#sterilizerName").append(sterilizerOptions); + } + }else{ + alert(result.message); + } + + + } +}); + +//包装类型 +$.ajax({ + url:"/disinfectSystem/baseData/expirationDateInfoController/getPackageTypeAndExpirationDateInfo.mhtml", + type: "get", + async:true, + success:function(result){ + var result = JSON.parse(result); + if(result.success == true){ + for(var i=0;i"+result.rows[i].optionText+""; + $("#packageType").append(optionText); + } + }else{ + alert(result.message); + } + + + } +}) +$("#packageType").change(function(){ + 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); +}) //补充丢弃器械和报损按钮的数字 $.ajax({ - url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml", - // url:"/disinfectSystem/packing/getErrorAndDamageCount.mhtml", + url:"/disinfectSystem/packingController/getErrorAndDamageCount.mhtml", type: "get", async:true, success:function(result){ - + var result = JSON.parse(result); if(result.success == true){ - /*$("#addLose b").text(result.errorCount); - $("#addBreakage b").text(result.damageCount);*/ + $("#addLose b").text(result.errorCount); + $("#addBreakage b").text(result.damageCount); }else{ - //alert(result.message); + alert(result.message); } } - /* error:function(msg){ - console.log(msg.message); - }*/ }); $(function(){ @@ -388,6 +475,7 @@ } return {css:{"color":"#000"}}; } + } } @@ -657,8 +745,20 @@ field : 'tousseName', align : 'center', sortable:true, //正序,逆序 - switchable: false - cellStyle:function(value,row,index){; + switchable: false, + formatter:function(v,record){ + for(var i=0;i"+v+""; + }else{ + $("#packPrint").show(); + return ""+v+""; + } + } + + }, + cellStyle:function(value,row,index){ for(i=0;i0){*/ $("#assemblyTaskLeftTopTable").bootstrapTable("uncheckAll"); Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp =================================================================== diff -u -r24430 -r24445 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24430) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24445) @@ -101,11 +101,11 @@
- +
@@ -246,23 +242,13 @@
- -
-
@@ -988,6 +974,14 @@ searchURL = searchURL.substring(1, searchURL.length); taskGroup = decodeURIComponent(searchURL.split("?")[0].split("=")[1]); } + + /* var sterilerGroup; + var paramName = taskGroup; + var reg = new RegExp("(^|&)" + paramName + "=([^&]*)(&|$)"); //构造一个含有目标参数的正则表达式对象 + var r = window.location.search.substr(1).match(reg); //匹配目标参数 + if (r != null) { + sterilerGroup = decodeURI(r[2]) + } */