Browse Source

微信小程序

cqp 3 weeks ago
parent
commit
80cdf490a6

+ 1 - 0
app/Service/DeviceWorkService.php

@@ -821,6 +821,7 @@ class DeviceWorkService extends Service
                 // 项目信息(由主表平铺而来)
                 'item_code'    => $mainItemInfo[$item->main_id]['item_code'] ?? '',
                 'item_title'   => $mainItemInfo[$item->main_id]['item_title'] ?? '',
+                'total_work_min' => $item->total_work_min,
             ];
 
             $res[$item->main_id][] = $detailRow;

+ 1 - 0
app/Service/PersonWorkService.php

@@ -813,6 +813,7 @@ class PersonWorkService extends Service
                 // 将主表的项目信息也塞进每一行详情里实现平铺
                 'item_code'       => $mainItemInfo[$item->main_id]['item_code'] ?? '',
                 'item_title'      => $mainItemInfo[$item->main_id]['item_title'] ?? '',
+                'total_work_min' => $item->total_work_min,
             ];
 
             $res[$item->main_id][] = $detailRow;

+ 11 - 0
config/excel/dailyDwOrder.php

@@ -90,5 +90,16 @@ return [
             'enums' => [],
             'comments' => '必填(如 9:00)'
         ],
+        [
+            'key' =>'total_work_min',
+            'export' =>'total_work_min',
+            'value' => '总工时(分)',
+            'required' => false,
+            'is_main' => false,
+            'default' => 0,
+            'unique' => false,
+            'enums' => [],
+            'comments' => '选填'
+        ],
     ]
 ];

+ 11 - 0
config/excel/dailyPwOrder.php

@@ -90,5 +90,16 @@ return [
             'enums' => [],
             'comments' => '必填(如 9:00)'
         ],
+        [
+            'key' =>'total_work_min',
+            'export' =>'total_work_min',
+            'value' => '总工时(分)',
+            'required' => false,
+            'is_main' => false,
+            'default' => 0,
+            'unique' => false,
+            'enums' => [],
+            'comments' => '选填'
+        ],
     ]
 ];