sth
This commit is contained in:
parent
b54d750569
commit
382d410bea
|
|
@ -83,6 +83,11 @@ class Dispatch2 extends Backend
|
||||||
$row->is_disabled = in_array($row->status, $this->model->btnActiveStatusList('disabled_status'));
|
$row->is_disabled = in_array($row->status, $this->model->btnActiveStatusList('disabled_status'));
|
||||||
$row->btn_record = in_array($row->status, $this->model->btnActiveStatusList('btn_record')) && $this->auth->check('orders/dispatchrecord/add');
|
$row->btn_record = in_array($row->status, $this->model->btnActiveStatusList('btn_record')) && $this->auth->check('orders/dispatchrecord/add');
|
||||||
// $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false;
|
// $row->btn_income = (in_array($row->status, $this->model->btnActiveStatusList('btn_income')) && in_array($row->order->status, $orderModel->incomeBtnStatus())) ? true : false;
|
||||||
|
|
||||||
|
if($row->status == -10){ //拒绝
|
||||||
|
$row->remark = $row->reject_reason;
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
$result = array("total" => $list->total(), "rows" => $list->items());
|
$result = array("total" => $list->total(), "rows" => $list->items());
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user