|
|
@@ -90,17 +90,24 @@ class Outerrors extends Start_Controller{
|
|
|
if(!empty($v['dy_status']) ){
|
|
|
$str .= "<p><b style='font-size:18px !important;background-color: #FFC125;color: #000;' data-id='".$v['id']."' data-type='2' data-operate='".$v['ck_operate']."' onclick='dycz(this)'>仓库备注</b></p>";
|
|
|
}
|
|
|
-
|
|
|
+ $dy_operate_str = "";
|
|
|
+ if(!empty($v['dy_status'])){
|
|
|
+ if(mb_stripos($v['dy_operate'],'发走') !== false){
|
|
|
+ $dy_operate_str = "<p style='color:red;font-weight:bold;'>".$v['dy_operate']."</p>";
|
|
|
+ }else{
|
|
|
+ $dy_operate_str = $v['dy_operate'];
|
|
|
+ }
|
|
|
+ }
|
|
|
$info_list[] = [
|
|
|
'id' => $v['id'],
|
|
|
'scan_time' => date('Y-m-d H:i:s',$v['scan_time']),
|
|
|
'number' => $v['number'],
|
|
|
'waybill' => $v['waybill'],
|
|
|
'order_status'=>empty($v['order_status'])?'未出库':date("Y-m-d H:i:s",$v['library_time'])."出库",
|
|
|
- 'dy_status'=>empty($v['dy_status'])?'':$v['dy_operate'],
|
|
|
+ 'dy_status'=>empty($v['dy_status'])?'':$dy_operate_str,
|
|
|
'ck_status' => empty($v['ck_status'])?'':$v['ck_operate'],
|
|
|
'remark'=>empty($v['remark'])?'':$v['remark'],
|
|
|
- 'opreate'=>$str
|
|
|
+ 'opreate'=>$str,
|
|
|
];
|
|
|
}
|
|
|
|