"
+ "
提示
"
@@ -309,10 +310,12 @@
}
+ var leftTopTableInputHiddenArray = JSON.parse($("#leftTopTableInputHidden").val());
+ console.log("leftTopTableInputHiddenArray",leftTopTableInputHiddenArray);
var assembleArray = [];
- if (assemblyTaskLeftTopTableCon != undefined && assemblyTaskLeftTopTableCon.length > 0) {
- for (var i = 0; i < assemblyTaskLeftTopTableCon.length; i++) {
- var assembleModel = assemblyTaskLeftTopTableCon[i];
+ if (leftTopTableInputHiddenArray != undefined && leftTopTableInputHiddenArray.length > 0) {
+ for (var i = 0; i < leftTopTableInputHiddenArray.length; i++) {
+ var assembleModel = leftTopTableInputHiddenArray[i];
if (assembleModel.children.length <= 0) {
continue;
}
@@ -344,10 +347,17 @@
}
}
- assemblyTaskLeftTopTableCon = assembleArray;
- reloadPackingLeftTopTasks();//刷新左上表格
+ $("#leftTopTableInputHidden").val(JSON.stringify(assembleArray));
+ //刷新左上表格
+ loadDataTop = [];
+ loadDataTop = requestData(assembleArray);//加载数据
+ gridTopTable.invalidateAllRows();
+ dataViewTopTable.beginUpdate();
+ dataViewTopTable.setItems(loadDataTop);
+ dataViewTopTable.setFilter(myFilterTopTable);
+ dataViewTopTable.endUpdate();
leftFootLoad();//刷新左下表格
- printLabelsAfterPacking();//打印标签
+ //printLabelsAfterPacking();//打印标签
});
function hidePackingTousseBtnClick_mask(){
@@ -571,7 +581,7 @@
/*左上表格 start*/
leftTopload();
- $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-56)+"px");
+ $("#assemblyTaskleftTopTable").css("height",($("#tableTopBox").height()-60)+"px");
dataViewTopTable = new Slick.Data.DataView({ inlineFilters: true });
gridTopTable = new Slick.Grid("#assemblyTaskleftTopTable", [], visibleColumnsTopTable, optionsTopTable);
$(".slick-viewport").css({"overflow":"auto"});
@@ -586,10 +596,33 @@
alert("请扫描篮筐条码");
return;
}
- $("#searchBarcodeHidden").val(searchBarcodeVal);
+
+ $("#searchBarcodeHidden").val(searchBarcodeVal);
searchBarcodeHidden = $("#searchBarcodeHidden").val();
+
+
+ var codeList = $("#searchBarcodeHidden").attr("codelist");
+ var codeListArray = JSON.parse(codeList);
+ if (codeList != undefined && codeList != "" && codeList != "[]") {
+
+ if (codeListArray.indexOf(searchBarcodeHidden) > -1) {
+ alert("不能扫描重复条码!");
+ return;
+ };
+
+ codeListArray.push(searchBarcodeVal);
+ $("#searchBarcodeHidden").attr("codelist", JSON.stringify(codeListArray));
+ } else {
+ codeListArray.push(searchBarcodeVal);
+ $("#searchBarcodeHidden").attr("codelist", JSON.stringify(codeListArray));
+ }
+
+
$("#searchBarcode").val("");
reloadTopTableMoreborde(searchBarcodeHidden);
+
+
+ console.log($("#searchBarcodeHidden").val());
// subText("assemblyTaskleftTopTable");
//topTableRowClickEvent();
}
@@ -745,11 +778,11 @@
}
}
if(!supplent){
- operateHtml += "
";
+ operateHtml += "
";
}
if(dc.damages.length > 0){
- operateHtml += "
";
+ operateHtml += "
";
}
}
return operateHtml;
@@ -983,6 +1016,36 @@
if(result.success == true){
assemblyTaskLeftTopTableCon = result.data;
var datas =result.data;
+ var leftTopTableInputHiddenArray = JSON.parse($("#leftTopTableInputHidden").val());
+
+ var tempIndexArray = [];
+ for (var i = 0; i < datas.length; i++) {
+ if (leftTopTableInputHiddenArray.length > 0) {
+ for (var j = 0; j < leftTopTableInputHiddenArray.length; j++) {
+ if (tempIndexArray.indexOf(j) != -1) {//未找到，返回-1
+ continue;
+ };
+ if (datas[i].tousseName == leftTopTableInputHiddenArray[j].tousseName) {
+ datas[i].amount = datas[i].amount + leftTopTableInputHiddenArray[j].amount;
+ datas[i].children = (datas[i].children).concat((leftTopTableInputHiddenArray[j]).children);
+ tempIndexArray.push(j);
+ break;
+ }
+ }
+ } else {
+ break;
+ }
+ }
+
+ //上一次隐藏域的值，是否有重复的，重复的就不用push了，不重复的就加进去
+ for (var k = 0; k < leftTopTableInputHiddenArray.length; k++) {
+ if (tempIndexArray.indexOf(k) != -1) {
+ continue;
+ }
+ datas.push(leftTopTableInputHiddenArray[k]);
+ }
+ $("#leftTopTableInputHidden").val(JSON.stringify(datas));
+
var tempId = 0;
loadDataTop = [];
loadDataTop = requestData(datas);//加载数据
@@ -1000,12 +1063,12 @@
}
//装配以后刷新
-function reloadPackingLeftTopTasks() {
- var datas =assemblyTaskLeftTopTableCon;
+function reloadPackingLeftTopTasks(datas) {
+
var tempId = 0;
- loadDataTop = [];
+ var tempLoadDataTop = [];
for(var i=0;i
0){
- operateHtml += "";
+ operateHtml += "";
tipsColor = "style='color:red;'";
}
}
@@ -1622,21 +1682,22 @@
ids += taskId;
}
}
- footTabelids = ids;
-})
+ footTabelids = (ids + ";");
+})
/*删除左下表格每一行*/
function confirmDeleteFootTabel(that){
- $('.deleteMsgModel').modal('show');
var taskId = $(that).parent().prevAll().children(".sava_FootTaskId").attr("taskId");
footTabelids = taskId;
+ $('.deleteMsgModel').modal('show');
}
/*删除左上表格每一行*/
function confirmDeleteTopTabel(that){
- $('.deleteMsgModel').modal('show');
var topTaskId = $(that).parent().prevAll().children(".sava_TopTaskId").attr("ToptaskId");
footTabelids = topTaskId;
+ console.log("topTaskIdxxxp", topTaskId);
+ $('.deleteMsgModel').modal('show');
}
//点击删除
@@ -1661,7 +1722,54 @@
if(searchBarcodeHidden == undefined || searchBarcodeHidden ==""){
return;
}
- reloadTopTableMoreborde(searchBarcodeHidden);//刷新左上表格
+ var leftTopTableInputHidden = JSON.parse($("#leftTopTableInputHidden").val());
+
+ var tempFootTableIds = footTabelids.split(";");
+
+ //刷新左上表格，删除子节点
+ if (footTabelids.endsWith(";")) {
+ for(var i=0;i 0) {
+ tempLeftTopTableInputHidden.push(leftTopTableInputHidden[k]);
+ }
+ }
+ leftTopTableInputHidden = tempLeftTopTableInputHidden;
+
+ $("#leftTopTableInputHidden").val(JSON.stringify(leftTopTableInputHidden));
+
+ loadDataTop = [];
+ loadDataTop = requestData(leftTopTableInputHidden);//加载数据
+ gridTopTable.invalidateAllRows();
+ dataViewTopTable.beginUpdate();
+ dataViewTopTable.setItems(loadDataTop);
+ dataViewTopTable.setFilter(myFilterTopTable);
+ dataViewTopTable.endUpdate();
+ //reloadTopTableMoreborde("");//刷新左上表格
+
}else{
//删除失败
alert(result.message);
@@ -2344,7 +2452,80 @@
$("#packPrint").hide();
}
}
+//添加报损器械按钮弹框
+$("#addBreakageMsg").click(function(){
+ $('#addBreakageMsgModel').modal('show');
+ $("#addBreakageMsgModel .modal-title").text("器材报损单信息");
+})
+function addBreakageMsgTable(){
+ optionsMaterials = {
+ enableCellNavigation: true,
+ enableColumnReorder: false,
+ rowHeight: 28,
+ editable: true,
+ enableAddRow: false,
+ forceFitColumns: false,
+ checked:true,
+ enableForHeaderCells:true,
+ asyncEditorLoading: false
+ };
+ materials_columns = [];
+ materials_columns.push(materials_checkboxSelector.getColumnDefinition());
+ materials_columns.push(
+ {
+ field: 'id',
+ name: 'ID',
+ align:'center',
+ sortable: true,
+ },
+ {
+ id: "count",
+ name : '数量',
+ field : 'count',
+ align : 'center',
+ sortable:true, //正序,逆序
+ cssClass: "cell-title",
+ resizable: false,
+ },
+ {
+ id: "name",
+ name : '材料名称',
+ field : 'name',
+ align : 'center',
+ sortable:true, //正序,逆序
+ cssClass: "cell-title",
+ },
+ {
+ id: "count",
+ name : '数量',
+ field : 'count',
+ align : 'center',
+ sortable:true, //正序,逆序
+ cssClass: "cell-title",
+ resizable: false,
+ },
+ {
+ id: "detachable",
+ name : '是否可拆',
+ field : 'detachable',
+ align : 'center',
+ sortable:true, //正序,逆序
+ cssClass: "cell-title",
+ resizable: false,
+ minWidth:100
+ }
+ )
+ //将id列隐藏
+ visibleColumns_Materials = [];//定义一个数组存放显示的列
+ for (var i = 0; i < materials_columns.length; i++) {
+ if (i!=1){
+ visibleColumns_Materials.push(materials_columns[i]);//将columns的列push进去
+ }
+ }
+
+}
+
//日期插件
function datePick(dateId,format,direction){
$("#"+dateId).datetimepicker({//选择年月日
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css
===================================================================
diff -u -r24754 -r24915
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css (.../customCommon.css) (revision 24754)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/common/customCommon.css (.../customCommon.css) (revision 24915)
@@ -8,17 +8,18 @@
body{background:#fff;}
/*模态框头部样式*/
.title-font{
- background:#72b142;
- font-size:17px;
- font-weight: bold;
- padding:15px;
- color:#000;
- border-top-left-radius:8px;
- border-top-right-radius:8px;
+ background: #31b546;
+ font-size: 14px;
+ padding: 0px 15px;
+ color: #fff;
+ border-top-left-radius: 8px;
+ border-top-right-radius: 8px;
+ height: 37px;
+ line-height: 37px;
}
.modal-header .close {
margin-right: 13px;
- margin-top: 15px;
+ margin-top: 10px;
}
/* 标题 */
Index: ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css
===================================================================
diff -u -r24889 -r24915
--- ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css (.../assemblyManagement.css) (revision 24889)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/css/assemblyManagement/assemblyManagement.css (.../assemblyManagement.css) (revision 24915)
@@ -1,11 +1,20 @@
.datetimepicker-dropdown-bottom-right{z-index: 200000000;}
.row{margin-left:-15px;}
+.w50{width:50%;height:30px;}
.slick-column-name input,.slick-cell input{
width:14px;
}
table tr{
height:30px !important;
}
+.icon-bg{
+ background:url(../../img/inputGroupBack.png) no-repeat;
+}
+.time-icon{
+ background-position: 7px -19px;
+ top: -3px;
+ right: -5px;
+}
.cleanPadding .detail-view td{
padding:0px 0px !important;
text-align:center;
@@ -94,9 +103,9 @@
}
/* 修改select插件end */
.assembly-task-leftfoot1{
- background: #C6E3CA;
+ /* background: #C6E3CA;
border-top:1px solid #aedeb4;
- border-bottom:1px solid #aedeb4;
+ border-bottom:1px solid #aedeb */4;
padding:3px 0;
}
.assembly-task-leftfoot1 button b{
@@ -122,7 +131,7 @@
}
.breakage-msg-modeltoplist{
width:100%;
- height:40px;
+ height:30px;
}
.breakage-msg-lefttxt{
width:20%;
@@ -133,7 +142,6 @@
}
.breakage-msg-modelfoot{
padding: 6px 0;
- background: #C6E3CA;
height: 45px;
}
.breakage-msg-modelfoot label{
@@ -142,7 +150,7 @@
margin-left: 9px;
}
.reakage-remarkwrapper{
- height:80px;
+ height:69px;
}
.reakage-remarkwrapper label{
width:10%;
@@ -151,9 +159,10 @@
margin-right:10px;
}
.reakage-msg-remark{
- width: 74%;
+ width: 80%;
resize: none;
margin-top: 10px;
+ height: 58px;
}
.breakage-date-input{
position:relative;
@@ -167,15 +176,18 @@
.sterilization-dateinput input{
width:183px !important;
}
-.breakage-msg-modelfoot div select{
- width:200px;
+.breakage-msg-modelfoot .bootstrap-select:not([class*=col-]):not([class*=form-control]):not(.input-group-btn){
+ width:144px;
}
+.breakage-msg-modelfoot input{
+ height: 26px;
+}
+.breakage-msg-modelfoot .btn{
+ height: 26px;
+}
.breakage-msg-modelfootlist{
margin-left: 8px;
}
-.breakage-date{
- margin-top:7px;
-}
.reakage-table td,.reakage-table th{
text-align: center;
}
@@ -241,9 +253,9 @@
padding-right: 4px;
}
.task-middletop-showList a:hover{
- background: #669933;
+ background:url(../../img/inputGroupBack.png) repeat;
+ background-position:0px -70px;
color: rgba(255, 255, 255, 0.9);
- border:1px solid #669933;
display:inline-block;
text-decoration: none;
text-shadow:none;
@@ -263,6 +275,8 @@
width:86px;
text-align:right;
float: left;
+ font-weight:normal;
+ font-family: "宋体";
}
.assembly-task-middlefoot-form .setInputH{
display:inline-block;
@@ -311,9 +325,9 @@
padding-right: 4px;
}
.assembly-materials-all a:hover{
- background: #669933;
+ background:url(../../img/inputGroupBack.png) repeat;
+ background-position:0px -70px;
color: rgba(255, 255, 255, 0.9);
- border:1px solid #669933;
display:inline-block;
text-decoration: none;
text-shadow:none;
@@ -332,9 +346,12 @@
}
.today-assemble-record-time label{
line-height: 33px;
+ font-weight: normal;
+ font-family: "宋体";
}
.today-assemble-record-time select{
width:200px;
+ height: 30px;
}
.today-assemble-record-time input{
width:200px !important;
@@ -390,9 +407,10 @@
/* 数字增减 */
.spinner {
width: 80px;
+ margin-top: -4px;
}
.spinner input {
- height:26px;
+ height:23px;
text-align: right;
}
.input-group-btn-vertical {
@@ -411,18 +429,18 @@
margin-left: -1px;
position: relative;
border-radius: 0;
- padding: 6px 7px;
+ padding: 5px 7px;
}
.input-group-btn-vertical > .btn:first-child {
border-top-right-radius: 4px;
}
.input-group-btn-vertical > .btn:last-child {
- margin-top: -2px;
+ /* margin-top: -5px; */
border-bottom-right-radius: 4px;
}
.input-group-btn-vertical i{
position: absolute;
- top: 0;
+ top: -2px;
left: 4px;
}
.input-group-btn-vertical i.fa{
@@ -487,9 +505,7 @@
height:30px !important;
min-height:30px;
}
-.cell-title {
- font-weight: bold;
-}
+
.cell-effort-driven {
text-align: center;
}
@@ -513,3 +529,90 @@
.tousse-name-defaultColor{
color:#000;
}
+.today-record-btnall{
+ margin:10px 4px;
+}
+.btn-size{
+ font-size:12px;
+ height:20px;
+ line-height:20px;
+}
+.btn-my-size{
+ height: 25px;
+ line-height:27px;
+}
+.btn-boder{
+ border:1px solid #31b546;
+ background:#fff;
+ color:#31b546;
+}
+.title-font-sub{
+ background:#f2f2f2;
+ height:32px;
+ line-height:32px;
+ color:#31b546;
+ margin-top:10px;
+ font-size:14px;
+ padding-left:10px;
+}
+.title-font-sub i{
+ width: 3px;
+ height: 12px;
+ display: inline-block;
+ background: #31b546;
+ margin-right: 2px;
+}
+.modal-content-addwidth{
+ width:700px;
+}
+.breakage-date-input .form-control{
+ height: 27px;
+}
+.breakage-msg-modeltoplist .btn{
+ height: 27px;
+}
+/*分页start */
+.bottomContain {
+ position: absolute;
+ width: 100%;
+ height: 40px;
+ padding-right: 20px; }
+ .bottomContain .pageContain {
+ height: 35px;
+ float: right; }
+ .bottomContain .pageContainTotal {
+ height: 35px;
+ display: inline-block;
+ vertical-align: top;
+ padding: 8px 0 0 0; }
+ .bottomContain .pageContainButton {
+ height: 35px;
+ vertical-align: top;
+ display: inline-block; }
+ .bottomContain .pageContainButton .pagination {
+ margin: 0 0; }
+ .bottomContain .pageContainButton .pagination li a {
+ margin-left: 6px;
+ color: #555555;
+ border-radius: 5px;
+ background-color: #efefef;
+ border-color: #ffffff; }
+ .bottomContain .pageContainButton .pagination .active a {
+ color: #ffffff;
+ background-color: #31b546;
+ border-color: #ffffff; }
+ .bottomContain .pageContain .dataAmount {
+ display: inline-block;
+ vertical-align: top; }
+ .bottomContain .pageContain .dataAmount .dropdown-menu {
+ min-width: 0;
+ width: 60px;
+ right: 0; }
+ .bottomContain .pageContain .dataAmount .dropdown-menu .btn {
+ background: red; }
+ .bottomContain .pageContain .dataAmount .dropdown-menu li {
+ text-align: center; }
+.sp_container{
+ width:200px !important;
+}
+
Index: ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp
===================================================================
diff -u -r24889 -r24915
--- ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24889)
+++ ssts-web/src/main/webapp/dx-disinfectsystem/pages/disinfectsystem/assemblyManagement/assemblyManagement.jsp (.../assemblyManagement.jsp) (revision 24915)
@@ -26,9 +26,6 @@
装配管理
-
-<%--
- --%>
@@ -49,13 +46,19 @@
+
+
+
+
-
-
@@ -73,8 +76,8 @@
待装配任务
-
- 今天本组装配记录
+
+ 今天本组装配记录
@@ -108,33 +111,33 @@