Merge branch 'zzd'

app/Http/Controllers/ProcessController.php

@@ -691,7 +691,7 @@ class ProcessController extends Controller
 
     public function show($id){
         $process=Process::with(['processesContents'=>function($query){
-            $query->with(['commodity'=>function($query){
+            $query->with(['signCommodityName','signCommoditySku','signCommodityBarcode','commodity'=>function($query){
                 $query->with('barcodes');
             }]);
         },'tutorials'])->find($id);

resources/views/process/show.blade.php

@@ -66,12 +66,13 @@
                 <td>@{{ content.wms_code }}</td>
                 <td>@{{ content.amount }}</td>
                 <td>
-                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity">
+                    <span v-if="content.sign_commodity_barcode_mark">@{{ content.sign_commodity_barcode_mark }}</span>
+                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity && !content.sign_commodity_barcode_mark">
                         <li v-for="barcode in content.commodity.barcodes"><small style="white-space: normal">@{{ barcode.code }}</small></li>
                     </ul>
                 </td>
                 <td class="text-muted tooltipTarget">
-                    <div style="white-space: normal">@{{ content.sign_mark?content.sign_mark:content.commodity_name }}</div></td>
+                    <div style="white-space: normal">@{{ content.sign_commodity_name_mark?content.sign_commodity_name_mark:content.commodity_name }}</div></td>
             </tr>
         </table>
         <table class="table table-sm table-bordered table-bordered w-100" style="background-color: #ccd7dc;">
@@ -87,12 +88,13 @@
                 <td>@{{ content.wms_code }}</td>
                 <td>@{{ content.amount }}</td>
                 <td>
-                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity">
+                    <span v-if="content.sign_commodity_barcode_mark">@{{ content.sign_commodity_barcode_mark }}</span>
+                    <ul class="p-0 m-0 list-unstyled list-inline" v-if="content.commodity && !content.sign_commodity_barcode_mark">
                         <li v-for="barcode in content.commodity.barcodes"><small style="white-space: normal">@{{ barcode.code }}</small></li>
                     </ul>
                 </td>
                 <td class="text-muted tooltipTarget">
-                    <div style="white-space: normal">@{{ content.sign_mark?content.sign_mark:content.commodity_name }}</div></td>
+                    <div style="white-space: normal">@{{ content.sign_commodity_name_mark?content.sign_commodity_name_mark:content.commodity_name }}</div></td>
             </tr>
         </table>
     </div>