Skip to content

孙克 / Gree

转到一个项目
切换导航栏
切换导航栏固定状态
Commit d14e48aa 由 sunke
选项

fixed: 任务展示显示不全唯一码的问题

1 个父辈 48a77011
内嵌 并排
正在显示 1 个修改的文件 包含 32 行增加 和 34 行删除
myproject/src/main/webapp/WEB-INF/pages/storage/allBoxView.jsp
...@@ -155,12 +155,12 @@ ...@@ -155,12 +155,12 @@
<div class="bg-primary kabanTitle col-md-12"> <div class="bg-primary kabanTitle col-md-12">
<%--<span><fmt:message key="allBoxView.kanban"/></span>--%> <%--<span><fmt:message key="allBoxView.kanban"/></span>--%>
<%--<span style="margin-left: 40px;" id="storageTotalPos">总容量:1000</span>--%> <%--<span style="margin-left: 40px;" id="storageTotalPos">总容量:1000</span>--%>
<div class="col-md-2"> <div class="col-md-2">
<button class="btn yellow outBtn" id="viewTotal"><i class="fa fa-sign-out"></i><fmt:message key="查看统计"/></button> <button class="btn yellow outBtn" id="viewTotal"><i class="fa fa-sign-out"></i><fmt:message key="查看统计"/></button>
</div> </div>
<div class="col-md-10"> <div class="col-md-10">
<div id="lineMsg"></div> <div id="lineMsg"></div>
</div> </div>
</div> </div>
<c:forEach items="${allStorage}" var="storage"> <c:forEach items="${allStorage}" var="storage">
<c:set var="cids" value="${cids},${storage.cid}"/> <c:set var="cids" value="${cids},${storage.cid}"/>
...@@ -190,13 +190,13 @@ ...@@ -190,13 +190,13 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="task-content"> <div class="task-content">
<%--<div class='itembox 7x8'>--%> <%--<div class='itembox 7x8'>--%>
<%--<div class='item-start barheight'>7 x 8 mm</div>--%> <%--<div class='item-start barheight'>7 x 8 mm</div>--%>
<%--<div class='progress my-progress'>--%> <%--<div class='progress my-progress'>--%>
<%--<div class='progress-bar progress-bar-used barheight' style='width: 0%' title=""><span></span></div>--%> <%--<div class='progress-bar progress-bar-used barheight' style='width: 0%' title=""><span></span></div>--%>
<%--<div class='progress-bar progress-bar-idle barheight' style='width: 0%' title=""><span></span></div>--%> <%--<div class='progress-bar progress-bar-idle barheight' style='width: 0%' title=""><span></span></div>--%>
<%--</div>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%>
</div> </div>
<div class="task-footer"> <div class="task-footer">
<div class="statusMsg"> <div class="statusMsg">
...@@ -213,13 +213,13 @@ ...@@ -213,13 +213,13 @@
</div> </div>
<div class="portlet-body"> <div class="portlet-body">
<div class="task-content"> <div class="task-content">
<%--<div class='itembox 7x8'>--%> <%--<div class='itembox 7x8'>--%>
<%--<div class='item-start barheight'>7 x 8 mm</div>--%> <%--<div class='item-start barheight'>7 x 8 mm</div>--%>
<%--<div class='progress my-progress'>--%> <%--<div class='progress my-progress'>--%>
<%--<div class='progress-bar progress-bar-used barheight' style='width: 0%' title=""><span></span></div>--%> <%--<div class='progress-bar progress-bar-used barheight' style='width: 0%' title=""><span></span></div>--%>
<%--<div class='progress-bar progress-bar-idle barheight' style='width: 0%' title=""><span></span></div>--%> <%--<div class='progress-bar progress-bar-idle barheight' style='width: 0%' title=""><span></span></div>--%>
<%--</div>--%>
<%--</div>--%> <%--</div>--%>
<%--</div>--%>
</div> </div>
<div class="task-footer"> <div class="task-footer">
<div class="statusMsg"> <div class="statusMsg">
...@@ -235,7 +235,7 @@ ...@@ -235,7 +235,7 @@
</c:forEach> </c:forEach>
<%--<div class="statusMsg">--%> <%--<div class="statusMsg">--%>
<%--<span id="smdstatus">料仓状态：</span><span id="clientMsg"></span>--%> <%--<span id="smdstatus">料仓状态：</span><span id="clientMsg"></span>--%>
<%--</div>--%> <%--</div>--%>
</div> </div>
...@@ -394,10 +394,10 @@ ...@@ -394,10 +394,10 @@
for(var sizeStr in sizeList){ for(var sizeStr in sizeList){
var sizeItem = sizeList[sizeStr]; var sizeItem = sizeList[sizeStr];
var tr = "<tr>" + var tr = "<tr>" +
"<td>"+sizeItem.w + " x " + sizeItem.h +"</td>" + "<td>"+sizeItem.w + " x " + sizeItem.h +"</td>" +
"<td>"+sizeItem.usedCount+"</td>" + "<td>"+sizeItem.usedCount+"</td>" +
"<td>"+sizeItem.totalCount+"</td>" + "<td>"+sizeItem.totalCount+"</td>" +
"</tr>"; "</tr>";
trHtml = trHtml + tr; trHtml = trHtml + tr;
} }
var html = "<table class='table table-striped table-bordered table-hover'><thead><th>尺寸</th><th>已使用</th><th>总数量</th></thead>"+trHtml+"</table>" var html = "<table class='table table-striped table-bordered table-hover'><thead><th>尺寸</th><th>已使用</th><th>总数量</th></thead>"+trHtml+"</table>"
...@@ -455,9 +455,9 @@ ...@@ -455,9 +455,9 @@
$.post("${ctx}/service/store/cancelTask", {tid: taskToClose.$options["taskId"]}, function (data) { $.post("${ctx}/service/store/cancelTask", {tid: taskToClose.$options["taskId"]}, function (data) {
if(data){ if(data){
Lobibox.alert("success", //AVAILABLE TYPES: "error", "info", "success", "warning" Lobibox.alert("success", //AVAILABLE TYPES: "error", "info", "success", "warning"
{ {
msg: "${cancelFinished_msg}" msg: "${cancelFinished_msg}"
}); });
} }
}); });
} }
...@@ -488,7 +488,7 @@ ...@@ -488,7 +488,7 @@
var options = {}; var options = {};
//入库 //入库
var showStr = partNumber + "["+barcode+"]${in_label}"+posStr; var showStr = barcode + " ["+partNumber+"]</br>${in_label}"+posStr;
var status = data[item].status.toLowerCase(); var status = data[item].status.toLowerCase();
...@@ -500,7 +500,7 @@ ...@@ -500,7 +500,7 @@
options['icon']='fa fa-database'; options['icon']='fa fa-database';
if(data[item].type == 2){//出库 if(data[item].type == 2){//出库
options['icon']='fa fa-sign-out'; options['icon']='fa fa-sign-out';
showStr = partNumber + "["+barcode+"]${out_label}"+posStr; showStr = barcode + " ["+partNumber+"]</br>${out_label}"+posStr;
}else{ }else{
//options['onClick']= modifyClick; //options['onClick']= modifyClick;
} }
...@@ -558,6 +558,7 @@ ...@@ -558,6 +558,7 @@
} }
options['msg']= showStr + statusMsg + data[item].locInfo + sourceStr; options['msg']= showStr + statusMsg + data[item].locInfo + sourceStr;
options['showClass'] = showClass; options['showClass'] = showClass;
options['messageHeight'] = 80;
var task = cidTasks[taskId]; var task = cidTasks[taskId];
if(!task){ if(!task){
...@@ -617,12 +618,12 @@ ...@@ -617,12 +618,12 @@
usedPercent =usedPercent * 100; usedPercent =usedPercent * 100;
idlePercent = idlePercent * 100; idlePercent = idlePercent * 100;
var html = "<div class='item-start barheight'>" +w +" x "+ h + " mm</div>" + var html = "<div class='item-start barheight'>" +w +" x "+ h + " mm</div>" +
"<div class='progress my-progress'>" + "<div class='progress my-progress'>" +
"<div class='progress-bar progress-bar-idle barheight' style='width:"+usedPercent+"%' title='${used_label}:"+usedCount+"'>" + "<div class='progress-bar progress-bar-idle barheight' style='width:"+usedPercent+"%' title='${used_label}:"+usedCount+"'>" +
"<span>"+usedCount+"</span>" + "<span>"+usedCount+"</span>" +
"</div>" + "</div>" +
"<span class='count-label'>${capacity_label}:"+totalCount+"</span>" + "<span class='count-label'>${capacity_label}:"+totalCount+"</span>" +
"</div>" "</div>"
return html; return html;
} }
...@@ -777,9 +778,6 @@ ...@@ -777,9 +778,6 @@
expireWindow = showAlarmWindow(expireWindow,"${expireAlarmTitle}",data); expireWindow = showAlarmWindow(expireWindow,"${expireAlarmTitle}",data);
}); });
}; };
function alarmWindowClick() {
alert("aaa");
}
function showAlarmWindow(alarmWindow, title, msg){ function showAlarmWindow(alarmWindow, title, msg){
var windowOptions = { var windowOptions = {
delay: false, delay: false,
...@@ -802,7 +800,7 @@ ...@@ -802,7 +800,7 @@
var titleStr = "<a href=\"${ctx}/component/storagePosFind.html?dir=asc&expire=1&sort=barcode.expTime\" style=\"color: white\">"+msg+"</a>"; var titleStr = "<a href=\"${ctx}/component/storagePosFind.html?dir=asc&expire=1&sort=barcode.expTime\" style=\"color: white\">"+msg+"</a>";
msg=titleStr; msg=titleStr;
if(!alarmWindow){ if(!alarmWindow){
/* windowOptions.title=titleStr;*/ /* windowOptions.title=titleStr;*/
windowOptions.msg = msg; windowOptions.msg = msg;
alarmWindow =Lobibox.notify('warning', windowOptions); alarmWindow =Lobibox.notify('warning', windowOptions);
}else{ }else{
......
支持 Markdown 格式
你添加了 0 人 到此讨论。请谨慎行事。
Finish editing this message first!