Merge branch 'master' of /data/git/tiantian2

master
songweizong 3 years ago
commit 10eaddc62a

@ -79,7 +79,8 @@ class OrdersController extends CommonController
foreach ($data as $order) {
$order = $order->refreshTotal();
$factors = json_decode($order->factors,true);
dd($factors);
dd((collect($factors)->where('factor_name','所在科室')->first()));
$order->department = (collect($factors)->where('factor_name','所在科室')->first()->factor_item_name)??'';
}
return view($this->bladePath . ".index", compact("data", "project_id", "month", "project"));

Loading…
Cancel
Save