1

application/api/controller/Evection.php

@@ -115,7 +115,7 @@ class Evection extends Base
             if($flow_key !== false && $flow_key >= $fk) continue;
             $flow_num++;
             $flow_data[] = [
-                'eve_id' => $flow_info->id,
+                'info_id' => $flow_info->id,
                 'approve_user' => $fv['user_id'],
                 'flow'   =>$flow_num,
                 'create_at'=>date('Y-m-d H:i:s'),
@@ -126,7 +126,7 @@ class Evection extends Base
         foreach ($copy as $ck=>$cv) {
             if($copy_key !== false && $copy_key >= $ck) continue;
             $flow_data[] = [
-                'eve_id' => $flow_info->id,
+                'info_id' => $flow_info->id,
                 'approve_user' => $cv['user_id'],
                 'approve_type'   =>2
             ];
@@ -248,7 +248,7 @@ class Evection extends Base
             ->alias('p')
             ->where(['p.approve_user'=>$this->user_id])
             ->where('p.status','>','0')
-            ->leftJoin('EvectionInfo i','p.eve_id = i.id')
+            ->leftJoin('EvectionInfo i','p.info_id = i.id')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){

application/api/controller/UserLeave.php

@@ -135,7 +135,7 @@ class UserLeave extends Base
             if($flow_key !== false && $flow_key >= $fk) continue;
             $flow_num++;
             $flow_data[] = [
-                'leave_id' => $flow_info->id,
+                'info_id' => $flow_info->id,
                 'approve_user' => $fv['user_id'],
                 'flow'   =>$flow_num,
                 'create_at'=>date('Y-m-d H:i:s'),
@@ -146,7 +146,7 @@ class UserLeave extends Base
         foreach ($copy as $ck=>$cv) {
             if($copy_key !== false && $copy_key >= $ck) continue;
             $flow_data[] = [
-                'leave_id' => $flow_info->id,
+                'info_id' => $flow_info->id,
                 'approve_user' => $cv['user_id'],
                 'approve_type'   =>2
             ];
@@ -271,7 +271,7 @@ class UserLeave extends Base
             ->alias('p')
             ->where(['p.approve_user'=>$this->user_id])
             ->where('p.status','>','0')
-            ->leftJoin('LeaveInfo i','p.leave_id = i.id')
+            ->leftJoin('LeaveInfo i','p.info_id = i.id')
             ->limit($this->off_set,$this->page_num)
             ->select()->toArray();
         array_walk($list,function (&$v){

application/common/model/EvectionInfo.php

@@ -7,9 +7,9 @@ class EvectionInfo extends Model
 
     public function approveList()
     {
-        return $this->hasMany('EvectionApprove','eve_id','id')
+        return $this->hasMany('EvectionApprove','info_id','id')
             ->where('approve_type',1)
-            ->field('l.id,l.status,l.approve_time,l.approve_user,l.eve_id,l.remark,l.time,u.name user_name,headimg')
+            ->field('l.id,l.status,l.approve_time,l.approve_user,l.info_id,l.remark,l.time,u.name user_name,headimg')
             ->alias('l')
             ->leftJoin('StoreMember u','u.id = l.approve_user')
             ->order('id asc');

application/common/model/LeaveInfo.php

@@ -6,9 +6,9 @@ class LeaveInfo extends Model
 {
     public function approveList()
     {
-        return $this->hasMany('LeaveApprove','leave_id','id')
+        return $this->hasMany('LeaveApprove','info_id','id')
             ->where('approve_type',1)
-            ->field('l.id,l.status,l.approve_time,l.approve_user,l.leave_id,l.remark,l.time,u.name user_name,headimg')
+            ->field('l.id,l.status,l.approve_time,l.approve_user,l.info_id,l.remark,l.time,u.name user_name,headimg')
             ->alias('l')
             ->leftJoin('StoreMember u','u.id = l.approve_user')
             ->order('id asc');

application/common/model/OfferInfo.php

@@ -0,0 +1,17 @@
+<?php
+namespace app\common\model;
+use think\Model;
+// 呈批申请
+class OfferInfo extends Model
+{
+    public function approveList()
+    {
+        return $this->hasMany('OfferApprove','info_id','id')
+            ->where('approve_type',1)
+            ->field('l.id,l.status,l.approve_time,l.approve_user,l.info_id,l.remark,l.time,u.name user_name,headimg')
+            ->alias('l')
+            ->leftJoin('StoreMember u','u.id = l.approve_user')
+            ->order('id asc');
+    }
+
+}

application/common/model/OfferType.php

@@ -0,0 +1,14 @@
+<?php
+namespace app\common\model;
+use think\Model;
+// 呈批类型
+class OfferType extends Model
+{
+    // 获取请假类型
+    public static function getAllType()
+    {
+        $all_cate = self::field('id,title,pid,lev')->where(['status'=>1,'is_deleted'=>0])->order('sort desc ,id desc')->select()->toArray();
+        return $all_cate;
+    }
+
+}

application/common/service/ApproveService.php

@@ -33,7 +33,7 @@ class ApproveService
         try {
             if(!in_array($status,[2,3]))throw new Exception('审批状态错误');
             $approve_info = LeaveApprove::where('id',$approve_id)->find()->toArray();
-            $leave_info  = LeaveInfo::where('id',$approve_info['leave_id'])->find()->toArray();
+            $leave_info  = LeaveInfo::where('id',$approve_info['info_id'])->find()->toArray();
             if($approve_info['approve_user'] != $user_id) throw new Exception('没有审核权限');
             if($approve_info['status'] == 0) throw new Exception('请等待审核');
             if($approve_info['status'] != 1) throw new Exception('该请假记录已审核');
@@ -51,7 +51,7 @@ class ApproveService
             $leave_data['cur_num'] = $leave_info['cur_num'] + 1;
             if($approve_info['flow'] < $leave_info['approve_num']){
                 // 更新下一级审批记录状态
-                LeaveApprove::where(['leave_id'=>$approve_info['leave_id'],'flow'=>$approve_info['flow'] + 1,'approve_type'=>1])->update(['status'=>1,'start_time'=>date('Y-m-d H:i:s')]);
+                LeaveApprove::where(['info_id'=>$approve_info['info_id'],'flow'=>$approve_info['flow'] + 1,'approve_type'=>1])->update(['status'=>1,'start_time'=>date('Y-m-d H:i:s')]);
                 if($status == 3) $leave_data['status'] = 3;
             } else if($approve_info['flow'] == $leave_info['approve_num']) {
                 $leave_data['status'] = $status;
@@ -130,7 +130,7 @@ class ApproveService
         try {
             if(!in_array($status,[2,3]))throw new Exception('审批状态错误');
             $approve_info =EvectionApprove::where('id',$approve_id)->find()->toArray();
-            $car_info  = EvectionInfo::where('id',$approve_info['eve_id'])->find()->toArray();
+            $car_info  = EvectionInfo::where('id',$approve_info['info_id'])->find()->toArray();
             if($approve_info['approve_user'] != $user_id) throw new Exception('没有审核权限');
             if($approve_info['status'] == 0) throw new Exception('请等待审核');
             if($approve_info['status'] != 1) throw new Exception('该请假记录已审核');
@@ -148,7 +148,7 @@ class ApproveService
             $Info_up['cur_num'] = $car_info['cur_num'] + 1;
             if($approve_info['flow'] < $car_info['approve_num']){
                 // 更新下一级审批记录状态
-                EvectionApprove::where(['eve_id'=>$approve_info['eve_id_id'],'flow'=>$approve_info['flow'] + 1,'approve_type'=>1])->update(['status'=>1,'start_time'=>date('Y-m-d H:i:s')]);
+                EvectionApprove::where(['info_id'=>$approve_info['info_id'],'flow'=>$approve_info['flow'] + 1,'approve_type'=>1])->update(['status'=>1,'start_time'=>date('Y-m-d H:i:s')]);
                 if($status == 3) $Info_up['status'] = 3;
             } else if($approve_info['flow'] == $car_info['approve_num']) {
                 $Info_up['status'] = $status;

application/leave/controller/LeaveInfo.php

@@ -130,7 +130,7 @@ class LeaveInfo extends Controller
             ->alias('r')
             ->field('r.*,u.name,u.phone,u.headimg')
             ->leftJoin('store_member u','u.id = r.approve_user')
-            ->where('r.leave_id',$id)
+            ->where('r.info_id',$id)
             ->order('r.id desc')->page(false);
         $this->assign('list',$list);
         $this->fetch();

application/synth/controller/Evection.php

@@ -130,7 +130,7 @@ class Evection extends Controller
             ->alias('r')
             ->field('r.*,u.name,u.phone,u.headimg')
             ->leftJoin('store_member u','u.id = r.approve_user')
-            ->where('r.eve_id',$id)
+            ->where('r.info_id',$id)
             ->order('r.id desc')->page(false);
         $this->assign('list',$list);
         $this->fetch();

application/synth/controller/Offer.php

@@ -130,7 +130,7 @@ class Offer extends Controller
             ->alias('r')
             ->field('r.*,u.name,u.phone,u.headimg')
             ->leftJoin('store_member u','u.id = r.approve_user')
-            ->where('r.eve_id',$id)
+            ->where('r.info_id',$id)
             ->order('r.id desc')->page(false);
         $this->assign('list',$list);
         $this->fetch();