提交

application/api/controller/Approveinfo.php

@@ -397,6 +397,10 @@ class Approveinfo extends Base
      *          @Apidoc\Returned("avatar", type="string", desc="头像地址"),
      *      ),
      * )
+     * @Apidoc\Returned("department_data", type="array", desc="申请人所在部门列表",
+     *     @Apidoc\Returned("dept_id", type="string", desc="部门ID"),
+     *     @Apidoc\Returned("name", type="string", desc="部门名称"),
+     * )
      * @Apidoc\Returned("create_user", type="object", desc="提交人信息",
      *     @Apidoc\Returned("userid", type="string", desc="用户userid"),
      *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
@@ -407,14 +411,6 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
      *     @Apidoc\Returned("avatar", type="string", desc="头像地址"),
      * )
-     * @Apidoc\Returned("department_data", type="array", desc="所在部门列表",
-     *     @Apidoc\Returned("dept_id", type="string", desc="部门ID"),
-     *     @Apidoc\Returned("name", type="string", desc="部门名称"),
-     * )
-     * @Apidoc\Returned("contract", type="array", desc="关联的合同呈批申请 module=1",
-     *     @Apidoc\Returned("id", type="integer", desc="ID"),
-     *     @Apidoc\Returned("reason", type="string", desc="合同编号"),
-     * )
      * @Apidoc\Returned("apply_goods", type="array", desc="申购商品列表 module=1 && type=1",
      *     @Apidoc\Returned("id", type="integer", desc="申购商品ID"),
      *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
@@ -436,6 +432,14 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("info_id", type="integer", desc="申请ID"),
      *     @Apidoc\Returned("name", type="string", desc="姓名"),
      * )
+     * @Apidoc\Returned("contract", type="array", desc="关联的合同呈批申请 module=1",
+     *     @Apidoc\Returned("id", type="integer", desc="ID"),
+     *     @Apidoc\Returned("order_no", type="string", desc="审批编号"),
+     * )
+     * @Apidoc\Returned("apply", type="array", desc="关联的合同呈批申请 module=3 && apply_id > 0",
+     *     @Apidoc\Returned("id", type="integer", desc="ID"),
+     *     @Apidoc\Returned("reason", type="string", desc="合同编号"),
+     * )
      */
     public function get_detail()
     {
@@ -497,6 +501,10 @@ class Approveinfo extends Base
      *     @Apidoc\Returned("name", type="string", desc="用户姓名"),
      *     @Apidoc\Returned("desc", type="string", desc="备注"),
      * )
+     * @Apidoc\Returned("apply", type="array", desc="关联的合同呈批申请 module=3 && apply_id > 0",
+     *     @Apidoc\Returned("id", type="integer", desc="ID"),
+     *     @Apidoc\Returned("reason", type="string", desc="合同编号"),
+     * )
      **/
     public function get_info()
     {

application/common/service/ApproveInfoService.php

@@ -1060,7 +1060,7 @@ class ApproveInfoService
                         }
                     }
 
-                    $info['contract'] = [];
+                    $contract = [];
                     if ($type == 'detail') {
                         // 关联的合同呈批申请
                         $contract = ApproveInfo::field('id,reason')
@@ -1078,6 +1078,18 @@ class ApproveInfoService
                     } else {
                         $info->stock_goods;
                     }
+
+                    // 关联的采购审批单
+                    $apply = null;
+                    if($info['apply_id']>0){
+                        $apply = ApproveInfo::field('id,order_no')
+                            ->where('module', CommonConstant::MODULE_1)
+                            ->where('status', CommonConstant::STATUS_3)
+                            ->where('is_deleted', CommonConstant::IS_DELETED_0)
+                            ->find($info['apply_id']);
+                    }
+
+                    $info['apply'] = $apply;
                     break;
                 case CommonConstant::MODULE_4:
                     if ($type == 'detail') {