1

app/Service/SalesOrderService.php

@@ -769,7 +769,7 @@ class SalesOrderService extends Service
             ->whereIn('sales_order_id',array_column($data['data'],'id'))
             ->get()->toArray();
         foreach ($sales_o_info as $value){
-            $fee[$value['sales_order_id']][] = $value;
+            $fee[$value['sales_order_id']] = $value['other_fee_1'];
         }
         foreach ($data['data'] as $key => $value){
             $data['data'][$key]['business_type_title'] = $basic_map[$value['business_type']] ?? '';

app/Service/TableHeadService.php

@@ -64,7 +64,7 @@ class TableHeadService extends Service
             if(isset($header_map[$value['key']])) {
                 //存在保存好的设置的表头 以下信息沿用
                 $tmp = $header_map[$value['key']];
-                $header_default[$key]['sort'] = $tmp['is_show'];
+                $header_default[$key]['sort'] = $tmp['sort'];
                 $header_default[$key]['is_show'] = $tmp['is_show'];
                 $header_default[$key]['is_click_detail'] = $tmp['is_click_detail'];
                 $header_default[$key]['float'] = $tmp['float'];