添加合同乙方信息

app/Http/Controllers/OrderController.php

@@ -1246,6 +1246,7 @@ Class OrderController extends Controller
             'user_mobile'                 => $mobile,
             'order_info'                  => $temp['data']['order_info'],
             'user_info'                   => $temp['data']['order_info']['user_info'],
+            'company_info'                => $temp['data']['order_info']['company_info'],
             'order_invoice_info'          => $temp['data']['order_invoice_info'],
             'order_items_info'            => $temp['data']['order_items_info'],
             'order_address_info'          => $temp['data']['order_address_info'],

resources/views/detail/content.blade.php

@@ -302,7 +302,7 @@
             </table>
             @endif
 
-           <!--  <table class="table table-bordered">
+            <table class="table table-bordered">
                 <tr class="caption">
                     <th colspan="4" style="text-align: center; background: #f9f9f9;">合同乙方信息
                         @if ($order_info['status'] == 1)
@@ -317,19 +317,47 @@
                     <th>联系人</th>
                     <th>联系电话</th>
                 </tr>
-                @if ($order_temp_info['contract_com_name'])
+                
+                <?php 
+                    if ($order_temp_info['contract_com_name']) {
+                        $contract_com_name  = $order_temp_info['contract_com_name'];
+                        $contract_com_addr  = $order_temp_info['contract_com_addr'];
+                        $contract_link_name = $order_temp_info['contract_link_name'];
+                        $contract_link_tel  = $order_temp_info['contract_link_tel'];
+                    } else { // 若未填写乙方信息，则拉取相关数据
+                        // 公司名称
+                        if (isset($order_invoice_info['tax_title']) && $order_invoice_info['tax_title'])
+                            $contract_com_name = $order_invoice_info['tax_title'];
+                        else if (isset($company_info['com_name']) && $company_info['com_name'])
+                            $contract_com_name = $company_info['com_name'];
+                        else
+                            $contract_com_name = $user_info['mobile'] ? $user_info['mobile'] : $user_info['email'];
+
+                        // 公司地址
+                        if (isset($order_invoice_info['company_address']) && $order_invoice_info['company_address'])
+                            $contract_com_addr = $order_invoice_info['company_address'];
+                        else if (isset($company_info['com_address']) && $company_info['com_address'])
+                            $contract_com_addr = $company_info['com_address'];
+                        else 
+                            $contract_com_addr = $order_address_info['province_val'].$order_address_info['city_val'].$order_address_info['district_val'].$order_address_info['address'];
+
+                        // 联系人
+                        $contract_link_name = $order_address_info['consignee'];
+
+                        // 联系电话
+                        if (isset($user_info['mobile']))
+                            $contract_link_tel = $user_info['mobile'];
+                        else
+                            $contract_link_tel = $order_address_info['mobile'];
+                    }
+                ?>
                 <tr>
-                    <td>{{ $order_temp_info['contract_com_name'] }}</td>
-                    <td>{{ $order_temp_info['contract_com_addr'] }}</td>
-                    <td>{{ $order_temp_info['contract_link_name'] }}</td>
-                    <td>{{ $order_temp_info['contract_link_tel'] }}</td>
+                    <td>{{ $contract_com_name }}</td>
+                    <td>{{ $contract_com_addr }}</td>
+                    <td>{{ $contract_link_name }}</td>
+                    <td>{{ $contract_link_tel }}</td>
                 </tr>
-                @else
-                    <tr>
-                        <td colspan="4" style="text-align: center;">无乙方信息</td>
-                    </tr>
-                @endif
-            </table> -->
+            </table>
 
             <!-- 发票收货地址 -->
             @if ($order_invoice_address_info)
@@ -893,25 +921,25 @@
         <div class="form-group">
             <label class="col-sm-4 control-label"><i class="text-danger">*</i> 公司名称：</label>
             <div class="col-sm-8">
-                <input type="text" name="contract_com_name" class="form-control contract_com_name" value="{{$order_temp_info['contract_com_name']}}">
+                <input type="text" name="contract_com_name" class="form-control contract_com_name" value="{{ $contract_com_name }}">
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-4 control-label"><i class="text-danger">*</i> 公司地址：</label>
             <div class="col-sm-8">
-                <textarea name="contract_com_addr" class="form-control contract_com_addr" cols="30" rows="3">{{$order_temp_info['contract_com_addr']}}</textarea>
+                <textarea name="contract_com_addr" class="form-control contract_com_addr" cols="30" rows="3">{{ $contract_com_addr }}</textarea>
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-4 control-label"><i class="text-danger">*</i> 联系人：</label>
             <div class="col-sm-8">
-                <input type="text" name="contract_link_name" class="form-control contract_link_name" value="{{$order_temp_info['contract_link_name']}}">
+                <input type="text" name="contract_link_name" class="form-control contract_link_name" value="{{ $contract_link_name }}">
             </div>
         </div>
         <div class="form-group">
             <label class="col-sm-4 control-label"><i class="text-danger">*</i> 联系电话：</label>
             <div class="col-sm-8">
-                <input type="text" name="contract_link_tel" class="form-control contract_link_tel" value="{{$order_temp_info['contract_link_tel']}}">
+                <input type="text" name="contract_link_tel" class="form-control contract_link_tel" value="{{ $contract_link_tel }}">
             </div>
         </div>
     </form>