提交

application/api/controller/Approve.php

@@ -127,7 +127,7 @@ class Approve extends Base
     public function audit()
     {
         $id = input('approve_id');
-        $status = input('status');
+        $status = input('status',0);
         $remark = input('remark','');
         $params = compact("id", "status", "remark");
         $user = $this->user;

application/api/controller/Approveflow.php

@@ -2,6 +2,7 @@
 
 namespace app\api\controller;
 
+use app\common\constant\CommonConstant;
 use app\common\service\ApproveFlowService;
 use hg\apidoc\annotation as Apidoc;
 
@@ -43,7 +44,7 @@ class Approveflow extends Base
         $flow_item = input('flow_item');
         $user = $this->user;
         $data = ApproveFlowService::get_data($module, $flow_item,$user);
-        $this->success('获取审批流程', $data);
+        $this->success(CommonConstant::get_module_list()[$module] .'审批流程', $data);
     }
 
 }

application/common/service/ApproveInfoService.php

@@ -33,7 +33,13 @@ class ApproveInfoService
     public static function create($id, $module, $params, $user)
     {
         $userid = $user['userid'];
-        $apply_user_id = $params['apply_user_id'] ? $params['apply_user_id']: 0;
+        $apply_user_id = $params['apply_user_id'] ? $params['apply_user_id']: '';
+
+        // 发起人信息
+        $apply_user = User::field('userid,department')->where('userid',$apply_user_id)->find();
+        if(!$apply_user){
+            except('发起人信息不存在或已删除');
+        }
 
         // 编辑
         if ($id > 0) {
@@ -63,7 +69,7 @@ class ApproveInfoService
             'module' => $module,
             'user_id' => $userid,
             'apply_user_id' => $apply_user_id,
-            'department' => $user['department'], // TODO 发起人的部门
+            'department' => $apply_user['department'],
             'status' => CommonConstant::STATUS_2,
             'approve_num' => $approve_num,
             'cur_num' => 0,
@@ -99,7 +105,8 @@ class ApproveInfoService
 
                 // 添加对应模块
                 $module_data = self::create_module($info_id, $module, $params, [], 'create');
-                $info->save(['module_id' => $module_data->id]);
+                $info->module_id = $module_data->id;
+                $info->save();
 
                 // 添加审批抄送
                 self::create_approve($info_id, $approve_user, $copy_user, 'create');

application/common/validate/ApproveCar.php

@@ -13,6 +13,7 @@ class ApproveCar extends Validate
      * 验证规则
      */
     protected $rule = [
+        'apply_user_id' => 'require',
         'reason' => 'require',
         'start_time' => 'require',
         'reach_address' => 'require',
@@ -27,8 +28,8 @@ class ApproveCar extends Validate
      * 验证场景
      */
     protected $scene = [
-        'create' => ['reason', 'start_time', 'reach_address', 'approve_user'],
-        'update' => ['reason', 'start_time', 'reach_address', 'approve_user'],
+        'create' => ['apply_user_id','reason', 'start_time', 'reach_address', 'approve_user'],
+        'update' => ['apply_user_id','reason', 'start_time', 'reach_address', 'approve_user'],
         'edit' => ['reason', 'start_time', 'reach_address'],
     ];
 
@@ -42,13 +43,14 @@ class ApproveCar extends Validate
     public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->field = [
+            'apply_user_id.require' => '请选择发起人',
             'reason' => '出发地点',
             'start_time' => '出发时间',
             'reach_address' => '到达地点',
             'approve_user' => '审批人',
         ];
         $this->message = array_merge($this->message, [
-
+            'apply_user_id.require' => '请选择发起人',
         ]);
         parent::__construct($rules, $message, $field);
     }

application/common/validate/ApproveEvection.php

@@ -13,6 +13,7 @@ class ApproveEvection extends Validate
      * 验证规则
      */
     protected $rule = [
+        'apply_user_id' => 'require',
         'reason' => 'require',
         'start_time' => 'require',
         'end_time' => 'require|check_end_time',
@@ -30,8 +31,8 @@ class ApproveEvection extends Validate
      * 验证场景
      */
     protected $scene = [
-        'create' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
-        'update' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
+        'create' => ['apply_user_id','reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
+        'update' => ['apply_user_id','reason', 'start_time', 'end_time', 'type', 'is_who', 'remark', 'approve_user'],
         'edit' => ['reason', 'start_time', 'end_time', 'type', 'is_who', 'remark'],
     ];
 
@@ -45,6 +46,7 @@ class ApproveEvection extends Validate
     public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->field = [
+            'apply_user_id' => '发起人',
             'reason' => '事由',
             'start_time' => '出差开始时间',
             'end_time' => '出差结束时间',
@@ -54,6 +56,7 @@ class ApproveEvection extends Validate
             'approve_user' => '审批人',
         ];
         $this->message = array_merge($this->message, [
+            'apply_user_id.require' => '请选择发起人',
             'start_time.check_start_time' => '出差开始时间必须大于当前时间',
             'end_time.check_end_time' => '出差结束时间必须大于开始时间',
             'type.in' => '请选择正确的出差类型',

application/common/validate/ApproveLeave.php

@@ -13,6 +13,7 @@ class ApproveLeave extends Validate
      * 验证规则
      */
     protected $rule = [
+        'apply_user_id' => 'require',
         'type' => 'require|gt:0',
         'start_time' => 'require',
         'end_time' => 'require|check_end_time',
@@ -31,8 +32,8 @@ class ApproveLeave extends Validate
      * 验证场景
      */
     protected $scene = [
-        'create' => ['type', 'start_time', 'end_time', 'start_am', 'end_am', 'time', 'reason', 'approve_user'],
-        'update' => ['type', 'start_time', 'end_time', 'start_am', 'end_am', 'time', 'reason', 'approve_user'],
+        'create' => ['apply_user_id','type', 'start_time', 'end_time', 'start_am', 'end_am', 'time', 'reason', 'approve_user'],
+        'update' => ['apply_user_id','type', 'start_time', 'end_time', 'start_am', 'end_am', 'time', 'reason', 'approve_user'],
         'edit' => ['type', 'start_time', 'end_time', 'start_am', 'end_am', 'time', 'reason'],
     ];
 
@@ -46,6 +47,7 @@ class ApproveLeave extends Validate
     public function __construct(array $rules = [], $message = [], $field = [])
     {
         $this->field = [
+            'apply_user_id' => '发起人',
             'type' => '请假类型',
             'start_time' => '请假开始时间',
             'end_time' => '请假结束时间',
@@ -56,6 +58,7 @@ class ApproveLeave extends Validate
             'approve_user' => '审批人',
         ];
         $this->message = array_merge($this->message, [
+            'apply_user_id.require' => '请选择发起人',
             'type.gt' => '请选择正确的请假类型',
             'start_time.check_start_time' => '请假开始时间必须大于今天',
             'end_time.check_end_time' => '请假结束时间必须大于开始时间',