胡庆余堂

app/Exports/SingleSheetExport.php

@@ -110,15 +110,34 @@ class SingleSheetExport extends DefaultValueBinder implements
                 $sheet->getStyle('A2')->getFont()->setName('宋体');
 
                 // --- 第三行：描述语 + Sheet名 ---
-                $sheet->mergeCells('A3:U3');
+                if($this->type == 1){
+                    $sheet->mergeCells('A3:J3');
+                }else{
+                    $sheet->mergeCells('A3:N3');
+                }
+
                 $sheet->setCellValue('A3', $c['desc']);
                 $sheet->getStyle('A3')->getFont()->setName('宋体');
 
-                $sheet->mergeCells('W3:Y3');
-                $sheet_name = str_replace('合计','',$this->sheetName);
-                $sheet->setCellValue('W3', $sheet_name);
-                $sheet->getStyle('W3')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_RIGHT);
-                $sheet->getStyle('W3')->getFont()->setName('宋体');
+//                $sheet->mergeCells('W3:Y3');
+//                $sheet_name = str_replace('合计','',$this->sheetName);
+//                $sheet->setCellValue('W3', $sheet_name);
+//                $sheet->getStyle('W3')->getAlignment()->setHorizontal(Alignment::HORIZONTAL_RIGHT);
+//                $sheet->getStyle('W3')->getFont()->setName('宋体');
+
+                $sheet_name = str_replace('合计', '', $this->sheetName);
+                $highestColumn = $sheet->getHighestColumn(); // 获取当前数据最大的列标，例如 'Z'
+
+                // 直接在第 3 行的最右侧单元格写入
+                $sheet->setCellValue($highestColumn . '3', $sheet_name);
+
+                // 设置样式：右对齐，确保文字靠边
+                $sheet->getStyle($highestColumn . '3')->applyFromArray([
+                    'font' => ['name' => '宋体'],
+                    'alignment' => [
+                        'horizontal' => Alignment::HORIZONTAL_RIGHT,
+                    ],
+                ]);
 
                 foreach ($this->columns as $index => $colKey) {
                     if (isset($this->timeRow[$colKey]) && $this->timeRow[$colKey] !== '') {

app/Service/ExportFileService.php

@@ -242,7 +242,7 @@ class ExportFileService extends Service
         }
 
         // 3. 调用保存方法
-        return [true, $this->saveExportData2($finalExportData,2,$column,$timeRow)];
+        return [true, $this->saveExportData2($finalExportData,1,$column,$timeRow)];
     }
 
     public function six($ergs,$user){