Merge branch 'zjl_check_20200818'

resources/views/changeOrder/tempSave.blade.php

@@ -46,8 +46,8 @@
                                 <td>{{ isset($v['standard_brand_name']) ? $v['standard_brand_name'] : '' }}</td>
                                 <td>{{$v['goods_number']}}</td>
                                 <td>{{$v['goods_price']}}</td>
-                                <td>{{ App\Http\Controllers\getSalesName($v['buyer_id']) }}</td>
-                                <td>{{$v['batch']}}</td>
+                                <td>{{ isset($v['buyer_id']) ? App\Http\Controllers\getSalesName($v['buyer_id']) : '' }}</td>
+                                <td>{{ isset($v['batch']) ? $v['batch'] : '' }}</td>
                                 <td>
                                     <?= $v['status'] == 1 ? '正常' : '<i style="color: red;">已取消</i>' ?>