ad

app/admin/controller/Proorder.php

@@ -22,12 +22,12 @@ public function list(){
     $total = ceil("$count/$size");
     $page = $page>$total ? $total:$page;
     $list = Db::name('process_order')->alias("a")->leftJoin("workflow b","a.order_type=b.order_type and a.order_code=b.order_code")
-        ->field("b.apply_id,b.apply_name,a.addtime,a.action_uid,a.action_name,a.order_status,a.order_type,a.action_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.action_status,a.order_type,a.action_process,a.order_code,a.order_id,a.id")
         ->where($where)->page($page,$size)->order("a.addtime desc")->select();
     $data=[];
     foreach ($list as $value){
         $str = Db::name("process")->where(['process_type' => $value['order_type']])->field("process_name,status")->find();
-        $var = Db::name("action_process")->where(['order_type'=>$value['order_type'],'order_process'=>$value['order_status']])->field("status_name,order_process,order_name,roleid")->find();
+        $var = Db::name("action_process")->where(['order_type'=>$value['order_type'],'order_process'=>$value['action_status']])->field("status_name,order_process,order_name,roleid")->find();
         $value['process_name']=$str['process_name'];
         $value['order_name']=$var['order_name'];
         $value['status_name'] = $var['status_name'];
@@ -61,7 +61,6 @@ public function waitlist(){
     foreach ($list as $value) {
         $str = Db::name("process")->where(['process_type' => $value['order_type']])->field("process_name,status")->find();
         $var = Db::name("action_process")->where(['order_type'=>$value['order_type'],'order_process'=>$value['order_status']])->field("status_name,order_process,order_name,roleid")->find();
-        $item = Db::name('role')->where(['id'=>$var['roleid']])->field("role_name")->find();
         $value['process_name']=$str['process_name'];
         $value['order_name']=$var['order_name'];
         $value['status_name'] = $var['status_name'];

app/admin/model/ProcessOrder.php

@@ -32,6 +32,7 @@ class ProcessOrder extends \think\Model
             "order_id"=>isset($order['order_id']) ?$order['order_id']:0 ,
             "order_status"=>$order_status,
             "action_process"=>$order['order_status'],
+            "action_status"=>$order['before_status'],
             "action_uid"=>$uid,
             "action_name"=>$name,
             "addtime"=>date("Y-m-d H:i:s")