diff --git a/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php b/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php index fb3a06a..487f37f 100644 --- a/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php +++ b/app/Admin/Actions/Exporter/OrderDeliveryDetailSheet.php @@ -32,7 +32,7 @@ class OrderDeliveryDetailSheet implements FromArray, WithStrictNullComparison, S '订单编号', '下单市场', '下单时间', - '订单配送费', + '订单配送费(元)', ]]; $data = $this->getData($this->params); $markets = MarketModel::getMarketArray(); diff --git a/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php b/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php index 27b6367..e06352b 100644 --- a/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php +++ b/app/Admin/Actions/Exporter/OrderDeliveryTotalSheet.php @@ -46,7 +46,7 @@ class OrderDeliveryTotalSheet implements FromArray, WithStrictNullComparison, Sh { $titles = [[ '配送人员', - '总配送费', + '总配送费(元)', ]]; $data = $this->getData($this->params); return array_merge($titles,$data); @@ -54,7 +54,11 @@ class OrderDeliveryTotalSheet implements FromArray, WithStrictNullComparison, Sh public function styles(Worksheet $sheet) { - $sheet->mergeCells('A1:B1'); + $sheet->mergeCells('A1:B1');// 合并 + // $sheet->getColumnDimension('A')->setWidth(100); // 列宽 不生效 + $sheet->getRowDimension(1)->setRowHeight(20); // 行高 + $sheet->getStyle('A1:B1')->getAlignment()->setVertical('center');// 垂直居中 + $sheet->getStyle('A1:B1')->getAlignment()->setHorizontal('center');// 水平居中 return [ 1 => ['font' => ['bold' => true,'size' => 12]], diff --git a/app/Admin/Repositories/v3/OrderDeliveryReport.php b/app/Admin/Repositories/v3/OrderDeliveryReport.php index 7bd77f0..cd4f6e8 100644 --- a/app/Admin/Repositories/v3/OrderDeliveryReport.php +++ b/app/Admin/Repositories/v3/OrderDeliveryReport.php @@ -63,7 +63,8 @@ class OrderDeliveryReport extends EloquentRepository ->join(EmployeesModel::TABLE_NAME,EmployeesModel::TABLE_NAME.'.id','=',Model::$tableName.'.horseman_id','left') ->where(Model::$tableName.'.type',1) ->where('shipping_type',1) - ->whereIn('state',Model::ORDER_STATE_FINISH); + ->whereIn('state',Model::ORDER_STATE_FINISH) + ->where(Model::$tableName.'.created_at','>=',strtotime('2020-10-01 00:00:00')); if($userId){ $model->where(EmployeesModel::TABLE_NAME.'.user_id',$userId);