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

app/Http/Controllers/OrderTrackingController.php

@@ -5,6 +5,7 @@ namespace App\Http\Controllers;
 use App\Logistic;
 use App\Order;
 use App\OrderTracking;
+use App\Services\common\ExportService;
 use App\Services\LogService;
 use App\Services\OrderTrackingService;
 use App\Services\OwnerService;
@@ -222,16 +223,7 @@ class OrderTrackingController extends Controller
                 $orderTracking->remark,
             ];
         }
-        $post=Http::post(config('go.export.url'),['type'=>'base','data'=>json_encode(['row'=>$row,'list'=>$list,'mergeColumn'=>$mergeColumn,'mergeRow'=>$mergeRow],JSON_UNESCAPED_UNICODE),
-            'createFormat'=>'merge']);
-
-        if ($post->status() == 500){
-            throw new Exception($post->header("Msg"));
-        }
-        return response($post,200, [
-            "Content-type"=>"application/octet-stream",
-            "Content-Disposition"=>"attachment; filename=订单跟踪件-".date('ymdHis').'.xlsx',
-        ]);
+        return app(ExportService::class)->json($row,$list,'订单跟踪件','merge',$mergeColumn,$mergeRow);
     }
 
     public function destroyImg(Request $request)

app/Services/OrderTrackingService.php

@@ -425,6 +425,8 @@ class OrderTrackingService
             $client = $items[1][0];
             $order_remark = $items[3][0];
         }
+        if(stristr($client,'天猫'))$client='天猫';
+        if(stristr($client,'京东'))$client='京东';
         return [
             'owner_id' => $order->owner_id,
             'client' => $client,

app/Services/common/ExportService.php

@@ -28,7 +28,7 @@ Class ExportService
         $data = ['row'=>$row,'list'=>$list];
         if ($createFormat){
             $data["mergeColumn"] = $mergeColumn;
-            $data["mergeRow"] = $mergeRow;
+            if($mergeRow)$data["mergeRow"] = $mergeRow;
             $request["createFormat"] = "merge";
         }
         $request["data"] = json_encode($data,JSON_UNESCAPED_UNICODE);

resources/views/order/tracking/index.blade.php

@@ -110,12 +110,12 @@
                             @endcan
                         </td>
                         <td class="td-warm">
-                            @can('订单管理-跟踪-仓库编辑')
-                                <input class="form-control form-control-sm" :value="trackOrder.sale" @change="warehouseUpdate($event,'sale',trackOrder)" >
-                            @else
-                                @{{ trackOrder.sale }}
-                            @endcan
-                        </td>
+{{--                            @can('订单管理-跟踪-仓库编辑')--}}
+{{--                                <input class="form-control form-control-sm" :value="trackOrder.sale" @change="warehouseUpdate($event,'sale',trackOrder)" >--}}
+{{--                            @else--}}
+{{--                                @{{ trackOrder.sale }}--}}
+{{--                            @endcan--}}
+{{--                        </td>--}}
                         <td class="td-yellow">
                             @can('订单管理-跟踪-仓库编辑')
                                 <input class="form-control form-control-sm" :value="trackOrder.client" @change="warehouseUpdate($event,'client',trackOrder)" >