Merge branch 'zjl_adjust_20181026' into development

resources/views/detail/changeOrder.blade.php

@@ -152,9 +152,14 @@
                                     @if (strpos($k, '.') !== false)
                                         <p>
                                             <?php 
-                                                $sid = explode('.', $k)[1];
+                                                $sid = explode('.', $k);
                                                 // echo App\Http\Controllers\getSupplierName($sid); 
-                                                echo $sid; 
+                                                
+                                                if ($sid[0] == 17) { // 联营供应商
+                                                    echo $sid[1];
+                                                } else {
+                                                    echo $v['supplier_name'];
+                                                }
                                             ?>
                                         </p>  
                                     @else