'
+'
';
$(top.document.body).append(modal);
- }
-
+ }
+
+
+ /*
+ * 搜索栏表单
+ * （未实现）
+ */
var initSearch = function(){
//申请时间
DateCpt.init('search_app_start_time','yyyy-mm-dd');
- /* $("#search_app_start_time").val(Tools.DateUtils.getBeforeCurrentDate(6));*/
DateCpt.init('search_app_end_time','yyyy-mm-dd');
- /*$("#search_app_end_time").val(Tools.DateUtils.getCurrentDate());*/
//申请科室
renderDepartment_tousse("search_app_depart");
//申请人
@@ -334,7 +405,12 @@
initMoreSearch();
});
}
-
+
+
+ /*
+ * 搜索栏表单
+ * （未实现）
+ */
var initMoreSearch = function(){
//终止状态
renderDepartment_tousse("search_more_termination_status");
@@ -408,9 +484,8 @@
});
}
- parent.refreshTable = function(){
- initTable();
- }
+
+ initParent();
// initSearch();
initForm();
initTable();
Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/applicationUtils.js
===================================================================
diff -u -r25015 -r25057
--- ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/applicationUtils.js (.../applicationUtils.js) (revision 25015)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/js/recyclingApplication/applicationUtils.js (.../applicationUtils.js) (revision 25057)
@@ -1,3 +1,9 @@
+/**
+ * 所有下拉框的内容渲染函数等到下拉框插件
+ * 确定下来后再封装。
+ */
+var isIE=Tools.BrowserTypeUtils.isIE()==1 ? true:false;
+$.fn.modal.Constructor.prototype.enforceFocus = function () {};//解决select2 单选框无法输入的问题
var DateCpt = {
init:function(idStr,format){
@@ -89,9 +95,6 @@
}
-
-
-
//获取下拉框内容并渲染到页面--科室下拉框
function renderDepartment_tousse(elementId,placeholder,maximumSelectionLength,url,asyns){
@@ -315,6 +318,32 @@
}
+//“处理科室”下拉框初始化
+function renderSelect_handlerDpt(elementId,maximumSelectionLength,tousseType,applyDepartCode){
+
+ var result=[];
+ $.ajax({
+ url:WWWROOT + '/disinfectSystem/core/orgUnitController/searchHandleDepartmentByKeyWord.mhtml',
+ dataType: 'json',
+ contentType:"application/json;charset=utf-8",
+ type:'get',
+ async:false,
+ cache: true,
+ data:{applyDepartCode:applyDepartCode,tousseType:tousseType},
+ success:function(msg){
+ result=transformJsonArrToSelect2(msg.rows,"departmentCode","departmentName");
+ }
+ });
+
+ $("#"+elementId).select2({
+ minimumResultsForSearch: Infinity,
+ data: result
+ })
+
+ $("#"+elementId).next().attr('style','width:100%;');
+}
+
+
//“自定义”器械包下拉框
function renderSelect_customerTousse(elementId){
$.ajax({
@@ -374,4 +403,60 @@
}
+/**
+ * 清空表单
+ * @formId 表单ID
+ * @tableIds 表单中表格destroy(此处需是bootstrap-table)
+ *1.隐藏模态框
+ *2.清空表单各输入框内容,表格重置
+ *3.清空物品项数组appToussesArr
+ */
+function clearForm(isIE,formId,tableIds,appToussesArr){
+ //清除input/select/textarea元素
+ if(isIE == true){
+ $("#"+formId).filter('input[type=text],input[type=number],select,input[type=hidden],textarea').each(function() {
+ $(this).val('');
+ $(this).text('');
+ });
+ }else{
+ $("#"+formId).find('input[type=text],input[type=number],select,input[type=hidden],textarea').each(function() {
+ $(this).val('');
+ $(this).text('');
+ });
+ }
+
+ //清空物品列表所选择数据的缓存
+ if(appToussesArr != undefined && appToussesArr.length != 0){
+ appToussesArr=[];
+ }
+ return appToussesArr;
+}
+
+/*
+ *将json数组转换成select2特定的json格式
+ *@param jsonArray 需要转换的json数组
+ *@param idCorreFiled 与select2中id对应的属性
+ *@param textCorreFiled 与select2中text对应的属性
+ */
+function transformJsonArrToSelect2(jsonArray,idCorreFiled,textCorreFiled){
+ var result=[];
+ for(var i=0;i'
@@ -297,14 +365,17 @@
+'
'
+'
";
+ for(var j=0; j < materials.length; j++){
+ var k = (tousseLoadData[tempId] = {});
+ k["id"] = tempId+'m' ;
+ k["indent"] = 1;
+ k["parent"] = parentId;
+ k["tousseName"]=materials[j].tousseName;
+ k["amount"]=materials[j].amount;
+ k["price"]=materials[j].price;
+ k["allprice"]=materials[j].allprice;
+ tempId ++;
}
- },
- complete:function(){
- window.top.$("#tousseModal").modal('hide');
- $("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").attr("disabled",false);
- $("#tousseSubmitAndNewForm,#tousseSubmit,#tousseTemStorage").removeClass("dx-btn-disable");
}
- });
-}
+ }
+
+ }
-
-/**“器械包申请”、“一次性物品申请单”、“消毒物品申请单”隐藏或显示某按钮
- * el:HTML元素
- * state:1表示需要隐藏，2表示需要显示
- */
-function toggleShow(el,state){
- var footer = $("#modal-footer");
- //隐藏
- if(state == 1){
- if( !$(el).hasClass("hideStatus") ){
- $(el).addClass("hideStatus");
- if ( $(footer).hasClass("col-xs-offset-1") == true ){
- $(footer).removeClass("col-xs-offset-1");
- }
- $(footer).addClass("col-xs-offset-3");
- };
+ /**
+ * 将消毒物品数据转换成可以显示到slick父子表的显示格式
+ * 需要转换的数据形式：
+ * {"isCleanedEntirely":"是","spelling":"WSCXS","isThereIdentificationCard":"否","displayName":"委松除屑水","type":"消毒物品","borrowPrice":0,"unit":"","expressInvoice":"否",
+ * "materials":[
+ {"name":"骨刀 （小）[24cm刃8mm]","materialDefinitionId":123,"tousseType":"器械","isDiposable":"否","count":1,"countBackup":1,"totalPrice":0,"amount":1,"price":0,"leaf":true},
+ {"name":"剥离子 (中)[19cm刃6mm]","materialDefinitionId":13,"tousseType":"器械","isDiposable":"否","count":1,"countBackup":1,"totalPrice":0,"amount":1,"price":0,"leaf":true}],
+ "price":0,"name":"委松除屑水","id":14899,"tousseType":"消毒物品","isApplyEntireTousse":"否"}
- }else if(state == 2){
- //显示
- if( $(el).hasClass("hideStatus") ){
- $(el).removeClass("hideStatus")
- if ( $(footer).hasClass("col-xs-offset-3") == true ){
- $(footer).removeClass("col-xs-offset-3");
- }
- $(footer).addClass("col-xs-offset-1");
- }
- }
-}
+ * 转换后的形式：
+ * [
+ {id:tempId,tousseDefinitionID:'',indent : 0,parent:0,tousseName:'',amount:'',price:'',allprice:''},
+ {id:tempId ++,tousseDefinitionID:'',indent : 1,parent:parentId,tousseName:'',amount:'',price:'',allprice:''}
+ ]
+ *
+ */
-
-
-/**slick.grid，消毒物品数据格式转换成父子表结构*/
-function transToDisfection(datas,tempId,tousseType){
-
- if(tousseType != Constants.AppType.TYPE_DISINFECT_GOODS_APPLICATION_FORM){
- tousseLoadData = datas;
- return;
- }
-
- var tempId = tempId || 0;
-
- for(var i=0;i";
- for(var j=0; j < materials.length; j++){
- var k = (tousseLoadData[tempId] = {});
- k["id"] = tempId+'m' ;
- k["indent"] = 1;
- k["parent"] = parentId;
- k["tousseName"]=materials[j].tousseName;
- k["amount"]=materials[j].amount;
- k["price"]=materials[j].price;
- k["allprice"]=materials[j].allprice;
- tempId ++;
- }
+ results[0] = {id:parentId,tousseDefinitionID:disinfectItem.id,indent : 0,parent:null,tousseName:disinfectItem.name,amount:0,price:disinfectItem.price,allprice:''};
+ for(var r=0;r