Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp =================================================================== diff -u -r24939 -r24952 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24939) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/review/reviewView.jsp (.../reviewView.jsp) (revision 24952) @@ -158,7 +158,7 @@
-
+
@@ -173,7 +173,7 @@
-
+
@@ -258,22 +258,23 @@
-
-
+
+ +
-
-
- -
-
- -
-
+
- +
+
+ +
+
+ +
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css =================================================================== diff -u -r24939 -r24952 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24939) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/reviewView/reviewView.css (.../reviewView.css) (revision 24952) @@ -58,6 +58,17 @@ display: none !important; } +/*slickgrid复选框首列样式*/ +.slick-column-name > input[type="checkbox"], input[type="radio"] { + line-height: normal; + margin: 8px 4px 0px; +} +/*slickgrid复选框样式*/ +.slick-cell-checkboxsel > input[type="checkbox"], input[type="radio"] { + line-height: normal; + margin: 10px 4px 0px; +} + /**********公用***********************/ .modal-header { background-color: #23b051; Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/review-Image.js =================================================================== diff -u -r24840 -r24952 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/review-Image.js (.../review-Image.js) (revision 24840) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/review-Image.js (.../review-Image.js) (revision 24952) @@ -19,52 +19,50 @@ //展示器械包图片信息 function getAndShowTousseInfoDiv(tousseName,tousseDefinitionId) { renderTousseInfo(tousseName,tousseDefinitionId); - } function renderTousseInfo(tousseName,tousseDefinitionId){ + var materialGridTable; var materialStore = getMaterialStore(tousseName,tousseDefinitionId); - var materialGridTableColumns = [{ + var materialGridGridColumns = [{ field: 'materialDefinitionId', - visible: false - }, { - title: '材料名称', - field: "name", - align: 'center', - sortable: true //正序,逆序 + id:'materialDefinitionId', + minWidth: 0, + width:0, + cssClass: 'reallyHidden', + headerCssClass: 'reallyHidden' },{ - title:'数量', - field:'count', - align:'center', - sortable:true + name: '材料名称', + field: 'name', + id: "name", + cssClass: "cell-title", + sortable: true, + width:180, + minWidth: 180 + },{ + name: '数量', + field: 'count', + id: "count", + cssClass: "cell-title", + sortable: true, + width:50, + minWidth: 50 }]; - $('#materialGridTable').bootstrapTable({ - data: materialStore, - // url:WWWROOT + '/disinfectSystem/baseData/tousseDefinitionAction!getMaterialDefinitionByTousseName.do', - // method: "post", //服务器数据的加载地址。 - dataType: "json", - // contentType: "application/x-www-form-urlencoded", - sidePagination: "server", //分页方式：client客户端分页，server服务端分页（*） - columns: materialGridTableColumns, //列表头 - undefinedText: "", // 当数据为 undefined 时显示的字符 - striped: false, //是否显示行间隔色 - cache: false, //是否使用缓存，默认为true，所以一般情况下需要设置一下这个属性（*） - pagination: false, //是否显示分页 - search: false, //是否显示表格搜索，此搜索是客户端搜索，不会进服务端 - showRefresh: false, //是否显示刷新按钮 - height: 400, //行高，如果没有设置height属性，表格自动根据记录条数觉得表格高度 - cardView: false, //是否显示详细视图 - sortable: true, //是否启用排序 - sortOrder: "desc", //排序方式 - sortName: 'materialDefinitionId', //排序字段 - idField: "materialDefinitionId", //每一行的唯一标识，一般为主键列 - clickToSelect: true, //是否启用点击选中行 - onDblClickRow: function (row, $element) { //双击列触发 - //显示图片 - //getAndShowTousseInModel(row); - } - }) -} + var materialGridTableOptions = { + enableCellNavigation: true, + enableColumnReorder: false, + rowHeight: 35, + // editable: false, + // enableAddRow: false, + // forceFitColumns: true//强迫适应宽度 + }; + materialGridTable = new Slick.Grid("#materialGridTable", materialStore, materialGridGridColumns, materialGridTableOptions); + //单击列触发 + materialGridTable.onClick.subscribe(function (e, args){ + //被选中后不能触发双击事件 + // unReviewTousseGrid.setSelectedRows([args.row]); + }); +}; function getMaterialStore(tousseName,tousseDefinitionId){ var materialStore = []; Index: ssts-web/src/main/webapp/common/logger.js =================================================================== diff -u -r17181 -r24952 --- ssts-web/src/main/webapp/common/logger.js (.../logger.js) (revision 17181) +++ ssts-web/src/main/webapp/common/logger.js (.../logger.js) (revision 24952) @@ -31,6 +31,13 @@ } catch (e) { } } + this.dir = function (msg) { + try{ + console.dir(msg); + } catch (e) { + + } + } } return new Logger(); Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js =================================================================== diff -u -r24939 -r24952 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24939) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/reviewView/reviewView.js (.../reviewView.js) (revision 24952) @@ -947,7 +947,7 @@ // $.support.cors = true; var unReviewTousseGridColums = []; var checkboxSelector = new Slick.CheckboxSelectColumn({ - // cssClass: "slick-cell-checkboxsel" + cssClass: "slick-cell-checkboxsel" }); unReviewTousseGridColums.push(checkboxSelector.getColumnDefinition()); unReviewTousseGridColums.push({ @@ -1073,7 +1073,7 @@ }) // 创建unReviewTousseGrid unReviewTousseGrid = renderGrid("unReviewTousseGridId",unReviewTousseGridColums, "", checkboxSelector); - attachAutoResizeDataGrid(unReviewTousseGrid, 'unReviewTousseGridId', 'unReviewToussegridContainer',150);//调整列宽高度 + attachAutoResizeDataGrid(unReviewTousseGrid, 'unReviewTousseGridId', 'unReviewToussegridContainer',115);//调整列宽高度 //加载数据并分页 renderGridDateAndPage(unReviewTousseGrid, 'unReviewGridPager', WWWROOT + "/disinfectSystem/packingReviewController/findUnReviewedTousseInstanceList.mhtml", { @@ -1187,7 +1187,7 @@ inlineFilters: true }); forReviewGrid = new Slick.Grid("#forReviewGridId", forReviewGridDataView, forReviewGridColumns, forReviewGridOptions); - attachAutoResizeDataGrid(forReviewGrid, 'forReviewGridId', 'forReviewGridContainer',128);//调整列宽高度 + attachAutoResizeDataGrid(forReviewGrid, 'forReviewGridId', 'forReviewGridContainer',90);//调整列宽高度 //当行数改变时触发 forReviewGridDataView.onRowCountChanged.subscribe(function (e, args) { forReviewGrid.updateRowCount();