ad

app/admin/controller/Project.php

@@ -123,6 +123,16 @@ class Project extends Base
                         }
 
                     }
+                    //修改状态，添加待办
+                    ActionLog::logAdd($this->post['token'], [
+                        "order_code" => $projectNo,//项目编码
+                        "status" =>0,//这里的status是之前的值
+                        "action_remark" => '',//备注
+                        "action_type" => "edit"//新建create，编辑edit更改状态status
+                    ], "PRT", 1, $this->post);
+
+                    $process = ["order_code" => $projectNo, "order_id" => Db::name("project")->getLastInsID(), "order_status" =>1, "order_type" => 'PRT',"before_status"=>1];//order_status==7修改毛利率
+                    ProcessOrder::AddProcess($this->post['token'], $process);
                         //修改状态，添加待办，只记录动作
                         ActionLog::logAdd($this->post['token'], [
                             "order_code" => $projectNo,//编码,这里是project的编码
@@ -925,18 +935,6 @@ class Project extends Base
         $info['updatetime']=date("Y-m-d H:i:s");
         $up =Db::name("project")->save($info);
         if($up){
-
-            //修改状态，添加待办
-            ActionLog::logAdd($this->post['token'], [
-                "order_code" => $projectNo,//项目编码
-                "status" =>0,//这里的status是之前的值
-                "action_remark" => '',//备注
-                "action_type" => "edit"//新建create，编辑edit更改状态status
-            ], "PRT", 1, $info);
-
-            $process = ["order_code" => $projectNo, "order_id" => $info['id'], "order_status" =>1, "order_type" => 'PRT',"before_status"=>1];//order_status==7修改毛利率
-            ProcessOrder::AddProcess($this->post['token'], $process);
-
             return app_show(0,"利润率修改成功");
         }else{
             return error_show(1004,"利润率修改失败");

app/admin/controller/Proorder.php

@@ -64,7 +64,7 @@ public function waitlist(){
     $total = ceil("$count/$size");
     $page = $page>$total ? $total:$page;
     $list = Db::name('process_wait')->alias("a")->leftJoin("workflow b","a.order_type=b.order_type and a.order_code=b.order_code")
-        ->field("a.wait_id apply_id,a.wait_name apply_name,a.addtime,a.action_uid,a.action_name,a.order_status,a.order_type,a.order_process,a.order_code,a.order_id,a.id")
+        ->field("b.apply_id,b.apply_name,a.addtime,a.action_uid,a.action_name,a.order_status,a.order_type,a.order_process,a.order_code,a.order_id,a.id")
         ->where($where)->where($comd)->page($page,$size)->order("a.addtime desc")->select();
     $data=[];//->field("status,order_name,process_name")
     foreach ($list as $value) {