Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js =================================================================== diff -u -r24619 -r24651 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24619) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/goodsApplicationView.js (.../goodsApplicationView.js) (revision 24651) @@ -4,17 +4,28 @@ //解决select2 单选框无法输入的问题 $.fn.modal.Constructor.prototype.enforceFocus = function () {}; - var tableTopL=$("#main").offset().top; + var tableTopL=$("#main").offset(); var pagiHeight=$(".fixed-table-pagination").height(); var documentHeight=$(document).height(); var tableHeight=documentHeight-pagiHeight-tableTopL; var table="
" $('#main').append(table); + var topBody = $(top.document.body); + var modal = ''; + topBody.append(modal); - - +// $("#tousseModal").modal("show"); + + + //主页面table字段 var allApplication_columns=[{ checkbox : true @@ -277,52 +288,54 @@ /*【申请器械包--按钮】*/ $("#app_tousses").click(function(){ - $("#tousseAppForm").s_validate('destroy'); +// +// $("#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; +// +// //清空申请物品数组 +// appToussesArr=[]; + window.top.$("#tousseModal").modal('show'); + var tousseIframeDucument = window.top.$("#tousseIframe").contents(); + $(tousseIframeDucument).find("#app_tousses").trigger("from-tousse-show"); +// showAppForm(toussesJson); - $("#tousseAppPrintPreview,#tousseAppPrint,#tousseAppReturnEdit,#tousseAppEndTousse").each(function(){ - toggleShow(this,1); - }); +// //“处理科室”下拉框 +// renderSelect_handlerDpt('handleDep_tousse',1,"器械包",$('#departApp_tousse').val()); - if( $("#tousseName_tousse_number").length < 1 ){ - $("#tousseName_tousse_num").spinner({id:'tousseName_tousse_number'}); - } +// $("#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'} +// } +// +// }); - currentApplication=Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM; - toussesJson.tousseType = Constants.AppType.TYPE_TOUSSE_APPLICATION_FORM; - toussesJson.isExpandRow = false; - //清空申请物品数组 - appToussesArr=[]; - showAppForm(toussesJson); - - //“处理科室”下拉框 - 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"); }); @@ -458,7 +471,6 @@ /*【申请器械包/一次性物品/消毒物品--“提交”按钮】*/ $("#tousseSubmit").mouseup(function(){ - alert('kkkkk'); submitJson.currentApplication = currentApplication; submitJson.isCommit = true; submitJson.appToussesArr = appToussesArr; @@ -517,10 +529,156 @@ /**【表单--申请器械包/一次性物品/消毒物品 end】*/ + +/**【表单--申请外来器械 begin】*/ +//申请外来器械中table字段 +var foreignTousse_columns=[{ + field : 'id', + align : 'center', + visible:false + }, + { + field : 'orgUnitCode', + align : 'center', + visible:false + }, + { + field : 'serialNumber', + align : 'center', + visible:false + }, + { + title : '供应商', + field : 'supplierName', + align : 'center' + }, + { + title : '器械包/材料名称', + field : 'tousseName', + align : 'center' + }, + { + title : '是否植入物', + field : 'p', + align : 'center' + }, + { + title : '数量', + field : 'num', + align : 'center' + },{ + title : '单价', + field : 'price', + align : 'center' + },{ + title : '可拆卸数量', + field : 'allprice1', + align : 'center' + },{ + title : '大小', + field : 'allprice1', + align : 'center' + } + ]; + var foreignTousseItems=[]; + + /*【申请外来器械--下拉框】*/ + //“申请科室”下拉框 + renderSelect_appDpt('foreignTousse_appDep',1); + //“结算科室”下拉框 + renderSelect_settleDpt('foreignTousse_settleDep',1); + //“处理科室”下拉框 + renderSelect_handlerDpt('foreignTousse_handleDep',1,"器械包",$('#foreignTousse_appDep').val()); + //医生 + renderSelect_doctor("foreignTousse_doctor"); + //供应商数据列表 + renderDepartment_suppler("foreignTousse_suppler1"); + //外来器械物品名 + renderDepartment_foreignTousse("foreignTousse_foreignTousseName1",$("#foreignTousse_suppler1").val()); + //处理方式 + renderDepartment_foreignTousse("foreignTousse_handleMethod"); + +// //器械包名称 +// renderDepartment_tousse("foreignTousse_name"); +// //供应商 +// renderDepartment_tousse("foreignTousse_supplier"); +// //供应商联系人 +// renderDepartment_tousse("foreignTousse_supplier_contact"); +// //初始化手术时间 +// initSchedulingDate('operaTime'); + + $("#app_foreignTousse").click(function(){ + $("#foreignTousse_title").text("申请外来器械"); + $("#foreignTousse_modal").modal('show'); + loadTable("foreignTousse_table","",foreignTousse_columns,false,false,'',true); + $("#foreignTousse_table").find("#form-body").css({'padding-bottom':'0'}); + $("#modal-footer").find("#form-body").css({'padding-bottom':'0'}); + $(".table_div").find(".fixed-table-toolbar").remove(); + $(".form-table").find(".th-inner").css({"padding-top":"0","padding-bottom":"0","margin-bottom":"8"}); + }); + + + /*【申请外来器械--“添加”按钮】*/ + $("#foreignTousse_add_tousse").click(function(){ + var foreignTousse_name=$("#foreignTousse_name"); + var foreignTousse_supplier=$("#foreignTousse_supplier"); + var tousseName=foreignTousse_name.text(); + var id=foreignTousse_name.val(); + var supplierVal=foreignTousse_supplier.val(); + var supplierName=foreignTousse_name.text(); + + if(!Tools.StringUtils.isEmpty(tousseName)&&!Tools.StringUtils.isEmpty(supplierName)){ + var appendContent={tousseName:tousseName,supplierName:supplierName}; + $("#foreignTousse_table").bootstrapTable('append',appendContent); + foreignTousse_name.text(''); + foreignTousse_supplier.text(''); + foreignTousseItems.push(appendContent); + } + }); + + /*【申请外来器械--“提交”按钮】*/ + $("#foreignTousseSubmit").click(function(){ + $("#foreignTousse_modal").modal('hide'); + }); + + /*【申请外来器械--“提交并打印”按钮】*/ + $("#foreignTousseSubmitPrint").click(function(){ + $("#foreignTousse_modal").modal('hide'); + clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); + }); + + /*【申请外来器械--“确认归还”按钮】*/ + $("#foreignTousseReturn").click(function(){ + $("#foreignTousse_modal").modal('hide'); + clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); + }); + + /*【申请外来器械--“提前归还”按钮】*/ + $("#foreignTousseEarlyReturn").click(function(){ + $("#foreignTousse_modal").modal('hide'); + clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); + }); + /*【申请外来器械--“取消”按钮】*/ + $("#foreignTousseCancel").click(function(){ + $("#foreignTousse_modal").modal('hide'); + clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); + }); + + +/**【表单--申请外来器械 end】*/ + + + + + + + + + /**【借物--按钮】*/ $("#app_borrowTousse").click(function(){ $("#borrowTousse_title").text("借物单"); @@ -535,56 +693,6 @@ - //申请外来器械中table字段 - var foreignTousse_columns=[{ - field : 'id', - align : 'center', - visible:false - }, - { - field : 'orgUnitCode', - align : 'center', - visible:false - }, - { - field : 'serialNumber', - align : 'center', - visible:false - }, - { - title : '供应商', - field : 'supplierName', - align : 'center' - }, - { - title : '器械包/材料名称', - field : 'tousseName', - align : 'center' - }, - { - title : '是否植入物', - field : 'p', - align : 'center' - }, - { - title : '数量', - field : 'num', - align : 'center' - },{ - title : '单价', - field : 'price', - align : 'center' - },{ - title : '可拆卸数量', - field : 'allprice1', - align : 'center' - },{ - title : '大小', - field : 'allprice1', - align : 'center' - } - ]; - //申请自定义器械包中table字段 var customizeTousse_columns=[{ field : 'id', @@ -720,25 +828,8 @@ ]; + -/*【申请外来器械--下拉框】*/ - //申请科室 - renderDepartment_tousse("foreignTousse_appDep"); - //结算科室 - renderDepartment_tousse("foreignTousse_settleDep"); - //处理科室 - renderDepartment_tousse("foreignTousse_handleDep"); - //处理方式 - renderDepartment_tousse("foreignTousse_handleMethod"); - //器械包名称 - renderDepartment_tousse("foreignTousse_name"); - //供应商 - renderDepartment_tousse("foreignTousse_supplier"); - //供应商联系人 - renderDepartment_tousse("foreignTousse_supplier_contact"); - //初始化手术时间 - initSchedulingDate('operaTime'); - /*【申请自定义器械包--下拉框】*/ //申请科室 renderDepartment_tousse("customizeTousse_appDpt"); @@ -872,65 +963,8 @@ + -/*【表单--申请外来器械】*/ - var foreignTousseItems=[]; - $("#app_foreignTousse").click(function(){ - $("#foreignTousse_title").text("申请外来器械"); - $("#foreignTousse_modal").modal('show'); - loadTable("foreignTousse_table","",foreignTousse_columns,false,false,'',true); - $("#foreignTousse_table").find("#form-body").css({'padding-bottom':'0'}); - $("#modal-footer").find("#form-body").css({'padding-bottom':'0'}); - $(".table_div").find(".fixed-table-toolbar").remove(); - $(".form-table").find(".th-inner").css({"padding-top":"0","padding-bottom":"0","margin-bottom":"8"}); - }); - - /*【申请外来器械--“添加”按钮】*/ - $("#foreignTousse_add_tousse").click(function(){ - var foreignTousse_name=$("#foreignTousse_name"); - var foreignTousse_supplier=$("#foreignTousse_supplier"); - var tousseName=foreignTousse_name.text(); - var id=foreignTousse_name.val(); - var supplierVal=foreignTousse_supplier.val(); - var supplierName=foreignTousse_name.text(); - - if(!Tools.StringUtils.isEmpty(tousseName)&&!Tools.StringUtils.isEmpty(supplierName)){ - var appendContent={tousseName:tousseName,supplierName:supplierName}; - $("#foreignTousse_table").bootstrapTable('append',appendContent); - foreignTousse_name.text(''); - foreignTousse_supplier.text(''); - foreignTousseItems.push(appendContent); - } - }); - - /*【申请外来器械--“提交”按钮】*/ - $("#foreignTousseSubmit").click(function(){ - $("#foreignTousse_modal").modal('hide'); - }); - - /*【申请外来器械--“提交并打印”按钮】*/ - $("#foreignTousseSubmitPrint").click(function(){ - $("#foreignTousse_modal").modal('hide'); - clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); - }); - - /*【申请外来器械--“确认归还”按钮】*/ - $("#foreignTousseReturn").click(function(){ - $("#foreignTousse_modal").modal('hide'); - clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); - }); - - /*【申请外来器械--“提前归还”按钮】*/ - $("#foreignTousseEarlyReturn").click(function(){ - $("#foreignTousse_modal").modal('hide'); - clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); - }); - /*【申请外来器械--“取消”按钮】*/ - $("#foreignTousseCancel").click(function(){ - $("#foreignTousse_modal").modal('hide'); - clearForm("foreignTousse_modal",["foreignTousse_table"],foreignTousseItems); - }); - /*【表单--申请自定义器械包】*/ var customizeTousseItems=[]; @@ -1261,7 +1295,165 @@ } -//【“申请器械包”-下拉框渲染--申请科室】 + +//"申请外来器械"处理方式下拉框 +function renderDepartment_foreignTousse(elementId){ + + $("#"+elementId).select2({ + language : 'zh-CN',//转为中文版 + minimumInputLength: 1, + placeholder: "关键词搜索", + maximumSelectionLength:1, + allowClear: true, + ajax: { + url: WWWROOT + '/disinfectSystem/foreigntousseapplication/foreignTousseApplicationAction!getProcessType.mhtml', + dataType: 'json', + contentType:"application/json;charset=utf-8", + type:'get', + cache: true, + delay: 1000, + data:function (params) { + return { + spell: params.term, // search term + limit:20, + page:params.page||1, //第几页返回查询 + offset:((params.page||1)-1) * 20 + }; + }, + processResults: function (data,params) {//结果处理 + var result=[]; + if(data.success == true){ + result=transformJsonArrToSelect2(data.rows,"id","displayName"); + } + return {results: result,"pagination": {"more": true}} + } + } +}); + $("#"+elementId).next().attr('style','width:100%;'); + +} + + +//"申请外来器械"器械包信息下拉框 +function renderDepartment_foreignTousse(elementId,supplierName){ + + $("#"+elementId).select2({ + language : 'zh-CN',//转为中文版 + minimumInputLength: 1, + placeholder: "关键词搜索", + maximumSelectionLength:1, + allowClear: true, + ajax: { + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionController!getForeignTousseDefinitionNames.mhtml', + dataType: 'json', + contentType:"application/json;charset=utf-8", + type:'get', + cache: true, + delay: 1000, + data:function (params) { + return { + supplierName : supplierName, + spell: params.term, // search term + limit:20, + page:params.page||1, //第几页返回查询 + offset:((params.page||1)-1) * 20 + }; + }, + processResults: function (data,params) {//结果处理 + var result=[]; + if(data.success == true){ + result=transformJsonArrToSelect2(data.rows,"id","displayName"); + } + return {results: result,"pagination": {"more": true}} + } + } + }); + $("#"+elementId).next().attr('style','width:100%;'); + +} + + + +//"申请外来器械"供应商下拉框 +function renderDepartment_suppler(elementId,supplierType){ + + $("#"+elementId).select2({ + language : 'zh-CN',//转为中文版 + minimumInputLength: 1, + placeholder: "关键词搜索", + maximumSelectionLength:1, + allowClear: true, + ajax: { + url: WWWROOT + '/disinfectSystem/baseData/supplierController!getSupplierData.mhtml', + dataType: 'json', + contentType:"application/json;charset=utf-8", + type:'get', + cache: true, + delay: 1000, + data:function (params) { + return { + supplierType : supplierType, + spell: params.term, // search term + limit:20, + page:params.page||1, //第几页返回查询 + offset:((params.page||1)-1) * 20 + }; + }, + processResults: function (data,params) {//结果处理 + var result=[]; + if(data.success == true){ + result=transformJsonArrToSelect2(data.rows,"phoneNumber","contactName"); + } + return {results: result,"pagination": {"more": true}} + } + } + }); + $("#"+elementId).next().attr('style','width:100%;'); + +} + + + +//"申请外来器械"医生下拉框 +function renderSelect_doctor(elementId){ + + $("#"+elementId).select2({ + language : 'zh-CN',//转为中文版 + minimumInputLength: 1, + placeholder: "关键词搜索", + maximumSelectionLength:1, + allowClear: true, + ajax: { + url: WWWROOT + '/disinfectSystem/baseData/commonlyUsedDoctorController!findDoctorListBykeyWord.mhtml', + dataType: 'json', + contentType:"application/json;charset=utf-8", + type:'get', + cache: true, + delay: 1000, + data:function (params) { + return { + spell: params.term, // search term + limit:20, + page:params.page||1, //第几页返回查询 + offset:((params.page||1)-1) * 20 + }; + }, + processResults: function (data,params) {//结果处理 + var result=[]; + if(data.success == true){ + result=transformJsonArrToSelect2(data.rows,"doctorName","doctorName"); + } + return {results: result,"pagination": {"more": true}} + } + } + }); + $("#"+elementId).next().attr('style','width:100%;'); +} + + + + +//【所有申请单-下拉框渲染--申请科室】 function renderSelect_appDpt(elementId,maximumSelectionLength){ $("#"+elementId).select2({ language : 'zh-CN',//转为中文版 @@ -1912,7 +2104,7 @@ $("#applicant").val(formJson.applicant); //为表单设置标题 $("#"+formJson.modalTileElementId).text(title); - $("#"+formJson.modalElementId).modal('show'); +// window.top.$("#"+formJson.modalElementId).modal('show'); //渲染“物品名称”下拉框数据 renderSelect_comboGoods(formJson.tousseSelectElementId,formJson.tousseSelectNum,tousseType,$('#'+formJson.departElementId).val() || "",$('#'+formJson.settleDepartElementId).val() || "",$('#'+formJson.handlerDepartElementId).val() || ""); //加载“申请物品”信息表格 Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp =================================================================== diff -u -r24619 -r24651 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 24619) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/recyclingApplication/goodsApplicationView.jsp (.../goodsApplicationView.jsp) (revision 24651) @@ -17,7 +17,7 @@ - + <%-- bootstrap-datetimepicker --%> @@ -114,9 +114,13 @@ + + 隐藏域 begin - + 隐藏域 end
@@ -203,9 +207,13 @@
+ + + + --> @@ -235,6 +243,7 @@
+
@@ -246,20 +255,22 @@
+
- +
+
- +
- +
@@ -269,66 +280,65 @@
- +
- +
- +
- +
- +
- +
- +
- +
- +
- +
- - +
- +
- +
@@ -338,11 +348,11 @@
- +
- +
工具：0件，植入物：0件，共0件 @@ -355,11 +365,11 @@
- +
- +
@@ -384,6 +394,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +