提交

application/api/controller/Approve.php

@@ -175,7 +175,7 @@ class Approve extends Base
         $id = input('approve_id') ?: 0;
         $feedback = input('feedback') ?: '';
         $feedback_images = input('feedback_images') ?: '';
-        $params = compact("id", "feedback", "feedback_images");
+        $params = compact("feedback", "feedback_images");
         $user = $this->user;
         ApproveService::make($id, $params, $user, 'feedback');
         $this->success('提交成功');

application/common/model/GoodsUseLog.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace app\common\model;
+
+use think\Model;
+
+/**
+ * 商品出库记录模型
+ */
+class GoodsUseLog extends Model
+{
+    // 表名
+    protected $name = 'goods_use_log';
+
+    // 追加属性
+    protected $append = [
+
+    ];
+
+}

application/common/service/ApproveInfoService.php

@@ -40,16 +40,18 @@ class ApproveInfoService
         $apply_user_id = $userid;
         $department = $user['department'];
 
-        // 5=出差申请,6=请假申请,7=用车申请 申请人信息
+        // 5=出差申请,6=请假申请,7=用车申请 申请人信息 提交人和申请人不是同一人
         if (in_array($module, [CommonConstant::MODULE_5, CommonConstant::MODULE_6, CommonConstant::MODULE_7])) {
-            $apply_user = User::field('userid,department')
-                ->where('userid', $params['apply_user_id'])
-                ->find();
-            if (!$apply_user) {
-                except('申请人信息不存在或已删除');
+            if($userid != $params['apply_user_id']){
+                $apply_user = User::field('userid,department')
+                    ->where('userid', $params['apply_user_id'])
+                    ->find();
+                if (!$apply_user) {
+                    except('申请人信息不存在或已删除');
+                }
+                $apply_user_id = $apply_user['userid'];
+                $department = $apply_user['department'];
             }
-            $apply_user_id = $apply_user['userid'];
-            $department = $apply_user['department'];
         }
 
         // 重新发起

application/common/service/ApproveService.php

@@ -447,9 +447,9 @@ class ApproveService
                     except('您没有权限操作');
                 }
                 // TODO 没有判断反馈状态
-
+            
                 $params['maintain_user_id'] = $info->maintain_user_id;
-                $params['comment_status'] = CommonConstant::IS_WHO_1;
+                $params['feedback_status'] = CommonConstant::IS_WHO_1;
                 self::feedback($info, $params);
                 break;
         }
@@ -474,7 +474,7 @@ class ApproveService
 
         if ($status == CommonConstant::STATUS_3) {
             if ($info->module == CommonConstant::MODULE_3) {
-                // 入库商品列表 TODO
+                // 入库商品列表
                 $goods = $info->stock_goods;
                 if (!$goods->toArray()) {
                     except('入库商品不存在');
@@ -541,10 +541,6 @@ class ApproveService
                             GoodsStockLog::insertAll($goodsStockLog);
                         }
                     }
-                    if ($info->module == CommonConstant::MODULE_4) {
-                        // 领用商品列表
-
-                    }
                 }
             }
             if ($status == CommonConstant::STATUS_4) {
@@ -637,9 +633,8 @@ class ApproveService
     public static function feedback($info, $params)
     {
         try {
-            $data = $params;
             // 更新维修信息
-            ApproveMaintain::where('info_id', $info->id)->update($data);
+            ApproveMaintain::where('info_id', $info->id)->update($params);
         } catch (Exception $e) {
             except('出现错误：' . $e->getMessage());
         }