zengjun 4 лет назад
Родитель
Сommit
0fe1eeee34
1 измененных файлов с 5 добавлено и 4 удалено
  1. 5 4
      resources/views/order/workOrder/index.blade.php

+ 5 - 4
resources/views/order/workOrder/index.blade.php

@@ -1150,7 +1150,7 @@
                             item.issue_type_name = detail.issue_type ? detail.issue_type.name : '';
                             return item;
                         });
-                        commodities.push(...(commodity_items ?? []))
+                        commodities.push(...(commodity_items ?commodity_items: []))
                     });
                     return commodities.filter(item => {
                         if (!isCurrent) {
@@ -1893,8 +1893,8 @@
                         {process_result: '少发,不补发', option: ['已完成入库','完成']},
                         {process_result: '核实未错漏发', option: ['确认未错漏发']},
                     ];
-                    return items.filter(e => process_result === e.process_result).map(e => e.option).shift() ?? [];
-
+                    let shift =  items.filter(e => process_result === e.process_result).map(e => e.option).shift() ;
+                    return shift ? shift : [];
                 },
                 getOwnerMistakeProcessResultInfo(process_result, item) {
                     let items = [
@@ -1904,7 +1904,8 @@
                         {process_result: "少发,不补发", option: ['商家做入库单,选择明细和数量','不入库'],},
                         {process_result: "核实未错漏发", option: ['确认未错漏发'],},
                     ];
-                    let options = items.filter(e => e.process_result === process_result).map(e => e.option).shift() ?? [];
+                    let shift = items.filter(e => e.process_result === process_result).map(e => e.option).shift() ?? [];
+                    let options = shift  ? shift : []
                     if (options.length === 0) {
                         item.process_result_info = options[0];
                     }