|
|
@@ -30,9 +30,6 @@ class Maintain extends Controller
|
|
|
{
|
|
|
|
|
|
$this->title = '列表管理';
|
|
|
- $all_type = \app\common\model\OfferType::getAllType();
|
|
|
- $all_type = array_merge([['id'=>0,'title'=>'全部']],$all_type);
|
|
|
- $this->all_type = array_column($all_type,null,'id');
|
|
|
$this->status_arr = [0=>'全部','1'=>'审批中',2=>'审批通过',3=>'审批拒绝',9=>'已取消'];
|
|
|
$sel_where = [];
|
|
|
$time = explode(' - ',input('create_at'));
|
|
|
@@ -112,7 +109,6 @@ class Maintain extends Controller
|
|
|
*/
|
|
|
protected function _form_filter(&$data)
|
|
|
{
|
|
|
- $this->all_type = \app\common\model\OfferType::getAllType();
|
|
|
if($this->request->isGet() && $this->request->action() == 'edit')
|
|
|
{
|
|
|
$data['user_name'] = User::where('id',$data['user_id'])->value('name');
|
|
|
@@ -133,7 +129,7 @@ class Maintain extends Controller
|
|
|
public function approve()
|
|
|
{
|
|
|
$id = input('id');
|
|
|
- $list = $this->_query('OfferApprove')
|
|
|
+ $list = $this->_query('MaintainApprove')
|
|
|
->alias('r')
|
|
|
->field('r.*,u.name,u.phone,u.headimg')
|
|
|
->leftJoin('store_member u','u.id = r.approve_user')
|
