Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js =================================================================== diff -u -r24957 -r24987 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24957) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/index/index.js (.../index.js) (revision 24987) @@ -61,7 +61,7 @@ + "" + "" + ""; - var tabContentHtml = "
" + var tabContentHtml = "
" + "" + "
"; Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css =================================================================== diff -u -r24957 -r24987 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css (.../assemblyManagement.css) (revision 24957) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css (.../assemblyManagement.css) (revision 24987) @@ -4,7 +4,7 @@ .slick-column-name input,.slick-cell input{ width:14px; } -*{font-size:12px;} +*{font-size:15px;} table tr{ height:30px !important; } @@ -21,15 +21,23 @@ text-align:center; } .assembly-manage{ - margin-bottom: 0; + margin-bottom: 0 !important; } +.assembly-manage li{ + height:30px; +} +.assembly-manage li.active{ + height:30px; +} .assembly-manage li a{ color:#669933; - font-size: 15px; + font-size: 14px; + height:30px; + line-height: 13px; + font-size:15px; } -.assembly-manage li.active a{ - font-weight: bold; -} +/* .assembly-manage li.active a{ +} */ .assembly-manage li a:hover{ background: none; border:1px solid #C6E3CA; @@ -46,7 +54,7 @@ border-bottom:1px solid #aedeb4; } .assembly-task-lefttop label,.assembly-task-lefttop input{ - font-size: 12px; + font-size: 15px; font-weight: normal; font-family: "宋体"; color: #333; @@ -55,6 +63,8 @@ .basketry{ padding-top: 2px; padding-bottom: 2px; + height:28px; + width:330px; } .basketry input{ height:22px; @@ -72,14 +82,15 @@ margin-left: 14px; margin-top:3px; margin-bottom:3px !important; + width:240px; } .assembly-task-leftprint label{ - font-size:12px; + font-size:15px; } .assembly-task-leftprint select{ width:auto; height:26px; - font-size:12px; + font-size:15px; } .assembly-task-inputh input{ width:14px; @@ -126,7 +137,7 @@ padding-top:0; } .breakage-msg-modelbody h5{ - font-size:16px; + font-size:15px; color:#669933; font-weight: 100; } @@ -245,7 +256,7 @@ } .task-middletop-showList a{ color:#000; - font-size: 12px; + font-size: 15px; background:none; border:none; font-family: "宋体"; @@ -290,7 +301,8 @@ height:26px; padding-top:0; padding-bottom:0; - font-size: 12px; + font-size: 15px; + padding-right:0px; } .assembly-task-right{ padding-left: 0; @@ -320,7 +332,7 @@ } .assembly-materials-all a{ color:#000; - font-size: 12px; + font-size: 15px; background:none; border:none; font-family: "宋体"; @@ -450,7 +462,7 @@ left: 4px; } .input-group-btn-vertical i.fa{ - font-size: 12px; + font-size: 15px; } .metariles-list-tips{ background:#fff; @@ -462,7 +474,7 @@ height:30px; padding: 6px; border:none; - font-size: 14px; + font-size: 15px; border-top-left-radius: 0px; border-top-right-radius: 0px; } @@ -533,17 +545,17 @@ .toggle.collapse { background: url(../../img/collapse.gif) no-repeat center center; } -.tousse-name-color{ - color:red; +.tousse-name-color .packer-name{ + background:yellow; } -.tousse-name-defaultColor{ - color:#000; +.tousse-name-defaultColor .packer-name{ + background:#fff; } .today-record-btnall{ margin:10px 4px; } .btn-size{ - font-size:12px; + font-size:15px; height:20px; line-height:20px; } @@ -562,7 +574,7 @@ line-height:32px; color:#31b546; margin-top:10px; - font-size:14px; + font-size:15px; padding-left:10px; } .title-font-sub i{ @@ -602,6 +614,15 @@ top: -3px; right: -5px; } +.code-register{ + padding-top: 2px; + padding-bottom: 2px; + height:28px; + width:300px; +} +.code-register input{ + height:22px; +} /*分页start */ .bottomContain { position: absolute; Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp =================================================================== diff -u -r24943 -r24987 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24943) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/index.jsp (.../index.jsp) (revision 24987) @@ -254,22 +254,9 @@ - - - - - - - - - - - - -<%-- bootstrap-datetimepicker --%> - - +<%-- + --%> <%-- --%> Index: ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js =================================================================== diff -u -r24957 -r24987 --- ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js (.../assemblyManagementSlick3.js) (revision 24957) +++ ssts-web/src/main/webapp/dx-disinfectsystem/js/assemblyManagement/assemblyManagementSlick3.js (.../assemblyManagementSlick3.js) (revision 24987) @@ -294,7 +294,7 @@ } $("#checkboxAllToptable").prop("checked", false); - processAfterPacking(false,result,tousseName,inputAmount); + //processAfterPacking(false,result,tousseName,inputAmount); }else{ var addNumHtml= "
" + "
提示
" @@ -356,7 +356,7 @@ dataViewTopTable.setFilter(myFilterTopTable); dataViewTopTable.endUpdate(); leftFootLoad();//刷新左下表格 - printLabelsAfterPacking();//打印标签 + //printLabelsAfterPacking();//打印标签 }); function hidePackingTousseBtnClick_mask(){ @@ -580,10 +580,10 @@ leftTopload(); $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-60)+"px"); dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); - gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", [], visibleColumnsTopTable, optionsTopTable); + gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable); $(".slick-viewport").css({"overflow":"auto"}); //subText("assemblyTaskLeftTopTable"); - gridTopTable.init(); + //gridTopTable.init(); /*左上在篮筐中输入条码*/ $("#searchBarcode").keydown(function(e){ @@ -657,7 +657,7 @@ gridLose = new Slick.Grid("#addLoseTable",[], visibleColumns_Lose, optionsLose);*/ //材料清单 materialsTableLoad(); - $("#materialsMenuTable").css("height",($(window).height()-187)+"px"); + $("#materialsMenuTable").css("height",($(window).height()-186)+"px"); dataViewMaterials = new Slick.Data.DataView({ inlineFilters: true }); gridMaterials = new Slick.Grid("#materialsMenuTable",[], visibleColumns_Materials, optionsMaterials); gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 @@ -669,14 +669,14 @@ })/*$(function) end*/ function topOrFootTableWrappHeight(){ var documentHeight = $(window).height(); - var tabH = documentHeight-133; + var tabH = documentHeight-127; var tableHTop = tabH*0.45; var tableHFoot = tabH*0.55; $("#tableTopBox").css({"height":tableHTop+"px"}); $("#tableFootBox").css({"height":tableHFoot+"px"}); //中间下面的高度 - var taskmiddleH = documentHeight-429; + var taskmiddleH = documentHeight-428; $(".assembly-task-middlefoot").css({"height":taskmiddleH+"px","overflow-y":"auto"}); } /*左上表格start*/ @@ -833,22 +833,28 @@ } } function leftToploadTable(){ - dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); - gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable); - gridTopTable.init(); - + /*if (dataViewTopTable == undefined || dataViewTopTable == null) { + dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); + }*/ + + /*if(gridTopTable == undefined || grid == null){ + gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable); + }*/ + //dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true }); + // gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", dataViewTopTable, visibleColumnsTopTable, optionsTopTable); + //gridTopTable.init(); //获取选中行数据 /*gridTopTable.onSelectedRowsChanged.subscribe(function(){ })*/ gridTopTable.onClick.subscribe(function (e, args) { + //alert(); gridTopTable.setSelectionModel(new Slick.RowSelectionModel());//选中行 // 上下table互斥 $("#assemblyTaskleftFootTable .grid-canvas .ui-widget-content") .find("input[type='checkbox']").each(function(inputIndex, inputEle){ $(inputEle).prop("checked", false); }); multiSelectFootData = []; - if (dataViewTopTable.getItem(args.row).parent == null) { var inputEle = $("#assemblyTaskleftTopTable .grid-canvas .ui-widget-content").eq(args.row).find("input[type='checkbox']"); if (args.cell == 0) { @@ -955,6 +961,10 @@ gridTopTable.invalidateRows(args.rows); gridTopTable.render(); }); + gridTopTable.onCellChange.subscribe(function (e, args) { + dataViewTopTable.updateItem(args.item.id, args.item); + }); + //修改样式 gridTopTable.onBeforeAppendCell.subscribe(function (e, args) { if (gridTopTable.getColumns()[args.cell].id !== 'tousseName') return null; @@ -1051,12 +1061,12 @@ } - datas = tempLeftTopTableInputArray; assemblyTaskLeftTopTableCon = datas; var tempId = 0; loadDataTop = []; loadDataTop = requestData(datas);//加载数据 + gridTopTable.invalidateAllRows(); dataViewTopTable.beginUpdate(); dataViewTopTable.setItems(loadDataTop); dataViewTopTable.setFilter(myFilterTopTable); @@ -1292,8 +1302,6 @@ minWidth: 200, formatter:function(r, c, v, cd, dc){ if(dc.parent != null){ - - var tipsColor = ""; var operateHtml = ""; if(dc.status == '待装配'){ var supplent = true; @@ -1304,12 +1312,10 @@ } if(!supplent){ operateHtml += ""; - tipsColor = "style='color:red;'" } if(dc.damages.length > 0){ operateHtml += ""; - tipsColor = "style='color:red;'"; } } return operateHtml; @@ -1375,6 +1381,7 @@ var datas =data.data; loadData = []; loadData = requestData(datas);//加载数据 + grid.invalidateAllRows(); dataView.beginUpdate(); dataView.setItems(loadData); dataView.setFilter(myFilter); @@ -1385,11 +1392,28 @@ } function leftFootTable(){ - dataView = new Slick.Data.DataView({ inlineFilters: true }); - grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); + if (dataView == undefined || dataView == null) { + dataView = new Slick.Data.DataView({ inlineFilters: true }); + } + + if(grid == undefined || grid == null){ + grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); + }/*else{ + grid.invalidateAllRows(); + }*/ + /* $(".slick-viewport").css({ "overflow-y": "auto" });*/ + //必须加这段代码，不然表格不能滚动 + dataView.onRowCountChanged.subscribe(function (e, args) { + grid.updateRowCount(); + grid.render(); + }); + dataView.onRowsChanged.subscribe(function (e, args) { + grid.invalidateRows(args.rows); + grid.render(); + }); grid.onClick.subscribe(function (e, args) { grid.setSelectionModel(new Slick.RowSelectionModel());//选中行 @@ -1503,15 +1527,7 @@ } }); - //必须加这段代码，不然表格不能滚动 - dataView.onRowCountChanged.subscribe(function (e, args) { - grid.updateRowCount(); - grid.render(); - }); - dataView.onRowsChanged.subscribe(function (e, args) { - grid.invalidateRows(args.rows); - grid.render(); - }); + //修改样式 grid.onBeforeAppendCell.subscribe(function (e, args) { if (grid.getColumns()[args.cell].id !== 'tousseName') return null; @@ -1557,7 +1573,7 @@ return "tousse-name-defaultColor"; }); - grid.init(); + //grid.init(); } //判断子菜单start function tousseNameFormatter(row, cell, value, columnDef, dataContext){ @@ -1566,7 +1582,8 @@ value = value.replace(/&/g,"&").replace(//g,">"); //制造一个占位 - var spacer = ""; + // var spacer = ""; + var spacer = ""; //根据ID获取此行内容的索引值 @@ -1593,13 +1610,12 @@ if (loadData[idx + 1] && loadData[idx + 1].indent > loadData[idx].indent) { //如果data中对应的内容不为空，并且此行缩进大于上一行的缩进 if (dataContext._collapsed) { - - return spacer + "  "+value+"" ;//收缩 + return spacer + "  "+value+"" ;//收缩 } else { - return spacer + "   "+value+"";//展开 + return spacer + "   "+value+"";//展开 } } else { - return spacer + "  "+value+""; + return spacer + "  "+value+""; } } function myFilter(item) { @@ -1682,9 +1698,14 @@ /*删除装配任务start*/ //删除按钮弹框,删除左下表格 $("#deleteMsg").click(function(){ + var selections =multiSelectFootData; + if(selections.length <= 0){ + alert("请选择一行数据"); + return; + } $('.deleteMsgModel').modal('show'); var ids = "";//装配任务id - var selections =multiSelectFootData; + //遍历父级tr for(var j=0;j"+result.rows[i].value+""; - } - }else{ - //alert(result.message); - } - } - }); + } } //補充丟失删除行 @@ -1912,15 +1924,42 @@ newData.push(LoseTableDelData[i]); } } - gridLose = new Slick.Grid("#addLoseTable", requestLoseData(newData), visibleColumns_Lose, optionsLose); - //addLOseInstrumentTypeSelect("addLOse_instrument"); + //gridLose = new Slick.Grid("#addLoseTable", requestLoseData(newData), visibleColumns_Lose, optionsLose); + + gridLose.setData(requestLoseData(newData)); + gridLose.render(); + addLOseInstrumentTypeSelect("addLOse_instrument"); } + + + +//補充丟失分类类型 +var addLoseClassifyTypeOptions = ""; +$.ajax({ + url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/getDamageErrorDepartType.mhtml", + type: "get", + async:true, + cache:false,//解决ie + success:function(result){ + if(result.success == true){ + for(var i=0;i"+result.rows[i].value+""; + } + }else{ + //alert(result.message); + } + } +}); function loseOrDamageModel(type,loseOrDameage_packingTaskId){ + + loadLose_Data = []; + loseOrDameage_type = type; loseColums(); $('.addLoseModel').modal('show'); - gridLose = new Slick.Grid("#addLoseTable", [], visibleColumns_Lose, optionsLose); - loseOrDameage_type = type; +// alert("刚进"); + + //alert(loseOrDameage_packingTaskId); // addPaddingBottom("addLoseModel"); //清空 $("#addLoseBarcodeHidden").next("span").text(""); @@ -1958,24 +1997,34 @@ } } }); + //alert(loseOrDameage_packingTaskId); //丢失补充列表 $.ajax({ url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/loadAdditionalMaterialStore.mhtml", - type: "get", - async:true, + type: "post", + async:false, cache:false,//解决ie data:{ "type":type, "packingTaskId":loseOrDameage_packingTaskId//这里就是传空的 }, success:function(result){ + if(result.success == true){ + //alert("result",result); loadLose_Data = []; var loseData = result.rows; - loadLose_Data = requestLoseData(loseData); - gridLose = new Slick.Grid("#addLoseTable", loadLose_Data, visibleColumns_Lose, optionsLose); + + + loadLose_Data = requestLoseData(loseData); + if(gridLose == undefined || gridLose == null){ + gridLose = new Slick.Grid("#addLoseTable",loadLose_Data,visibleColumns_Lose, optionsLose); + }else{ + gridLose.setData(loadLose_Data); + gridLose.render(); + } addLOseInstrumentTypeSelect("addLOse_instrument");//補充丟失器械類型 - //$("#loseHidden").val(JSON.stringify(loadLose_Data)); + $("#loseHidden").val(JSON.stringify(loadLose_Data)); }else{ alert(result.message); } @@ -2071,12 +2120,7 @@ packingTaskId :packingTaskId, }); } - searchBarcodeHidden = $("#searchBarcodeHidden").val(); - var basketBarcodes = [];//扫描篮筐 - basketBarcodes.push(searchBarcodeHidden); - var addLoseBarcodeHidden = $("#addLoseBarcodeHidden").val();//弹框上的篮筐条码隐藏域 - $.ajax({ url:WWWROOT+"/disinfectSystem/recyclingrecord/materialErrorDamageController/materialSupplement.mhtml", type: "post", @@ -2105,8 +2149,8 @@ loseAndDamageNum();//请求数字 leftFootLoad();//刷新左下表格 //当没有扫条码，上面表格不刷新 - if(!Tools.ArrayUtils.isNotEmpty(basketBarcodes) || searchBarcodeHidden !=""){ - reloadTopTableMoreborde(basketBarcodes.join(";"));//左上表格的刷新 + if(basketBarcodesAll.length > 0){ + reloadTopTableMoreborde(basketBarcodesAll.join(";"));//左上表格的刷新 } }else{ @@ -2152,7 +2196,7 @@ align : 'center', sortable:true, //正序,逆序 cssClass: "cell-title", - minWidth: 262, + minWidth: 230, resizable: false, formatter:function(row, cell, value, columnDef, dataContext){ if(dataContext.washQualityCheckPoint == undefined ){ @@ -2208,6 +2252,8 @@ success: function(result) { var materialsParData = result.rows; if(result.success == true){ + //alert("11111111111111111111111111"); + //alert(materialsParData); loadMaterials_ParData = []; for (var i = 0; i < materialsParData.length; i++) { var d = (loadMaterials_ParData[i] = {}); @@ -2219,8 +2265,13 @@ d["washQualityCheckMethod"] =materialsParData[i].washQualityCheckMethod; d["functionCheck"] =materialsParData[i].functionCheck; } - gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ParData, visibleColumns_Materials, optionsMaterials); - + //alert("3333"); + //dataView = new Slick.Data.DataView({ inlineFilters: true }); + //grid = new Slick.Grid("#assemblyTaskleftFootTable", dataView, visibleColumns, options); + // gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ParData, visibleColumns_Materials, optionsMaterials); + gridMaterials.setData(loadMaterials_ParData); + gridMaterials.render(); + // alert("44444444"); //器械总数 $("#materialTotalAmount").text(result.materialTotalAmount); //一次性物品总数 @@ -2231,8 +2282,8 @@ } } }) - gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 - gridMaterials.registerPlugin(materials_checkboxSelector); + //gridMaterials.setSelectionModel(new Slick.RowSelectionModel({selectActiveRow: false}));//单选 + //gridMaterials.registerPlugin(materials_checkboxSelector); /* dataViewTopTable.onRowCountChanged.subscribe(function (e, args) { gridMaterials.updateRowCount(); gridMaterials.render(); @@ -2261,7 +2312,9 @@ d["washQualityCheckMethod"] =materialsChildData[i].washQualityCheckMethod; d["functionCheck"] =materialsChildData[i].functionCheck; } - gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ChildData, visibleColumns_Materials, optionsMaterials); + //gridMaterials = new Slick.Grid("#materialsMenuTable", loadMaterials_ChildData, visibleColumns_Materials, optionsMaterials); + gridMaterials.setData(loadMaterials_ChildData); + gridMaterials.render(); //器械总数 $("#materialTotalAmount").text(result.materialTotalAmount); //一次性物品总数 Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css =================================================================== diff -u -r24957 -r24987 --- ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css (.../customCommon.css) (revision 24957) +++ ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css (.../customCommon.css) (revision 24987) @@ -8,11 +8,11 @@ .over-hidden{overflow:hidden;} .modal-header{padding:0px;} html{ overflow: hidden;} -body{background:#fff;} +body{background:#F5F5F5;} /*模态框头部样式*/ .title-font{ background: #31b546; - font-size: 14px; + font-size: 15px; padding: 0px 15px; color: #fff; border-top-left-radius: 8px; @@ -37,5 +37,5 @@ margin-bottom:0; padding-left: 10px; font-family: "宋体"; - font-size: 12px; + font-size: 15px; } \ No newline at end of file Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp =================================================================== diff -u -r24957 -r24987 --- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24957) +++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24987) @@ -34,7 +34,7 @@ - + @@ -89,16 +89,16 @@