Commit d14e48aa sunke

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

1 个父辈 48a77011
...@@ -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){
...@@ -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,
......
支持 Markdown 格式
你添加了 0 到此讨论。请谨慎行事。
Finish editing this message first!