|
@@ -51,6 +51,7 @@ class Outerrors extends Start_Controller{
|
|
|
$number = $this->input->post('number',true);
|
|
$number = $this->input->post('number',true);
|
|
|
$timetk = $this->input->post('timetk',true);
|
|
$timetk = $this->input->post('timetk',true);
|
|
|
$timetj = $this->input->post('timetj',true);
|
|
$timetj = $this->input->post('timetj',true);
|
|
|
|
|
+ $order_status = $this->input->post('order_status',true);
|
|
|
$timetk = strtotime($timetk);
|
|
$timetk = strtotime($timetk);
|
|
|
$timetj = strtotime($timetj);
|
|
$timetj = strtotime($timetj);
|
|
|
$where = "";
|
|
$where = "";
|
|
@@ -62,6 +63,11 @@ class Outerrors extends Start_Controller{
|
|
|
}else{
|
|
}else{
|
|
|
$where .= " and scan_time > '$timetk' and scan_time < '$timetj' ";
|
|
$where .= " and scan_time > '$timetk' and scan_time < '$timetj' ";
|
|
|
}
|
|
}
|
|
|
|
|
+ if($order_status >= 0){
|
|
|
|
|
+
|
|
|
|
|
+ $where .= " and order_status = '$order_status' ";
|
|
|
|
|
+
|
|
|
|
|
+ }
|
|
|
//数据排序
|
|
//数据排序
|
|
|
$order_str = " id desc";
|
|
$order_str = " id desc";
|
|
|
if(empty($page))
|
|
if(empty($page))
|
|
@@ -92,6 +98,7 @@ class Outerrors extends Start_Controller{
|
|
|
'waybill' => $v['waybill'],
|
|
'waybill' => $v['waybill'],
|
|
|
'dy_status'=>empty($v['dy_status'])?'':$v['dy_operate'],
|
|
'dy_status'=>empty($v['dy_status'])?'':$v['dy_operate'],
|
|
|
'ck_status' => empty($v['ck_status'])?'':$v['ck_operate'],
|
|
'ck_status' => empty($v['ck_status'])?'':$v['ck_operate'],
|
|
|
|
|
+ 'order_status'=>empty($v['order_status'])?'':date("Y-m-d H:i:s",$v['library_time']),
|
|
|
'remark'=>empty($v['remark'])?'':$v['remark'],
|
|
'remark'=>empty($v['remark'])?'':$v['remark'],
|
|
|
'opreate'=>$str
|
|
'opreate'=>$str
|
|
|
];
|
|
];
|