ko

app/admin/controller/Proorder.php

@@ -55,7 +55,7 @@ public function waitlist(){
     $where = [['is_del',"=",0]];
     $order_code= isset($this->post['order_code']) && $this->post['order_code'] !==""? intval($this->post['order_code']):"";
     if($order_code!=""){
-        $where[]= ["order_code",'like',"%order_code%"];
+        $where[]= ["order_code",'like',"%$order_code%"];
     }
     $apply_id = isset($this->post['apply_id']) && $this->post['apply_id'] !==""? trim($this->post['apply_id']) :"";
     if($apply_id!=""){
@@ -69,16 +69,18 @@ public function waitlist(){
     $total = ceil("$count/$size");
     $page = $page>$total ? $total:$page;
     $list = Db::name("workflow")
-        ->field("apply_id,apply_name,addtime,action_uid,action_name,order_status,order_type")
+        ->field("apply_id,apply_name,addtime,action_uid,action_name,order_status,order_type,order_process,order_code")
         ->where($where)->page($page,$size)->order("addtime desc")->select();
-    $data=[];
+    $data=[];//->field("status,order_name,process_name")
     foreach ($list as $value) {
-        $str = Db::name("process_order")->where(['order_type' => $value['order_type']])->find();
-        $value['order_code'] = $str['order_code'];
-        $value['action_process'] = $str['action_process'];
-        $data[] = $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']])->find();
+        $value['process_name']=$str['process_name'];
+        $value['order_name']=$var['order_name'];
+        $value['status']=$str['status'];
+        $data[]=$value;
     }
-    return app_show(0,"获取成功",['count'=>$count,"list"=>$data]);
+    return app_show(0,"获取成功",["list"=>$data,'count'=>$count]);
 }
 public function all(){
     $token = isset($this->post['token']) ? trim($this->post['token']) : "";

app/admin/controller/Purchin.php

@@ -32,6 +32,14 @@ class Purchin extends BaseController
         if($apply_name!=""){
             $where[]=['a.apply_name','like',"%$apply_name%"];
         }
+        $apply_id= isset($this->post['apply_id']) && $this->post['apply_id'] !==""? trim($this->post['apply_id']):"";
+        if($apply_id!=""){
+            $where[]=['a.apply_id','=',$apply_id];
+        }
+        $status= isset($this->post['status']) && $this->post['status'] !==""? trim($this->post['status']):"";
+        if($status!=""){
+            $where[]=['a.status','=',$status];
+        }
         $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start']:"";
         if ($start !="") {
             $where[]= ["a.sendtime",'>=',$start];
@@ -52,9 +60,9 @@ class Purchin extends BaseController
         if($good_name !=""){
             $where[]= ["b.good_name",'like',"%$good_name%"];
         }
-        $supplierNo=isset($this->post['supplierNo']) && $this->post['supplierNo']!==""? trim($this->post['supplierNo']):"";
-        if($supplierNo !=""){
-            $where[]= ["b.supplierNo",'like',"%$supplierNo%"];
+        $supplie=isset($this->post['supplier']) && $this->post['supplier']!==""? trim($this->post['supplier']):"";
+        if($supplie !=""){
+            $where[]= ["b.supplierNo",'like',"%$supplie%"];
         }
         $wsm_code=isset($this->post['wsm_code']) && $this->post['wsm_code']!==""? trim($this->post['wsm_code']):"";
         if($wsm_code !=""){
@@ -77,7 +85,7 @@ class Purchin extends BaseController
         $list = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
             ->where($where)->page($page,$size)
             ->field("a.apply_name,a.sendtime,b.order_type,a.status,a.cgdNo,a.wsm_in_code,b.good_name,a.send_num,a.wsm_code,b.good_name,b.good_code,
-            a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid")
+            a.post_company,a.post_code,a.post_fee,a.apply_id,a.wsm_num,a.error_num,a.wait_num,a.status,a.check_name,a.checkid,b.bkcode")
             ->order("a.addtime desc")->select();
         $data=[];
         foreach ($list as $value){