cqp преди 3 седмици
родител
ревизия
d43e840760
променени са 3 файла, в които са добавени 66 реда и са изтрити 2 реда
  1. 36 1
      app/Service/ExportFileService.php
  2. 1 1
      app/Service/GiveOutService.php
  3. 29 0
      config/header/72.php

+ 36 - 1
app/Service/ExportFileService.php

@@ -4,6 +4,7 @@ namespace App\Service;
 
 use App\Exports\ExportOrder;
 use App\Model\Freight;
+use App\Model\GiveOut;
 use App\Model\Product;
 use App\Model\RevenueCost;
 use App\Model\RevenueCostTotal;
@@ -49,7 +50,7 @@ class ExportFileService extends Service
         self::type_four => '销货单统计表',
         self::type_five => '销售发票统计表',
         self::type_six => '回款单统计表',
-        self::type_seven => '发货单',
+        self::type_seven => '发放统计表',
         self::type_eight => '进销存报表',
         self::type_nine => '虚拟采购单',
         self::type_ten => '客户',
@@ -273,6 +274,35 @@ class ExportFileService extends Service
         return $this->saveExportData($return,$header);
     }
 
+    public function seven($ergs,$user){
+        $id = $ergs['id'];
+
+        // 导出数据
+        $return = [];
+        $header_default = config("header.72") ?? [];
+        $column = array_column($header_default,'key');
+        $header = array_column($header_default,'value');
+        DB::table('give_out')
+            ->where('del_time',0)
+            ->whereIn('id', $id)
+            ->select(GiveOut::$field)
+            ->orderBy('id','desc')
+            ->chunkById(500,function ($data) use(&$return, $column){
+                $data = Collect($data)->map(function ($object) {
+                    return (array)$object;
+                })->toArray();
+                $list['data'] = $data;
+
+                //订单数据
+                $service = new GiveOutService();
+                $list = $service->fillData($list);
+
+                $this->fillData($list['data'], $column, $return);
+            });
+
+        return $this->saveExportData($return,$header);
+    }
+
     public function getListForSearch($ergs, $user){
         $data = $ergs['order_search'];
         $id = [];
@@ -311,6 +341,11 @@ class ExportFileService extends Service
             if(! $status) return [false, $model];
             $return = $this->limitData($model,'',$data);
             $id = array_column($return,'order_id');
+        }elseif ($ergs['type'] == self::type_seven){
+            $service = new GiveOutService();
+            $model = $service->giveOutCommon($data, $user, ['id']);
+            $return = $this->limitData($model,'',$data);
+            $id = array_column($return,'id');
         }
 
         return [true, $id];

+ 1 - 1
app/Service/GiveOutService.php

@@ -168,7 +168,7 @@ class GiveOutService extends Service
             $start = $value['start_time'] ? date('Y-m-d',$value['start_time']) : '';
             $end = $value['end_time'] ? date('Y-m-d',$value['end_time']) : '';
             $string = "";
-            if(! empty($start) && ! empty($end)) $string = $start . "-" . $end;
+            if(! empty($start) && ! empty($end)) $string = $start . "|" . $end;
             $data['data'][$key]['belong_time'] = $string;
         }
 

+ 29 - 0
config/header/72.php

@@ -0,0 +1,29 @@
+<?php
+/**
+ * '菜单ID' => [
+ *     '字段英文名' =》 '字段中文名'
+ * ]
+ */
+
+return [
+    [
+        'key' =>'employee_id_1_title',
+        'value' => '业务人员名',
+    ],
+    [
+        'key' =>'send_time',
+        'value' => '发放日期',
+    ],
+    [
+        'key' =>'belong_time',
+        'value' => '归属日期',
+    ],
+    [
+        'key' =>'give_out_amount',
+        'value' => '分红已发放金额',
+    ],
+    [
+        'key' =>'mark',
+        'value' => '备注',
+    ],
+];