|
|
@@ -15,7 +15,7 @@ class AfterChild extends Base
|
|
|
public function getList()
|
|
|
{
|
|
|
|
|
|
- $param = $this->request->only(['page' => 1, 'size' => 10, 'returnCode' => '', 'status' => '', 'orderCode' => '', 'outCode' => '', 'order_type' => '', 'supplierNo' => '', 'is_authority' => 0], 'post', 'trim');
|
|
|
+ $param = $this->request->only(['page' => 1, 'size' => 10, 'returnCode' => '', 'status' => '', 'orderCode' => '', 'outCode' => '', 'order_type' => '', 'supplierNo' => '', 'is_authority' => 0,'type'=>''], 'post', 'trim');
|
|
|
|
|
|
$db = Db::name('order_return_child')
|
|
|
->alias('a')
|
|
|
@@ -30,6 +30,7 @@ class AfterChild extends Base
|
|
|
if ($param['outCode'] != '') $db->whereLike('a.outCode', '%' . $param['outCode'] . '%');
|
|
|
if ($param['order_type'] !== '') $db->where('d.order_type', $param['order_type']);
|
|
|
if ($param['supplierNo'] != '') $db->whereLike('d.supplierNo', '%' . $param['supplierNo'] . '%');
|
|
|
+ if ($param['type'] !== '') $db->where('a.type', $param['type']);
|
|
|
|
|
|
if ($param['is_authority'] == '0' && $param['returnCode'] == '' && $param['orderCode'] == '' && $param['outCode'] == '') return json_show('请选择筛选条件');
|
|
|
|
|
|
@@ -62,7 +63,7 @@ class AfterChild extends Base
|
|
|
->count('a.id');
|
|
|
|
|
|
$list = $db
|
|
|
- ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status,d.companyNo,d.companyName,d.customer_code,d.customer_name,d.order_type,d.apply_id,d.apply_name')
|
|
|
+ ->field('a.id,a.returnCode,a.orderCode,a.outCode,a.order_out_child_status,a.outChildCode,b.supplierName send_supplierName,b.supplierNo send_supplierNo,b.name send_wsm_name,a.send_wsm_code,b.contactor_name send_contactor_name,a.send_num,a.return_num,c.supplierName return_supplierName,c.supplierNo return_supplierNo,c.name return_wsm_name,a.return_wsm_code,c.contactor_name return_contactor_name,a.status,d.companyNo,d.companyName,d.customer_code,d.customer_name,d.order_type,d.apply_id,d.apply_name,a.type')
|
|
|
->order(['a.addtime' => 'desc', 'a.id' => 'desc'])
|
|
|
->page($param['page'], $param['size'])
|
|
|
->select()
|
