|
@@ -2227,7 +2227,7 @@ class Whlabel_bh extends Start_Controller {
|
|
|
$start = ($page - 1)*$perpage;
|
|
$start = ($page - 1)*$perpage;
|
|
|
}
|
|
}
|
|
|
//取得信息列表
|
|
//取得信息列表
|
|
|
- $info_list = $this->whlabel_bh_transfer->find_all($where,'id,orderinfo,pm,shipremarks,ts,printtime,time,ycrk_type',$order_str,$start,$perpage);
|
|
|
|
|
|
|
+ $info_list = $this->whlabel_bh_transfer->find_all($where,'id,orderinfo,pm,shipremarks,ts,printtime,time',$order_str,$start,$perpage);
|
|
|
$transfer = $this->transfer->find_all();
|
|
$transfer = $this->transfer->find_all();
|
|
|
$t = array();$ot = array();
|
|
$t = array();$ot = array();
|
|
|
foreach ($transfer as $v)
|
|
foreach ($transfer as $v)
|
|
@@ -2251,11 +2251,11 @@ class Whlabel_bh extends Start_Controller {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
$info_list[$key]['time'] = trim($tmp_operate_str,'<br>');
|
|
$info_list[$key]['time'] = trim($tmp_operate_str,'<br>');
|
|
|
- if(empty($value['ycrk_type'])){
|
|
|
|
|
- $info_list[$key]['ycrk_type'] = "<p style='background-color: #f0f0f0 !important;color:#000 !important' onclick='addYcrk(".$value['id'].")'>异常入库</p>";
|
|
|
|
|
- }else{
|
|
|
|
|
- $info_list[$key]['ycrk_type'] = "";
|
|
|
|
|
- }
|
|
|
|
|
|
|
+ // if(empty($value['ycrk_type'])){
|
|
|
|
|
+ // $info_list[$key]['ycrk_type'] = "<p style='background-color: #f0f0f0 !important;color:#000 !important' onclick='addYcrk(".$value['id'].")'>异常入库</p>";
|
|
|
|
|
+ // }else{
|
|
|
|
|
+ // $info_list[$key]['ycrk_type'] = "";
|
|
|
|
|
+ // }
|
|
|
}
|
|
}
|
|
|
$total = $this->whlabel_bh_transfer->find_count($where);
|
|
$total = $this->whlabel_bh_transfer->find_count($where);
|
|
|
$pagenum = ceil($total/$perpage);
|
|
$pagenum = ceil($total/$perpage);
|