|
@@ -718,6 +718,16 @@ class Whlabel extends Start_Controller {
|
|
|
//$where .= " and time > '$ktime' and time < '$jtime'";
|
|
|
$info_list = $this->whlabel->find_pc($where.$where_add,'sku,features,warehouse','id,warehouse,purchase,sku,title,details,shop,cpbz,features,number,sm',$order_str,$start,$perpage);
|
|
|
}
|
|
|
+
|
|
|
+
|
|
|
+ $info_list = $this->logic_whlabel->dataTran($info_list,['pm']);
|
|
|
+ foreach($info_list as $k=>$v){
|
|
|
+ $info_list[$k]['title'] = $v['title']."<br/>".$v['pm'];
|
|
|
+ unset($info_list[$k]['pm']);
|
|
|
+ unset($info_list[$k]['jm']);
|
|
|
+ unset($info_list[$k]['bm']);
|
|
|
+ }
|
|
|
+
|
|
|
//取得信息列表
|
|
|
|
|
|
$rows = array();$list = array();
|
|
@@ -761,6 +771,7 @@ class Whlabel extends Start_Controller {
|
|
|
$info_list[$key]['shop'] = $shop['shopname'];
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
$total = count($this->whlabel->find_pc($where.$where_add,'sku,features,warehouse','id,warehouse,sku,title,features,number'));
|
|
|
$pagenum = ceil($total/$perpage);
|
|
|
$over = $total-($start+$perpage);
|