|
|
@@ -1072,31 +1072,17 @@ class Workshopshow extends Start_Controller
|
|
|
foreach($cr_list as $k=>$v){
|
|
|
$type = ($v['type']==1)?'入库':'出库';
|
|
|
$operate_name = isset($operate_list[$v['lx']])?$operate_list[$v['lx']]:'';
|
|
|
- if($v['orver_flag'] == 1){
|
|
|
- if($v['is_over'] == 0){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l style='font-weight:900;'>即将超时 </l></a>";
|
|
|
- // $info_list[$key]['time'] .= '<i style="padding:10px;color:#90f;font-weight:bold;"> 即将超时</i>'.'<br>';
|
|
|
- }else{
|
|
|
- $info_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){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#f33'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>超时! </l></a>";
|
|
|
- }elseif($v['orver_flag'] == 3){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#06f'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ." <l font-weight:900'>【该单已取消】 </l></a>";
|
|
|
- }elseif(($v['orver_flag'] == 0)&&(empty($v['lx']))){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:red'>订单已完成:".date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
+ foreach($log_list as $k=>$v){
|
|
|
+ if(empty($v['lx']) && !empty($v['ycrk_type'])){
|
|
|
+ $tmp_operate_str.= "订单已完成：".date('Y-m-d H:i:s',$v['time'])."<br>";
|
|
|
}else{
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#000'>".$operate_name.$type.' ：'.date('Y-m-d H:i',$v['time']) ."</a>";
|
|
|
+ $tmp_operate_str.= $operate_name.$type."：".date('Y-m-d H:i:s',$v['time'])."<br>";
|
|
|
}
|
|
|
+
|
|
|
+ }
|
|
|
|
|
|
- if($v['extra_status'] == 1){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#90f'>【下道工序未及时入库】</a><br>";
|
|
|
- }elseif($v['extra_status'] == 2 || $v['extra_status'] == 3){
|
|
|
- $info_list[$key]['time'] .= "<a href='javascript:void(0);' style='color:#A52A2A'>【工序间流转超过3天】</a><br>";
|
|
|
- }else{
|
|
|
- $info_list[$key]['time'] .= "<br>";
|
|
|
- }
|
|
|
- }
|
|
|
+ $info_list[$key]['time'] = trim($tmp_operate_str,'<br>');
|
|
|
+
|
|
|
|
|
|
unset($info_list[$key]['ctime12']);
|
|
|
}
|
