Merge branch 'master' of http://git.huaml.com/zhh/huahuibao

biz-ghs/product/services/ProductService.php

@@ -275,13 +275,6 @@ class ProductService extends BaseService
         $page = 0;
         $objPHPExcel->setActiveSheetIndex($page);
         foreach ($classIds as $k => $v) {
-            //if(($i%30==1|| $i%30==2 || $i%30==3 || $i%30==0  ) && $i >=30){
-            if ($i >= 30) {
-                $i = 1;
-                $page++;
-                $objPHPExcel->createSheet();
-                $objPHPExcel->setActiveSheetIndex($page);
-            }
             $productData = $data[$v['id']] ?? [];
             if (empty($productData)) {
                 continue;
@@ -295,7 +288,7 @@ class ProductService extends BaseService
             $i++;
 
             if ($productData) {
-                $newChunk = array_chunk($productData, 6); //6个一组
+                $newChunk = array_chunk($productData, 4); //6个一组
                 foreach ($newChunk as $c) {
 
                     foreach ($c as $ck => $cv) {
@@ -313,10 +306,10 @@ class ProductService extends BaseService
                         }
                         $objDrawing->setPath($p);
                         //$objDrawing->setHeight(130);//设置图片高度
-                        $objDrawing->setOffsetX(12);//设置图片水平偏移
+                        $objDrawing->setOffsetX(28);//设置图片水平偏移
                         //$objDrawing->setOffsetY(1);//设置图片垂直偏移
-                        $objPHPExcel->getActiveSheet()->getColumnDimension($title_array[$ck])->setWidth(15);
-                        $objPHPExcel->getActiveSheet()->getRowDimension($i)->setRowHeight(30);
+                        $objPHPExcel->getActiveSheet()->getColumnDimension($title_array[$ck])->setWidth(22);
+                        $objPHPExcel->getActiveSheet()->getRowDimension($i)->setRowHeight(66);
                         $objPHPExcel->getActiveSheet()->getStyle("{$title_array[$ck] }{$i}:{$title_array[$ck] }{$i}")->getAlignment()->setVertical(\PHPExcel_Style_Alignment::VERTICAL_CENTER);
                         $objDrawing->setCoordinates($title_array[$ck] . ($i));
                         $objDrawing->setWorksheet($objPHPExcel->getActiveSheet());
@@ -325,7 +318,12 @@ class ProductService extends BaseService
 
                     }
                     $i++;
-
+                    if($i >=18){
+                        $i = 1;
+                        $page ++;
+                        $objPHPExcel->createSheet();
+                        $objPHPExcel->setActiveSheetIndex($page);
+                    }
                 }
             }
         }