tangyuanwang пре 1 дан
родитељ
комит
2dcff5c877

+ 6 - 8
app/Jobs/Manager/Other/ExportLowPriceGoodsJobs.php

@@ -362,10 +362,9 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
         $sheet->setCellValue('U2', '公司省');
         $sheet->setCellValue('U2', '公司省');
         $sheet->setCellValue('V2', '公司市');
         $sheet->setCellValue('V2', '公司市');
         $sheet->setCellValue('W2', '处理状态');
         $sheet->setCellValue('W2', '处理状态');
-        $sheet->setCellValue('X2', '任务状态');
-        $sheet->setCellValue('Y2', '记录时间');
-        $sheet->setCellValue('Z2', '店铺省');
-        $sheet->setCellValue('AA2', '店铺市');
+        $sheet->setCellValue('X2', '记录时间');
+        $sheet->setCellValue('Y2', '店铺省');
+        $sheet->setCellValue('Z2', '店铺市');
 
 
         //平台0=全部,1=淘宝,2=京东,3=拼多多,4=美团,5=药师帮,6=1药城,7=药九九,8=药易购,9=药帮忙,10=熊猫药药11=药房网
         //平台0=全部,1=淘宝,2=京东,3=拼多多,4=美团,5=药师帮,6=1药城,7=药九九,8=药易购,9=药帮忙,10=熊猫药药11=药房网
         $platform_data = [
         $platform_data = [
@@ -418,10 +417,9 @@ class ExportLowPriceGoodsJobs implements ShouldQueue
             $sheet->setCellValue('U' . $row, $item['province_name']);
             $sheet->setCellValue('U' . $row, $item['province_name']);
             $sheet->setCellValue('V' . $row, $item['city_name']);
             $sheet->setCellValue('V' . $row, $item['city_name']);
             $sheet->setCellValue('W' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
             $sheet->setCellValue('W' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
-            $sheet->setCellValue('X' . $row, isset($status_text[$item['status']]) ? $status_text[$item['status']] : '');
-            $sheet->setCellValue('Y' . $row, date('Y-m-d H:i:s', $item['insert_time']));
-            $sheet->setCellValue('Z' . $row, $item['shipment_province_name']);
-            $sheet->setCellValue('AA' . $row, $item['shipment_city_name']);
+            $sheet->setCellValue('X' . $row, date('Y-m-d H:i:s', $item['insert_time']));
+            $sheet->setCellValue('Y' . $row, $item['shipment_province_name']);
+            $sheet->setCellValue('Z' . $row, $item['shipment_city_name']);
             $row++;
             $row++;
         }
         }
         foreach (range('A', 'AB') as $column) {
         foreach (range('A', 'AB') as $column) {

+ 6 - 8
app/Jobs/Manager/Other/ExportViolationProductJobs.php

@@ -356,10 +356,9 @@ class ExportViolationProductJobs implements ShouldQueue
         $sheet->setCellValue('S2', '公司省');
         $sheet->setCellValue('S2', '公司省');
         $sheet->setCellValue('T2', '公司市');
         $sheet->setCellValue('T2', '公司市');
         $sheet->setCellValue('U2', '处理状态');
         $sheet->setCellValue('U2', '处理状态');
-        $sheet->setCellValue('V2', '任务状态');
-        $sheet->setCellValue('W2', '记录时间');
-        $sheet->setCellValue('X2', '店铺省');
-        $sheet->setCellValue('Y2', '店铺市');
+        $sheet->setCellValue('V2', '记录时间');
+        $sheet->setCellValue('W2', '店铺省');
+        $sheet->setCellValue('X2', '店铺市');
 
 
         //平台0=全部,1=淘宝,2=京东,3=拼多多,4=美团,5=药师帮,6=1药城,7=药九九,8=药易购,9=药帮忙,10=熊猫药药11=药房网
         //平台0=全部,1=淘宝,2=京东,3=拼多多,4=美团,5=药师帮,6=1药城,7=药九九,8=药易购,9=药帮忙,10=熊猫药药11=药房网
         $platform_data = [
         $platform_data = [
@@ -410,10 +409,9 @@ class ExportViolationProductJobs implements ShouldQueue
             $sheet->setCellValue('S' . $row, $item['province_name']);
             $sheet->setCellValue('S' . $row, $item['province_name']);
             $sheet->setCellValue('T' . $row, $item['city_name']);
             $sheet->setCellValue('T' . $row, $item['city_name']);
             $sheet->setCellValue('U' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
             $sheet->setCellValue('U' . $row, isset($processing_status_text[$item['processing_status']]) ? $processing_status_text[$item['processing_status']] : '');
-            $sheet->setCellValue('V' . $row, isset($status_text[$item['status']]) ? $status_text[$item['status']] : '');
-            $sheet->setCellValue('W' . $row, date('Y-m-d H:i:s', $item['insert_time']));
-            $sheet->setCellValue('X' . $row, $item['shipment_province_name']);
-            $sheet->setCellValue('Y' . $row, $item['shipment_city_name']);
+            $sheet->setCellValue('V' . $row, date('Y-m-d H:i:s', $item['insert_time']));
+            $sheet->setCellValue('W' . $row, $item['shipment_province_name']);
+            $sheet->setCellValue('X' . $row, $item['shipment_city_name']);
             $row++;
             $row++;
         }
         }
         foreach (range('A', 'Z') as $column) {
         foreach (range('A', 'Z') as $column) {