Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js =================================================================== diff -u -r24915 -r24917 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js (.../assemblyManagementSlick2.js) (revision 24915) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick2.js (.../assemblyManagementSlick2.js) (revision 24917) @@ -283,7 +283,6 @@ "packingParams": JSON.stringify(params) }, success:function(result){ - console.log(result); if(result.success == true){ alert(result.message); if (tempTableId == "assemblyTaskleftFootTable") { @@ -295,7 +294,7 @@ } $("#checkboxAllToptable").prop("checked", false); - //processAfterPacking(false,result,tousseName,inputAmount); + processAfterPacking(false,result,tousseName,inputAmount); }else{ var addNumHtml= "
" + "
提示
" @@ -311,7 +310,6 @@ } var leftTopTableInputHiddenArray = JSON.parse($("#leftTopTableInputHidden").val()); - console.log("leftTopTableInputHiddenArray",leftTopTableInputHiddenArray); var assembleArray = []; if (leftTopTableInputHiddenArray != undefined && leftTopTableInputHiddenArray.length > 0) { for (var i = 0; i < leftTopTableInputHiddenArray.length; i++) { @@ -357,7 +355,7 @@ dataViewTopTable.setFilter(myFilterTopTable); dataViewTopTable.endUpdate(); leftFootLoad();//刷新左下表格 - //printLabelsAfterPacking();//打印标签 + printLabelsAfterPacking();//打印标签 }); function hidePackingTousseBtnClick_mask(){ @@ -620,9 +618,6 @@ $("#searchBarcode").val(""); reloadTopTableMoreborde(searchBarcodeHidden); - - - console.log($("#searchBarcodeHidden").val()); // subText("assemblyTaskleftTopTable"); //topTableRowClickEvent(); } @@ -1696,7 +1691,6 @@ function confirmDeleteTopTabel(that){ var topTaskId = $(that).parent().prevAll().children(".sava_TopTaskId").attr("ToptaskId"); footTabelids = topTaskId; - console.log("topTaskIdxxxp", topTaskId); $('.deleteMsgModel').modal('show'); } Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js =================================================================== diff -u --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js (revision 0) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/todayAssemblyManagementRecord2.js (revision 24917) @@ -0,0 +1,465 @@ +var optionsTodayTable; +var gridTodayTable; +var columns; +var TodayPackingTableTable_columns = []; +var visibleColumns_TodayTable; +var TodayTable_checkboxSelector; +var dataViewTodayTable; + +//搜索 +var searchWords=""; +var requestFilters = []; +var TodayTable_data = []; +var requestParamsObj; +//右边搜索 +var searchFilter; +//查询 + +//自适应 +var availableHeight = 0; +var availableWidth = 0; +var DATAGRID_MIN_HEIGHT = 180; +var DATAGRID_MIN_WIDTH = 300; +var DATAGRID_BOTTOM_PADDING = 20; +function todayPackingClcik(obj){ + var objs= obj; + if(objs===1){ + availableHeight=0; + availableWidth=0; + objs++; + }else{ + availableWidth=$(window).width(); + availableHeight = $(window).height()-window.parent.$(".head-index").height()- window.parent.$(".content-index").height()-218; + TodayTableLoad(); + } +} +function attachAutoResizeDataGrid(grid, gridId, gridContainerId) { + var gridDomElm = $('#' + gridId); + if (!gridDomElm || typeof gridDomElm.offset() === "undefined") { + return null; + } + resizeToFitBrowserWindow(grid, gridId, gridContainerId); + $(window).on("resize", function () { + resizeToFitBrowserWindow(grid, gridId, gridContainerId); + resizeToFitBrowserWindow(grid, gridId, gridContainerId); + }); +} +function destroyAutoResize() { + $(window).trigger('resize').off('resize'); +} +function calculateGridNewDimensions(gridId, gridContainerId) { + var newHeight = availableHeight; + var newWidth = availableWidth; + if (newHeight < DATAGRID_MIN_HEIGHT) { + newHeight = DATAGRID_MIN_HEIGHT; + } + if (newWidth < DATAGRID_MIN_WIDTH) { + newWidth = DATAGRID_MIN_WIDTH; + } + + return { + height: newHeight, + width: newWidth + }; +} +function resizeToFitBrowserWindow(grid, gridId, gridContainerId) { + var newSizes = calculateGridNewDimensions(gridId, gridContainerId); + if (newSizes) { + $('#' + gridId).height(newSizes.height); + $('#' + gridId).width(newSizes.width); + if (new RegExp('MSIE [6-8]').exec(navigator.userAgent) === null && grid) { + grid.resizeCanvas(); + } + } +} +function TodayTableLoad(){ + optionsTodayTable = { + enableCellNavigation: true, + enableColumnReorder: false, + forceFitColumns: true, + editable: true, + enableAddRow: false, + asyncEditorLoading: true, + topPanelHeight: 25, + autoEdit: false, + }; + columns = []; + TodayTable_checkboxSelector = new Slick.CheckboxSelectColumn({cssClass: "slick-cell-checkboxsel"}); + columns.push(TodayTable_checkboxSelector.getColumnDefinition()); + + columns.push( + { + field: 'id', + name: 'ID', + align:'center', + sortable: true + }, + { + id: "depart", + name : "科室", + field : 'depart', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + }, + { + id: "supplierName", + name : '供应商', + field : 'supplierName', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + minWidth:150 + }, + { + id: "tousseName", + name : '器械包', + field : 'tousseName', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + }, + { + id: "splitTousseName", + name : '拆包名称', + field : 'splitTousseName', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + }, + { + id:"amount", + name : '数量', + field : 'amount', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + // resizable: false + }, + { + id:"packer", + name : '配包人', + field : 'packer', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + }, + { + id:"reviewer", + name : '审核人', + field : 'reviewer', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + }, + { + id:"packTimeStr", + name : '装配时间', + field : 'packTimeStr', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + }, + { + id:"foreignMaterialsAmount", + name : '材料汇总', + field : 'foreignMaterialsAmount', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title", + }, + { + id:"doctor", + name : '医生', + field : 'doctor', + align : 'center', + sortable:true, //正序,逆序 + cssClass: "cell-title" + } + ); + + //将id列隐藏 + visibleColumns_TodayTable = [];//定义一个数组存放显示的列 + for (var i = 0; i < columns.length; i++) { + if (i!=1){ + visibleColumns_TodayTable.push(columns[i]);//将columns的列push进去 + } + } + mainTable(0,requestFilters); + +} + + +function mainTable(setOffset,setFilters){ + var setLimit= parseInt($("#pageAmount").val()); + var beginSelect = $("#beginSelect option:selected").val(); + var endSelect = $("#endSelect option:selected").val(); + if(beginSelect > endSelect){ + alert("开始时间不能大于结束时间"); + return; + } + var taskGroupParam= { + "columnLabel": "taskGroup", + "type": "STRING", + "value": taskGroup, + "operator": "=" + } + setFilters.push(taskGroupParam); + //排序 + var requestSortsClounms = [ + { + "columnLabel": "id", + "propFullName": "", + "direction": "desc" + } + ]; + //时间 + var packTime ={ + "columnLabel": "packTime", + "type": "DATETIME", + "dateFormat":"yyyy-MM-dd HH:mm", + "minValue": beginSelect, + "maxValue": endSelect, + "operator": "BETWEEN" + } + setFilters.push(packTime); + //器械组 + + //默认传值 + requestParamsObj = { + "offset": setOffset, //页码 + "limit": setLimit, //页面大小 + // "filters": setFilters, + "logicalOperator": " AND ", + "gridId": "com.forgon.disinfectsystem.packing.findPackingRecordList", + }; + //排序 + requestParamsObj.sorters = requestSortsClounms; + requestParamsObj.filters = setFilters; + $.ajax({ + url:WWWROOT+"/disinfectSystem/grid/gridController/getGrid.mhtml", + data: { + gridParams: JSON.stringify(requestParamsObj) + }, + type: "post", + 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); + } + } + TodayTable_dataView = new Slick.Data.DataView({inlineFilters: true}); + + if(result.rows != ""){ + $("#PageSize").val(result.limit); + $("#dataCount").val(result.total); + var loadstate = $("#loadstate").val(); + if(loadstate=="hason"){ + btsetloadData(result.total); + btloadpage(); + } + } + + dataViewTodayTable = new Slick.Grid("#todayAssemblyRecordTable",todayTable_data, visibleColumns_TodayTable, optionsTodayTable); + //头部列筛选 + var columnpicker = new Slick.Controls.ColumnPicker(visibleColumns_TodayTable, dataViewTodayTable, optionsTodayTable); + attachAutoResizeDataGrid(dataViewTodayTable, "todayAssemblyRecordTable", "gridContainer"); + } + }); +} + +//主表搜索 +$("#today-table-search").keydown(function(e){ + if(e.keyCode == 13 ){ + searchWords = $("#today-table-search").val(); + + searchFilters = { + "logicalOperator": " OR ", + "filters": [] + }; + for(var i=0;i 0 ? (myPageCount / myPageSize) + 1 : (myPageCount / myPageSize); + $("#countindex").val(countindex); + var sendOffset = myPageCount*myPageSize-1; + var sendLimit = myPageSize; + $.jqPaginator('#pagination', { + totalPages: parseInt($("#countindex").val()), + visiblePages: parseInt($("#visiblePages").val()), + currentPage: 1, + first: '
  • <<
    • ', + prev: '', + next: '', + last: '
  • >>
    • ', + page: '
  • {{page}}
    • ', + onPageChange: function (num, type) { + if (type == "change") { + btexeData(num, type,sendLimit); + } + } + }); + + //mainTable(sendOffset,sendLimit,requestFilters); +} +//变更页面显示数据条数 +function changePageAmount(amount){ + var offset = parseInt($("#pageOffset").val()); + $("#dataAmountCurrent").html(amount); + $("#pageAmount").val(amount); + //显示单页条数 + $("#pageTotal").html(amount); + //单页条数 + $("#PageSize").val(amount); + //判断是否更改按钮的数量的根据——hason + $("#loadstate").val("hason"); + mainTable(0,requestFilters); +} +//今天本组装配记录开始时间和结束时间 +function initSelectDate(selectId) { + var date = new Date(); + var Y = date.getFullYear(); + var M = (date.getMonth()+1 < 10 ? '0'+(date.getMonth()+1) : date.getMonth()+1); + var D = (date.getDate() < 10 ? '0'+(date.getDate()) : date.getDate()); + var todayTime =  Y+"-"+M+"-"+D; + var dataMiss =["00", "15", "30", "45"]; + var optionHtml = ""; + for (var i = 0; i < 24; i++) { + for (var j = 0; j < dataMiss.length; j++) { + var temp = ""; + var todayTimeAll = ""; + if (i < 10) { + temp = "0" + i + ":" + dataMiss[j]; + + } else { + temp = i + ":" + dataMiss[j]; + + } + todayTimeAll = todayTime+" "+temp; + $("#" + selectId).append(optionHtml.replace("$optionValue", todayTimeAll) + .replace("$optionText", temp)); + } + } + if ("endSelect" == selectId) { + $("#endSelect").append(""); + } +} +initSelectDate("beginSelect"); +initSelectDate("endSelect"); + + +$('#departmentsSelect').selectPage({ + /*searchField : 'name',*/ + searchField:'spell',//配置搜素 + keyField : 'id', + data : WWWROOT+"/disinfectSystem/baseData/supplyRoomConfigController/getApplicationDepartJson.mhtml", + andOr : 'OR', + orderBy : ['id desc'], + noResultClean: false, + inputDelay : 0.5, + params : function(){ + return { + rows_key:"list", + total_key:"totalRow", + start_key:"pageNumber", + limit_key:"pageSize" + }; + }, + eAjaxSuccess : function(d){ + /* var lists = d.list;*/ + /* if(!Tools.ArrayUtils.isNotEmpty(lists) || d.totalRow ==0){ + //$(this).eResultList(); + }*/ + + return d; + } +}); + +