|
...
|
...
|
@@ -27,11 +27,25 @@ class OrderscourierController extends AdminBaseController{ |
|
|
|
}
|
|
|
|
$data = Db::name('indent')->where($where)->where("state = 2 or state = 3 or state = 5")->order('create_time','DESC')->paginate(12);
|
|
|
|
$data->appends($param);
|
|
|
|
$list = $data->items();
|
|
|
|
foreach ($list as $k=>$v) {
|
|
|
|
$indent_goods = Db::name('indent_goods')->alias('ig')
|
|
|
|
->field('g.book_name,ig.number')
|
|
|
|
->join('__GOODS__ g','ig.goods_id = g.id')
|
|
|
|
->where('ig.indent_id',$v['id'])
|
|
|
|
->select()->toArray();
|
|
|
|
$goods = [];
|
|
|
|
foreach ($indent_goods as $kg=>$vg) {
|
|
|
|
$goods[] = $vg['book_name'].'X'.$vg['number'];
|
|
|
|
}
|
|
|
|
$list[$k]['books'] = implode('，',$goods);
|
|
|
|
}
|
|
|
|
$this->assign('start_time',!empty($param['start_time']) ? $param['start_time'] : '');
|
|
|
|
$this->assign('end_time',!empty($param['end_time']) ? $param['end_time'] : '');
|
|
|
|
$this->assign('keyword',!empty($param['keyword']) ? trim($param['keyword']) : '');
|
|
|
|
$this->assign('state',!empty($param['state']) ? $param['state'] : '');
|
|
|
|
$this->assign('data',$data);
|
|
|
|
$this->assign('data',$list);
|
|
|
|
$this->assign('page',$data->render());
|
|
|
|
return $this->fetch();
|
|
|
|
|
|
|
|
}
|
...
|
...
|
|
