cqpCow 1 ano atrás
pai
commit
be9594ef6d
2 arquivos alterados com 16 adições e 17 exclusões
  1. 2 7
      app/Service/PurchaseOrderService.php
  2. 14 10
      config/header/45.php

+ 2 - 7
app/Service/PurchaseOrderService.php

@@ -463,13 +463,8 @@ class PurchaseOrderService extends Service
 
             //发货信息 分社向总社采购
             $invoice_state = "未发货";
-            $invoice_arr = "";
-            if(! empty($invoice_map[$value['order_number']])){
-                $invoice_state = "已发货";
-                $invoice_arr = implode(',',$invoice_map[$value['order_number']]);
-            }
-            $data['data'][$key]['invoice_state_name'] = $invoice_state;
-            $data['data'][$key]['invoice_arr'] = $invoice_arr;
+            if(! empty($invoice_map[$value['order_number']])) $invoice_state = implode(',',$invoice_map[$value['order_number']]);
+            $data['data'][$key]['state_message'] = "订单状态:" . $data['data'][$key]['state_title'] . "<br>是否发货:" . $invoice_state;
         }
 
         return $data;

+ 14 - 10
config/header/45.php

@@ -54,19 +54,23 @@ return [
         'key' => 'fee4',
         'value' => '最终金额',
     ],
-    [
-        'key' => 'state_title',
+//    [
+//        'key' => 'state_title',
+//        'value' => '状态',
+//    ],
+//    [
+//        'key' => 'invoice_state_name',
+//        'value' => '发货状态',
+//    ],
+//    [
+//        'key' => 'invoice_arr',
+//        'value' => '发货单号',
+//    ],
+    [
+        'key' => 'state_message',
         'value' => '状态',
     ],
     [
-        'key' => 'invoice_state_name',
-        'value' => '发货状态',
-    ],
-    [
-        'key' => 'invoice_arr',
-        'value' => '发货单号',
-    ],
-    [
         'key' => 'crt_time',
         'value' => '创建时间',
     ],