借用列表与详情

app/mobile/controller/InvRequisitionController.php

@@ -2,6 +2,9 @@
 namespace app\mobile\controller;
 
 use app\common\controller\BaseController;
+use app\common\model\InvRequisitionAttachment;
+use app\common\model\InvRequisitionItem;
+use app\common\service\OssService;
 use app\common\traits\crud\CrudControllerTrait;
 use app\common\service\InvRequisitionService;
 use support\Request;
@@ -44,12 +47,35 @@ class InvRequisitionController extends BaseController
      * @param array $data
      * @return array
      */
-    // protected function indexFormat($data)
+     protected function indexFormat($data)
-    // {
+     {
-    //     if (isset($data['created_at']))
+         if (isset($data['created_at']))
-    //         $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
-    //     if (isset($data['updated_at']))
+         if (isset($data['updated_at']))
-    //         $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
-    //     return $data;
+         return $data;
-    // }
+     }
+
+    /**
+     * 详情页数据格式化
+     *
+     * @param array $data
+     * @return array
+     */
+     protected function showFormat($data)
+     {
+         if (isset($data['created_at']))
+             $data['created_at'] = date('Y-m-d H:i:s', $data['created_at']);
+         if (isset($data['updated_at']))
+             $data['updated_at'] = date('Y-m-d H:i:s', $data['updated_at']);
+         if (isset($data['id'])){
+             $data['item'] = InvRequisitionItem::where('requisition_id', $data['id'])->get();
+             $data['attachment'] = InvRequisitionAttachment::where('requisition_id', $data['id'])->get();
+             $oss = new OssService();
+             foreach ($data['attachment'] as $key => $value) {
+                 $data['attachment'][$key]['file_path_pull'] = $oss->generatePrivateUrl($value['file_path']);
+             }
+         }
+         return $data;
+     }
 }

config/route.php

@@ -646,6 +646,8 @@ Route::group('/mobile', function () {
         Route::any('/item/preset', [app\mobile\controller\InvItemController::class, 'preset']);
 
         // 物品领用申请
+        Route::any('/requisition/list', [app\mobile\controller\InvRequisitionController::class, 'index']);
+        Route::any('/requisition/show', [app\mobile\controller\InvRequisitionController::class, 'show']);
         Route::any('/requisition/apply', [app\mobile\controller\InvRequisitionController::class, 'apply']);
         Route::any('/requisition/update', [app\mobile\controller\InvRequisitionController::class, 'update']);