Merge branch 'zzd' of ssh://was.baoshi56.com:10022/var/git/bswas

resources/views/rejected/search/general.blade.php

@@ -79,11 +79,15 @@
                         @can('退货管理-查询-客户定义-爱奇艺')<td class="text-muted">@{{rejectedBill.common_01}}</td>@endcan
                         <td class="text-muted">@{{rejectedBill.common_02}}</td>
                         <td class="text-muted">@{{rejectedBill.goods_amount}}</td>
-                        <td colspan="8" style="min-width: 800px">
+                        <td colspan="8" style="min-width: 900px">
                             <div class="w-100" :class="rejectedBill.items.length>1 ? 'up' : ''" :id="'rejected-'+rejectedBill.id">
                                 <div class="row" v-for="item in rejectedBill.items">
-                                    <div class="col-2">@{{item.barcode_goods}}</div>
-                                    <div class="col-2">@{{item.name_goods}}</div>
+                                    <div class="col-2">
+                                        <div class="w-100 text-overflow-warp-200">@{{item.barcode_goods}}</div>
+                                    </div>
+                                    <div class="col-2">
+                                        <div class="w-100 text-overflow-warp-200">@{{item.name_goods}}</div>
+                                    </div>
                                     <div class="col-1">@{{item.amount}}</div>
                                     <div class="col-1">@{{item.quality_label}}</div>
                                     <div class="col-2">@{{item.batch_number}}</div>