Merge branch 'zjl_erp_syn_20190514' into development

resources/views/detail/content.blade.php

@@ -302,10 +302,9 @@
             </table>
             </table>
             @endif
             @endif
 
 
-            <table class="table table-bordered">
+           <!--  <table class="table table-bordered">
                 <tr class="caption">
                 <tr class="caption">
                     <th colspan="4" style="text-align: center; background: #f9f9f9;">合同乙方信息
                     <th colspan="4" style="text-align: center; background: #f9f9f9;">合同乙方信息
-                        <!-- 待审核可编辑 -->
                         @if ($order_info['status'] == 1)
                         @if ($order_info['status'] == 1)
                             <a href="javascript:;" class="btn btn-success btn-sm changeBtn contract_info_edit">编辑</a>
                             <a href="javascript:;" class="btn btn-success btn-sm changeBtn contract_info_edit">编辑</a>
                         @endif
                         @endif
@@ -330,7 +329,7 @@
                         <td colspan="4" style="text-align: center;">无乙方信息</td>
                         <td colspan="4" style="text-align: center;">无乙方信息</td>
                     </tr>
                     </tr>
                 @endif
                 @endif
-            </table>
+            </table> -->
 
 
             <!-- 发票收货地址 -->
             <!-- 发票收货地址 -->
             @if ($order_invoice_address_info)
             @if ($order_invoice_address_info)