Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/api.js =================================================================== diff -u -r32206 -r35265 --- ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/api.js (.../api.js) (revision 32206) +++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/js/api.js (.../api.js) (revision 35265) @@ -231,4 +231,201 @@ } }); }, + //获取灭菌炉分组的接口 + getSterilerGroup: function (callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/core/httpOptionAction!getHttpOptionsById.do', + async: false, + data: { + optionId: 'sterilerGroup' + }, + success: function (result) { + var res = JSON.parse(result); + var data = []; + if (res.success) { + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].value, + value: res.data[i].value + }) + } + } + callback(data); + } + }); + }, + //获取灭菌炉的接口 + getAllSterilizer: function (callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/baseData/sterilizerAction!getAllSterilizer.do', + async: false, + data: { + needAll: '是', + needFilter: false + }, + success: function (result) { + var res = eval(('(' + result + ')')) + var data = []; + for (var i = 0; i < res.length; i++) { + if (res[i][0] !== '全部') { + data.push({ + name: res[i][0], + value: res[i][0] + }) + } + } + callback(data); + } + }); + }, + //获取科室的接口【使用记录录入明细报表】 + getAllOrgUnitName: function (value, callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getAllOrgUnitName.do', + async: false, + data: { + spell: value + }, + success: function (result) { + var data = []; + if (result) { + var res = JSON.parse(result); + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].name, + value: res.data[i].name + }) + } + } + callback(data); + } + }); + }, + //获取申请科室的接口【外来器械申请单统计报表】 + getSettleAccountsDepartJson: function (value, callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/baseData/supplyRoomConfigAction!getSettleAccountsDepartJson.do', + async: false, + data: { + spell: value + }, + success: function (result) { + var data = []; + if (result) { + var res = JSON.parse(result); + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].name, + value: res.data[i].name + }) + } + } + callback(data); + } + }); + }, + //获取物品的接口【使用记录录入明细报表】 + searchTousseAndDisposableGoodsAndExpensiveGoods: function (value, callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!searchTousseAndDisposableGoodsAndExpensiveGoods.do', + async: false, + data: { + spell: value + }, + success: function (result) { + var data = []; + if (result) { + var res = JSON.parse(result); + var data = []; + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].name, + value: res.data[i].name + }) + } + } + callback(data); + } + }); + }, + //获取外来器械物品的接口【外来器械申请单统计报表】 + queryForeignOrSplitTousseName: function (value, callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!queryForeignOrSplitTousseName.do', + async: false, + data: { + spell: value + }, + success: function (result) { + var data = []; + if (result) { + var res = JSON.parse(result); + var data = []; + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].name, + value: res.data[i].name + }) + } + } + callback(data); + } + }); + }, + //获取用户的接口【使用记录录入明细报表】 + loadUserByOrgId: function (value, callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/systemmanage/user/loadUserByOrgId!loadUserByOrgId.do', + async: false, + data: { + spell: value + }, + success: function (result) { + var data = []; + if (result) { + var res = eval('(' + result + ')'); + var data = []; + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].name, + value: res.data[i].name + }) + } + } + callback(data); + } + }); + }, + //获取供应商的接口【外来器械申请单统计报表】 + getSupplierInfoByType: function (callback) { + $.ajax({ + type: "post", + url: WWWROOT + '/disinfectSystem/baseData/supplierAction!getSupplierInfoByType.do', + async: false, + data: { + supplierType: '外来器械租用商' + }, + success: function (result) { + var data = []; + if (result) { + var res = eval('(' + result + ')'); + var data = []; + for (var i = 0; i < res.data.length; i++) { + data.push({ + name: res.data[i].companyName, + value: res.data[i].companyName + }) + } + } + callback(data); + } + }); + } }; \ No newline at end of file Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.js =================================================================== diff -u -r32236 -r35265 --- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.js (.../reportView.js) (revision 32236) +++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportView.js (.../reportView.js) (revision 35265) @@ -46,6 +46,8 @@ //何时在顶部显示行组面板 rowGroupPanelShow: 'none', enableRangeSelection: true, + //支持合并单元格 + suppressRowTransform: true, debug: false, sideBar: '', enableCharts: false, @@ -209,7 +211,7 @@ var html = ''; //获取查询条件 - html += getSearchBox(tableIndex, tableArray[tableIndex].datasetId, tableArray[tableIndex].componentId, searchOptions, true); + html += getSearchBox(tableIndex, tableArray[tableIndex].datasetId, tableArray[tableIndex].datasetName, tableArray[tableIndex].componentId, searchOptions, true); html += '
' + tableName + '
'; @@ -247,7 +249,7 @@ gridOptionsDefault.api.setServerSideDatasource(datasource); //渲染查询条件 - renderSearchBox(searchOptions, form, laydate); + renderSearchBox(searchOptions, form, laydate, tableArray[tableIndex].datasetName); } } @@ -320,9 +322,11 @@ if (total == 0) { layer.msg('数据为空，请查询后再导出'); + layer.close(layerShowLoad); return } else if (total > 65535) { layer.msg('最大导出数据为65535，请缩小查询查询数据的范围'); + layer.close(layerShowLoad); return } else { var url = encodeURI(WWWROOT + '/disinfectSystem/customizedReports/reportController/exportData.mhtml?&reportId=' + reportId + '&componentId=' + componentId + '&queryJson=' + JSON.stringify(queryJson)); Index: ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.jsp =================================================================== diff -u -r32236 -r35265 --- ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.jsp (.../reportUpdate.jsp) (revision 32236) +++ ssts-web/src/main/webapp/disinfectsystem/customizedreports/reportList/reportUpdate.jsp (.../reportUpdate.jsp) (revision 35265) @@ -129,14 +129,15 @@
+
- +
- @@ -149,13 +150,13 @@
-
+