Просмотр исходного кода

问题件导出 创建日期和登记日期按照年-月-日的格式导出

ajun 5 лет назад
Родитель
Сommit
73b73c1048
1 измененных файлов с 6 добавлено и 7 удалено
  1. 6 7
      app/Http/Controllers/OrderIssueController.php

+ 6 - 7
app/Http/Controllers/OrderIssueController.php

@@ -213,7 +213,6 @@ class OrderIssueController extends Controller
         }
     }
 
-
     public function apiEndOrderIssue(Request $request)
     {
         if (!Gate::allows('订单管理-问题件-编辑')) {
@@ -624,7 +623,6 @@ class OrderIssueController extends Controller
             $order = $order_issue->order;
             $send_order = $order_issue->secondOrder ??  new Order();
             $logs =  $order_issue->logs ?? collect();
-            $issueType = $order_issue->issueType->name;
             $rejectedBill  = $order_issue->rejectedBill ?? new RejectedBill();
             // 订单信息
             $order_logistic_number = [];
@@ -664,8 +662,8 @@ class OrderIssueController extends Controller
             $start_row = $row_number;
             for ($index =0 ;$index<$max_rows ;$index++){
                 $json[] = [
-                    $order_issue->created_at,       // 登记日期
-                    $order->created_at,             // 创建日期
+                    isset($order_issue->created_at) ? str_split($order_issue->created_at,10)[0] :'',       // 登记日期
+                    isset($order->created_at) ? str_split($order->created_at,10)[0] :'',             // 创建日期
                     $order->owner->name ?? '',      // 客户
                     $order->client_code,              // 客户订单号
                     $order->logistic->name ?? '',   // 原始承运商
@@ -720,9 +718,9 @@ class OrderIssueController extends Controller
             }
         });
         $mergeColumn = ['A','B','C','D','E','F','G','H','I','J','K','L','P','T','X','Y','Z','AA','AF','AG','AH','AI','AJ','AK'];   // 合并行
-        $post=Http::post(config('go.export.url'),['type'=>'base','data'=>json_encode(['row'=>$row,'list'=>$json,'mergeColumn'=>$mergeColumn,'mergeRow'=>$mergeRow],JSON_UNESCAPED_UNICODE),'createFormat'=>'merge']);
-//        $post=Http::post(config('go.export.url'),['type'=>'base','data'=>json_encode(['row'=>$row,'list'=>$json],JSON_UNESCAPED_UNICODE)]);
-
+        $post=Http::post(config('go.export.url'),['type'=>'base',
+            'data'=>json_encode(['row'=>$row,'list'=>$json,'mergeColumn'=>$mergeColumn,'mergeRow'=>$mergeRow],JSON_UNESCAPED_UNICODE),'createFormat'=>'merge']);
+        // 'createFormat'=>'wrapText'
         if ($post->status() == 500){
             throw new Exception($post->header("Msg"));
         }
@@ -731,4 +729,5 @@ class OrderIssueController extends Controller
             "Content-Disposition"=>"attachment; filename=订单问题件-".date('ymdHis').'.xlsx',
         ]);
     }
+
 }