提交

application/api/controller/Common.php

@@ -305,6 +305,7 @@ class Common extends Base
                     'price' => $price,
                 ];
                 $goods_data = [
+                    'goods_id' => isset($val['goods_id']) ? $val['goods_id'] : 0,
                     'goods_category_first' => $val['goods_category_first'],
                     'goods_category_id' => $val['goods_category_id'],
                     'goods_no' => $val['goods_no'],

application/common/service/ApproveService.php

@@ -8,11 +8,13 @@ use app\common\model\Approve;
 use app\common\model\ApproveApplyGoods;
 use app\common\model\ApproveEvectionPeerUser;
 use app\common\model\ApproveInfo;
+use app\common\model\ApproveInfoLog;
 use app\common\model\ApproveStockGoods;
 use app\common\model\ApproveUseGoods;
 use app\common\model\User;
 use think\Db;
 use think\Exception;
+use think\response\Json;
 
 /**
  * 审批服务类
@@ -310,7 +312,7 @@ class ApproveService
     public static function make($id, $params, $user, $type)
     {
         $userid = $user['userid'];
-        $approve = Approve::field('id,info_id,status,approve_flow,approve_time')
+        $approve = Approve::field('id,info_id,status,approve_flow,approve_user,approve_time')
             ->where('approve_user', $userid)
             ->where('is_deleted', CommonConstant::IS_DELETED_0)
             ->with([
@@ -436,7 +438,7 @@ class ApproveService
             $info->save($data);
 
             // 保存修改记录
-            self::create_approve_info_log($info, $result);
+            self::create_approve_info_log($approve,$info, $result);
             Db::commit();
         } catch (Exception $e) {
             except('出现错误：' . $e->getMessage(), 2, $e);
@@ -444,9 +446,15 @@ class ApproveService
         return true;
     }
 
-    public function create_approve_info_log($info, $params)
+    public function create_approve_info_log($approve,$info, $params)
     {
-
+        $data = [
+            'info_id'=>$info->id,
+            'user_id'=>$approve->approve_user,
+            'data'=>json_encode($info,JSON_UNESCAPED_UNICODE),
+        ];
+        ApproveInfoLog::create($data);
+        return true;
     }