Commit 73f24e4f by allen

把所有地方都加上 采购员

parent 701d3f5c
...@@ -756,11 +756,6 @@ Class OrderController extends Controller ...@@ -756,11 +756,6 @@ Class OrderController extends Controller
public function templateData(Request $request, $id, $view_id) public function templateData(Request $request, $id, $view_id)
{ {
$info = $this->orderDetail($request, $id); $info = $this->orderDetail($request, $id);
//获取数组中的采购人id的名字
$this->getBuyerName($info);
// dump($info['order_temp_info']);exit;
$this->pageHeader($request, $info, '订单详情'); $this->pageHeader($request, $info, '订单详情');
...@@ -837,6 +832,7 @@ Class OrderController extends Controller ...@@ -837,6 +832,7 @@ Class OrderController extends Controller
public function changeOrder(Request $request, $id) public function changeOrder(Request $request, $id)
{ {
$info = $this->orderDetail($request, $id); $info = $this->orderDetail($request, $id);
$this->pageHeader($request, $info, '人工审单', ["title" => '人工审单', "href" => '#']); $this->pageHeader($request, $info, '人工审单', ["title" => '人工审单', "href" => '#']);
if ($info['order_info']['order_goods_type'] == 2 && in_array($info['order_info']['order_type'], [1, 3])) { // 平台自营订单 if ($info['order_info']['order_goods_type'] == 2 && in_array($info['order_info']['order_type'], [1, 3])) { // 平台自营订单
...@@ -1596,6 +1592,9 @@ Class OrderController extends Controller ...@@ -1596,6 +1592,9 @@ Class OrderController extends Controller
$response = array_merge($response, $info); $response = array_merge($response, $info);
// 获取数组中的采购人id的名字
$this->getBuyerName($response);
return $response; return $response;
} }
...@@ -2077,14 +2076,8 @@ Class OrderController extends Controller ...@@ -2077,14 +2076,8 @@ Class OrderController extends Controller
$info = $this->orderDetail($request, $id); $info = $this->orderDetail($request, $id);
// $info['order_items_info'];
// $info['order_temp_info']['erp_sn'] =
// dump($info);exit;
//获取数组中的采购人id的名字
$this->getBuyerName($info);
//循环订单详情 //循环订单详情
foreach ($info['order_items_info'] as $key => $value) { foreach ($info['order_items_info'] as $key => $value) {
......
...@@ -529,7 +529,7 @@ ...@@ -529,7 +529,7 @@
@endif @endif
<td>{{$v['delivery_time']}}</td> <td>{{$v['delivery_time']}}</td>
@if ($order_info['order_goods_type'] == 1) @if ($order_info['order_goods_type'] == 1)
<td> <div class="buyerName"> <td> <div class="buyerName">
<?php <?php
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment