|
@@ -782,19 +782,19 @@ class Workshopshow extends Start_Controller
|
|
|
foreach ($data as $k=>$v)
|
|
foreach ($data as $k=>$v)
|
|
|
{
|
|
{
|
|
|
$type = ($v['type']==1)?'入库':'出库';
|
|
$type = ($v['type']==1)?'入库':'出库';
|
|
|
-
|
|
|
|
|
|
|
+ $operate_name = isset($t[$v['lx']])?$t[$v['lx']]:'';
|
|
|
|
|
|
|
|
if($v['orver_flag'] == 1){
|
|
if($v['orver_flag'] == 1){
|
|
|
if($v['is_over'] == 0){
|
|
if($v['is_over'] == 0){
|
|
|
- $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>";
|
|
|
|
|
|
|
+ $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900;'> 即将超时 </l></a>";
|
|
|
// $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
// $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
|
}else{
|
|
}else{
|
|
|
- $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
|
|
|
|
+ $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
}
|
|
}
|
|
|
}elseif($v['orver_flag'] == 2){
|
|
}elseif($v['orver_flag'] == 2){
|
|
|
- $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>";
|
|
|
|
|
|
|
+ $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='padding-left:10px;font-weight:900'> 超 时 ! </l></a>";
|
|
|
}else{
|
|
}else{
|
|
|
- $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$t[$v['lx']].$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
|
|
|
|
+ $final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
}
|
|
}
|
|
|
if($v['extra_status'] == 1){
|
|
if($v['extra_status'] == 1){
|
|
|
$final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
|
$final_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
