Skip to content

semour / semour_admin

Go to a project
Commit 0b709d4e by 孙龙
Options

合同

parent 45b64a15
Inline Side-by-side
Showing with 9 additions and 7 deletions
app/Admin/Controllers/Api/OrderApiController.php
...@@ -27,7 +27,7 @@ class OrderApiController extends BaseController ...@@ -27,7 +27,7 @@ class OrderApiController extends BaseController
$params = $request->all(); $params = $request->all();
$type = arrayGet($params, "type"); $type = arrayGet($params, "type");
$order_id = 203; $order_id = 69;
$orderAddressList = OrderService::getOrderAddress($order_id); $orderAddressList = OrderService::getOrderAddress($order_id);
$orderAddressList = arrayChangeKeyByField($orderAddressList,"order_address_type"); $orderAddressList = arrayChangeKeyByField($orderAddressList,"order_address_type");
// dump($orderAddressList); // dump($orderAddressList);
...@@ -117,6 +117,8 @@ class OrderApiController extends BaseController ...@@ -117,6 +117,8 @@ class OrderApiController extends BaseController
$info["orderList"] = OrderService::getOrderList($order_id); $info["orderList"] = OrderService::getOrderList($order_id);
$info["orderList"]["adminUser"] = CmsUser::getInfoByUserId($info["orderList"]["sale_id"]);
// dd($info); // dd($info);
if($type == "1"){ if($type == "1"){
......
resources/views/export/order_contract_PI.blade.php
...@@ -79,10 +79,10 @@ ...@@ -79,10 +79,10 @@
<td>{{@$bill["consignee"]}}</td> <td>{{@$bill["consignee"]}}</td>
<td> <td>
@if(!empty($info["orderList"]["scm_user"])) @if(!empty($info["orderList"]["scm_user"]))
@if($info["orderList"]["scm_user"]["name"]) @if($info["orderList"]["scm_user"]["company_name"])
{{$info["orderList"]["scm_user"]["name"]}}
@else
{{$info["orderList"]["scm_user"]["company_name"]}} {{$info["orderList"]["scm_user"]["company_name"]}}
@else
{{$info["orderList"]["scm_user"]["name"]}}
@endif @endif
@endif @endif
</td> </td>
......
resources/views/export/order_contract_PL.blade.php
...@@ -80,10 +80,10 @@ ...@@ -80,10 +80,10 @@
<td>{{@$bill["consignee"]}}</td> <td>{{@$bill["consignee"]}}</td>
<td> <td>
@if(!empty($info["orderList"]["scm_user"])) @if(!empty($info["orderList"]["scm_user"]))
@if($info["orderList"]["scm_user"]["name"]) @if($info["orderList"]["scm_user"]["company_name"])
{{$info["orderList"]["scm_user"]["name"]}}
@else
{{$info["orderList"]["scm_user"]["company_name"]}} {{$info["orderList"]["scm_user"]["company_name"]}}
@else
{{$info["orderList"]["scm_user"]["name"]}}
@endif @endif
@endif @endif
</td> </td>
......
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