Merge branch 'master-bug-524' of wugg/phpstock into version1.5

app/admin/controller/Consult.php

@@ -1300,7 +1300,7 @@ class Consult extends Base
                 "sale_price"=>$info['sale_price'],
                 "cost_before_price"=>$info['sale_cost_fee'],
                 "cost_after_price"=>$cost_price,
-                "before_rate"=>round(($info['sale_price']-$info['total_fee'])/$info['sale_price'],2),
+                "before_rate"=>round(($info['origin_price']-$info['total_fee'])/$info['origin_price'],2),
                 "after_rate"=>round(($bargain_price-$info['total_fee'])/$bargain_price,2),
                 "after_price"=>$bargain_price,
                 "exam_info"=>"",
@@ -1921,10 +1921,21 @@ class Consult extends Base
         if ($zxNo !== "") {
             $where[] = ['zxNo','=',$zxNo];
         }
+        $bargainNo = isset($this->post['bargainNo']) && $this->post['bargainNo'] !== "" ? trim($this->post['bargainNo']) : "";
+        if ($bargainNo !== "") {
+            $where[] = ['bargainNo','=',$bargainNo];
+        }
+
+        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
+        if ($status!== "") {
+            $where[] = ['status','=',$status];
+        }
+
         $infoNo = isset($this->post['infoNo']) && $this->post['infoNo'] !== "" ? trim($this->post['infoNo']) : "";
         if ($infoNo !== "") {
             $where[] = ['infoNo','=',$infoNo];
         }
+
         $projectNo = isset($this->post['projectNo']) && $this->post['projectNo'] !== "" ? trim($this->post['projectNo']) : "";
         if ($projectNo !== "") {
             $zxlist = Db::name("consult_order")->where(["projectNo"=>$projectNo,"is_del"=>0,"is_project"=>1])->column
@@ -1936,6 +1947,15 @@ class Consult extends Base
             $bidinfo = Db::name("consult_info")->where([["pgNo","=",$pgNo],["is_del","=",0]])->column("infoNo");
             $where[] = ['infoNo','in',$bidinfo];
         }
+        $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start'] : "";
+        $end= isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] : "";
+        if($start!=""){
+            $where[]=["addtime",">=",date("Y-m-d H:i:s",$start)];
+        }
+        if($end!=""){
+            $where[]=["addtime","<=",date("Y-m-d H:i:s",$end)];
+        }
+
         $role=$this->checkRole();
         if(!empty($role['write'])){
             $where[]=["createrid","in",$role['write']];

app/admin/controller/Sale.php

@@ -401,8 +401,8 @@ class Sale extends Base
                 "supplierNo"=>$supplier['code'],
                 "addr"=>"",
                 "addrs_code"=>"",
-                "contactor"=>0,
-                "contactor_name"=>0,
+                "contactor"=>$data['order_type']==1? $supplier['personid']:$data['createrid'],
+                "contactor_name"=>$data['order_type']==1? $supplier['person']:$data['creater'],
                 "mobile"=>"",
                 "position"=>"",
                 "companyNo"=>$data['companyNo'],
@@ -416,6 +416,12 @@ class Sale extends Base
                 return false;
             }
         }else{
+            if($wsm['wsm_type']==2){
+                $wsm['contactor']=$data['createrid'];
+                $wsm['contactor_name']=$data['creater'];
+                $wsm['updatetime']=date("Y-m-d H:i:s");
+                Db::name("warehouse_info")->save($wsm);
+            }
             $wsm_code =$wsm['wsm_code'];
         }
 
@@ -2810,21 +2816,23 @@ class Sale extends Base
 
         }
         $role=$this->checkRole();
-        if(!empty($role['write'])){
-            $where[]=["a.apply_id","in",$role['write']];
+
+        if(!empty($role['write']) && $this->uid!=""){
+            // $where[]=["a.apply_id","in",$role['write']];
+            $condition ="n.contactor = {$this->uid} or a.apply_id in (".implode(',',$role['write']).")";
         }
         $count = Db::name('order_out')->alias('a')
             ->join("sale b", "b.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=b.customer_code", "left")
-            //->join("good n","n.good_code=b.good_code","left")
-            ->where($where)->count();
+            ->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
+            ->where($where)->where($condition)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
         $list = Db::name('order_out')->alias('a')->join("sale b", "b.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=b.customer_code", "left")
-            //->join("good n","n.good_code=b.good_code","left")
+            ->join("warehouse_info n","n.wsm_code=a.wsm_code","left")
             ->field("a.*,b.good_name,b.good_code,b.skuCode,b.supplierNo,b.customer_code,v.companyName,b.origin_price,b.sale_price,b.total_price")
-            ->where($where)->order("addtime desc")->page($page, $size)->select();
+            ->where($where)->where($condition)->order("addtime desc")->page($page, $size)->select();
         $data=[];
         foreach ($list as $value) {
             $wsmcode = Db::name("warehouse_info")->alias("k")->leftJoin("supplier c", "k.supplierNo=c.code")