Browse Source

骑手改用懒族员工表

master
lanzu_qinsheng 5 years ago
parent
commit
34e7b2f3e9
  1. 2
      app/Admin/Controllers/ImsCjdcOrderMainController.php
  2. 4
      app/Admin/Forms/SelectHorseman.php
  3. 1
      app/Models/LanzuServiceHorseman.php
  4. 19
      app/Models/v3/LanzuEmployees.php

2
app/Admin/Controllers/ImsCjdcOrderMainController.php

@ -55,7 +55,6 @@ class ImsCjdcOrderMainController extends AdminController
$grid->created_at('下单时间')->display(function ($time) { $grid->created_at('下单时间')->display(function ($time) {
return date('Y-m-d H:i:s',$time); return date('Y-m-d H:i:s',$time);
}); });
$grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) { $grid->actions(function (Grid\Displayers\Actions $actions) use ($grid) {
$state = $actions->row->state; $state = $actions->row->state;
@ -83,7 +82,6 @@ class ImsCjdcOrderMainController extends AdminController
$grid->disableEditButton(); $grid->disableEditButton();
$grid->disableDeleteButton(); $grid->disableDeleteButton();
}); });
} }

4
app/Admin/Forms/SelectHorseman.php

@ -4,6 +4,7 @@ namespace App\Admin\Forms;
use App\Models\ImsCjdcOrderMain; use App\Models\ImsCjdcOrderMain;
use App\Models\LanzuServiceHorseman; use App\Models\LanzuServiceHorseman;
use App\Models\v3\LanzuEmployees;
use Dcat\Admin\Widgets\Form; use Dcat\Admin\Widgets\Form;
use Symfony\Component\HttpFoundation\Response; use Symfony\Component\HttpFoundation\Response;
@ -36,9 +37,8 @@ class SelectHorseman extends Form
*/ */
public function form() public function form()
{ {
$this->select('horseman_id','配送员') $this->select('horseman_id','配送员')
->options(LanzuServiceHorseman::getHorseman())
->options(LanzuEmployees::getHorseman())
->required(); ->required();
$this->hidden('order_id')->value($this->data['order_id']); $this->hidden('order_id')->value($this->data['order_id']);
$this->hidden('current_page')->value($this->data['current_page']); $this->hidden('current_page')->value($this->data['current_page']);

1
app/Models/LanzuServiceHorseman.php

@ -38,4 +38,5 @@ class LanzuServiceHorseman extends Model
return '--'; return '--';
} }
} }
} }

19
app/Models/v3/LanzuEmployees.php

@ -69,4 +69,23 @@ class LanzuEmployees extends Model
return array_flip($list); return array_flip($list);
} }
} }
public static function getHorseman($marketId=null)
{
if ($marketId){
$rows = self::where('market_id',$marketId)
->where('position','REGEXP','"29"')
->get();
}else{
$rows = self::where('position','REGEXP','"29"')->get();
}
$item = [];
if ($rows){
foreach ($rows as $row) {
$item[$row->id] = $row->name;
}
}
return $item;
}
} }
Loading…
Cancel
Save