Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css =================================================================== diff -u -r24437 -r24619 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css (.../recyclingApplication.css) (revision 24437) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/recyclingApplication/recyclingApplication.css (.../recyclingApplication.css) (revision 24619) @@ -202,10 +202,13 @@ .content-modal-tousse-modal-footer{ margin-top: 0 !important; } + /*解决外来器械‘添加’按钮添加二字显示不出*/ .foreignTousse-add{ padding-left: 0 !important; } +.error{ + border-color:red !important; +} - Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r24526 -r24619 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 24526) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 24619) @@ -43,6 +43,7 @@
科室申领
+
@@ -120,8 +121,9 @@
+
-
+
 基础信息
@@ -131,7 +133,6 @@ -
@@ -140,22 +141,22 @@
- +
- +
- +
- +
@@ -171,14 +172,15 @@
- +
-
- -
+ +
@@ -778,7 +780,6 @@
-
@@ -809,6 +810,7 @@ + @@ -826,15 +828,27 @@ + + + + + + + + + + + + - --> \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/plugins/customer/s-validate/s-validate.js =================================================================== diff -u --- ssts-web/src/main/webapp/dx-disinfectsystem/plugins/customer/s-validate/s-validate.js (revision 0) +++ ssts-web/src/main/webapp/dx-disinfectsystem/plugins/customer/s-validate/s-validate.js (revision 24619) @@ -0,0 +1,162 @@ +;(function($){ + + var defConfig = {}; + + var publicMethod = { + + init : function(options){ + + $.each(options,function(name,value){ + if(value.type == 'id'){ + var label = $("#"+name).parent().prev(); + + //为必须填写的元素设置星号 + if ( $(label).find('.star').length < 1 ){ + $(label).prepend("* "); + } + + $("#"+name).on('change',function(e){ + var el = $("#"+name); + var v = $(el).val(); + if( v == null || v == ''){ + showOrHideErrorMsg(el,0,value.error); + }else{ + showOrHideErrorMsg(el,1,value.error); + } + }); + } + }); + + //提交按钮点击时再循环验证 + $("#tousseSubmit").on('mousedown',function(e){ + for(var _k in options){ + //input失去焦点时判断内容是否为空，为空则输入框边框变红，并在下方提示 + if(options[_k].type == 'id'){ + var el = $("#"+_k); + var v = $(el).val(); + if( v == null || v == ''){ + showOrHideErrorMsg(el,0,options[_k].error); + }else{ + showOrHideErrorMsg(el,1,options[_k].error); + } + }else if(options[_k].type == 'array'){ + var array = options[_k].value; + if(array.length < 1){ + showOrHideErrorMsg($("#"+options[_k].positionId),0,options[_k].error); + }else{ + var validateField = options[_k].validateField; + var valRes = false; + for(var i = 0;i < array.length;i++){ + if(validateField.type == 'num' && validateField.valiType == 'notEmpty'){ + if(parseInt(array[i][validateField.field],10) > 0 ){ + valRes = true; + } + } + } + + if(valRes == false){ + showOrHideErrorMsg($("#"+options[_k].positionId),0,options[_k].error); + }else{ + showOrHideErrorMsg($("#"+options[_k].positionId),1,options[_k].error); + } + + } + } + } + }); + + }, + destroy : function(options){ + var args = Array.prototype.slice.call(arguments, 1); + if(args.length == 0){ + $(this).find('.errorMsg').each(function(errorEl){ + var $this = this; + var el = $($this).parent().children().first(); + $($this).remove(); + $($this).parent().parent().css("margin-bottom","15px"); + + if ( $(el).is("select") ){ + $(el).parent().find(".select2-selection--multiple,.select2-selection--single").removeClass("error"); + }else{ + $(el).removeClass("error"); + } + }); + }else if(args.length == 1){ + var $this = $("#"+args[0]); + var el = $($this).parent().children().first(); + $($this).remove(); + $($this).parent().parent().css("margin-bottom","15px"); + + if ( $(el).is("select") ){ + $(el).parent().find(".select2-selection--multiple,.select2-selection--single").removeClass("error"); + }else{ + $(el).removeClass("error"); + } + } + }, + getResult:function(){ + return $(this).find('.errorMsg').length > 0 ? false : true; + } + } + + + //显示或删除错误信息type: 0 显示错误信息；1 删除错误信息 + var showOrHideErrorMsg = function(el,type,errorMsg){ + + if(type == 0){ + //如果为select + if ( $(el).is("select") ){ + $(el).parent().find(".select2-selection--multiple,.select2-selection--single").addClass("error"); + }else{ + $(el).addClass("error"); + } + + if( $(el).parent().find(".errorMsg").length < 1 ){ + $(el).parent().append( '* '+errorMsg+'' ); + } + toggleCss(el,type); + }else{ + + if ( $(el).is("select") ){ + $(el).parent().find(".select2-selection--multiple,.select2-selection--single").removeClass("error"); + }else{ + $(el).removeClass("error"); + } + + $(el).parent().find(".errorMsg") .remove(); + toggleCss(el,type); + } + + } + + + //调整div[class="form-group"]的margin-bottom为0或复原为15px + function toggleCss(el,type){ + if(type == 0){ + $(el).parent().parent().css("margin-bottom","0"); + }else{ + $(el).parent().parent().css("margin-bottom","15px"); + } + } + + + $.fn.s_validate = function(options){ + var $this = this; + var method = arguments[0]; + + if( publicMethod[method] ){ + method = publicMethod[method]; + arguments = Array.prototype.slice.call(arguments,1); + }else if( typeof(method) == 'object' || !method){ + method = publicMethod.init; + }else{ + alert("无此方法"); + return ; + } + + return method.apply(this,arguments); + + }; + + +})(jQuery) Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r24531 -r24619 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24531) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24619) @@ -11,7 +11,10 @@ var table="
" $('#main').append(table); - + + + + //主页面table字段 var allApplication_columns=[{ checkbox : true @@ -274,9 +277,16 @@ /*【申请器械包--按钮】*/ $("#app_tousses").click(function(){ + $("#tousseAppForm").s_validate('destroy'); + $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){ toggleShow(this,1); }); + + if( $("#tousseName_tousse_number").length < 1 ){ + $("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'}); + } + currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM; toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM; toussesJson.isExpandRow = false; @@ -286,10 +296,39 @@ //“处理科室”下拉框 renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val()); + + $("#tousseAppForm").s_validate({ + departApp_tousse:{ + type:'id', + error:"申请科室不能为空" + }, + settleDep_tousse:{ + type:'id', + error:"结算科室不能为空" + }, + handleDep_tousse:{ + type:'id', + error:"处理科室不能为空" + }, + appToussesArr : { + type:'array', + error:"申请物品不能为空", + positionId:'tousseName_tousse_select', + value:appToussesArr, + validateField:{field:'amount',type:'num',valiType:'notEmpty'} + } + + }); + + +// $(".select2-selection--multiple").css("error"); +// $(".select2-selection--single ").addClass("error"); }); + /*【申请一次性物品--按钮】*/ $("#app_disposable").click(function(){ + $("#tousseAppForm").s_validate('destroy'); $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){ toggleShow(this,1); }); @@ -305,6 +344,7 @@ /*【申请消毒物品--按钮】*/ $("#app_disinfection").click(function(){ + $("#tousseAppForm").s_validate('destroy'); $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){ toggleShow(this,1); }); @@ -412,15 +452,20 @@ tousseName_tousse_select.text(''); tousseName_tousse_number.val(''); appToussesArr.push(appendContent); + $("#tousseAppForm").s_validate('destroy','tousseName_tousse_select'); } }); /*【申请器械包/一次性物品/消毒物品--“提交”按钮】*/ - $("#tousseSubmit").click(function(){ + $("#tousseSubmit").mouseup(function(){ + alert('kkkkk'); submitJson.currentApplication = currentApplication; submitJson.isCommit = true; submitJson.appToussesArr = appToussesArr; - confirmSumbitJson(submitJson); + var valResult = $("#tousseAppForm").s_validate('getResult'); + if(valResult == true){ + submitForm(submitJson); + } }); /*【申请器械包/一次性物品/消毒物品--“提交并新建”按钮】*/ @@ -430,7 +475,7 @@ submitJson.appToussesArr = appToussesArr; // submitJson.isRefresh = false; //提交申请单 - confirmSumbitJson(submitJson); + submitForm(submitJson); //新建申请单 if(currentApplication == Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM){//“器械包申请单” currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM; @@ -462,7 +507,7 @@ submitJson.currentApplication = currentApplication; submitJson.isCommit = false; submitJson.appToussesArr = appToussesArr; - confirmSumbitJson(submitJson); + submitForm(submitJson); }); /*【申请器械包/一次性物品/消毒物品--“取消”按钮】*/ @@ -1047,7 +1092,7 @@ * 【主表--点击列--详情展示】 */ $("#allApplication_table").on("click-row.bs.table",function($element,row){ - + $("#tousseAppForm").s_validate('destroy'); $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){ toggleShow(this,2); }); @@ -1113,30 +1158,34 @@ "disinfectMaterilas":"", "tousseDefinitionID":item.tousseDefinitionId }; - -// var appendContent={ -// "id":null, -// "tousseName":name, -// "amount":num, -// "originalPrice":null, -// "price":null, -// "rowPrice":null, -// "urgentAmount":null, -// "isApplyEntireTousse":null, -// "expressInvoice":"否", -// "diposable":"否", -// "tousseType":"器械包", -// "unit":null, -// "unitCount":null, -// "minUnit":null, -// "transferScale":null, -// "disinfectMaterilas":"", -// "tousseDefinitionID":id -// }; - + $("#tousse_table").bootstrapTable('append',appendContent11); appToussesArr.push(appendContent11); } + + $("#tousseAppForm").s_validate({ + departApp_tousse:{ + type:'id', + error:"申请科室不能为空" + }, + settleDep_tousse:{ + type:'id', + error:"结算科室不能为空" + }, + handleDep_tousse:{ + type:'id', + error:"处理科室不能为空" + }, + appToussesArr : { + type:'array', + error:"申请物品不能为空", + positionId:'tousseName_tousse_select', + value:appToussesArr, + validateField:{field:'amount',type:'num',valiType:'notEmpty'} + } + }) + + $(".table_div").find(".fixed-table-toolbar").remove(); $(".form-table").find(".th-inner").css({"padding-top":"0","padding-bottom":"0","margin-bottom":"8"}); }); @@ -1423,6 +1472,9 @@ responseHandler : "", sidePagination:'server', search:true, + showRefresh:true, + showColumns:true, + trimOnSearch:true, toolbar:'#'+toolbarId, pageSize : 30,// 如果设置了分页，页面数据条数 pageList : [ 10,20,30], // 如果设置了分页，设置可供选择的页面数据条数。设置为All则显示所有记录。 @@ -1550,6 +1602,7 @@ } } }); + } @@ -1905,7 +1958,6 @@ * }; */ function submitForm(submitJson){ - var valiResult = true; //ID var idEl=$('#'+submitJson.idElId); @@ -1922,7 +1974,6 @@ var departAppElVal = departAppEl.val(); if(!Tools.ArrayUtils.isNotEmpty(departAppElVal)){ valiResult = false; - alert("申请科室不能为空!"); }else{ departCoding=departAppElVal[0]; } @@ -1934,7 +1985,6 @@ var settleDepElVal = departAppEl.val(); if(!Tools.ArrayUtils.isNotEmpty(settleDepElVal)){ valiResult = false; - alert("结算科室不能为空!"); }else{ settleAccountsDepartCoding=settleDepElVal[0]; } @@ -1945,7 +1995,6 @@ var handleDepartCoding = handleDepEl.val(); if( Tools.StringUtils.isEmpty(handleDepartCoding) ){ valiResult = false; - alert("处理科室科室不能为空!"); } var handleDepart=handleDepEl.find("option:selected").text(); @@ -1969,7 +2018,6 @@ var commitData = new disposableGoodApplicationData(submitJson.isCommit,id,applicant,applicantCode,submitJson.appToussesArr,departCoding,depart,settleAccountsDepartCoding,settleAccountsDepart,handleDepartCoding,handleDepart,type,applicationTimeStr,remark); - if(valiResult == true ){ $.ajax({ url:WWWROOT +'/disinfectSystem/recyclingApplicationAction!saveRecyclingApplication.do', type:'post', @@ -1993,35 +2041,9 @@ $("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").removeClass("dx-btn-disable"); } }); - } } -/** - * 确认并提交申请单 - */ -function confirmSumbitJson(submitJson){ - bootbox.confirm({ - size: "small", - message: "确认是否提交", - buttons: { - confirm: { - label: '确认', - className: 'btn-success' - }, - cancel: { - label: '取消', - className: 'btn-danger' - } - }, - callback: function (result) { - if(result == true){ - submitForm(submitJson); - } - } - }); -} - /**“器械包申请”、“一次性物品申请单”、“消毒物品申请单”隐藏或显示某按钮 * el:HTML元素 * state:1表示需要隐藏，2表示需要显示 @@ -2037,6 +2059,7 @@ } $(footer).addClass("col-xs-offset-3"); }; + }else if(state == 2){ //显示 if( $(el).hasClass("hideStatus") ){ Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/jsp-temple.jsp =================================================================== diff -u -r24526 -r24619 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/jsp-temple.jsp (.../jsp-temple.jsp) (revision 24526) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/jsp-temple.jsp (.../jsp-temple.jsp) (revision 24619) @@ -86,8 +86,12 @@ + + + +