wugg 2 роки тому
батько
коміт
68f76212af
1 змінених файлів з 5 додано та 6 видалено
  1. 5 6
      app/admin/model/Workflow.php

+ 5 - 6
app/admin/model/Workflow.php

@@ -13,6 +13,9 @@ class Workflow extends \think\Model
     {
         parent::__construct($data);
         self::$conf=Config::get("process");
+    }
+
+    public static function SaveFlow($data){
         $conf =self::$conf;
         $action = isset($conf[$data['order_type']]) ? $conf[$data['order_type']]:[];
         $last =end($action);
@@ -25,10 +28,6 @@ class Workflow extends \think\Model
         if((is_array($header)&&in_array($data['action_process'],$header))||$header==$data['action_process']){
             self::$order_status=1; //流程新建
         }
-    }
-
-    public static function SaveFlow($data){
-
         $proces = self::where(["order_type"=>$data['order_type'],"order_code"=>$data['order_code'],"is_del"=>0])->find();
         if($proces){
             $info=[
@@ -87,8 +86,8 @@ class Workflow extends \think\Model
                     "order_id"=>$data['order_id'],
                     "order_process"=>$wait,
                     "order_status"=>$data['action_process'],
-                    "apply_id"=>$data['action_uid'],
-                    "apply_name"=>$data['action_name'],
+                    "wait_id"=>$data['action_uid'],
+                    "wait_name"=>$data['action_name'],
                     "action_uid"=>$orderp['uid'],
                     "action_name"=>$orderp['uname'],
                     "status"=>self::$order_status==3?2:1,