Merge branch 'version1.5' of ssh://192.168.10.210:10022/wugg/stock into version1.5

app/admin/controller/Customar.php

@@ -283,7 +283,8 @@ class Customar extends BaseController
         if ($id == "") {
             return error_show(1002, "参数id不能为空");
         }
-        $idinfo = Db::name('customer_info')->where(['id' => $id, 'is_del' => 0])->field("companyNo,companyName,itemid as parent")->find();
+        //>field("companyNo,companyName,itemid as parent,id")-
+        $idinfo = Db::name('customer_info')->where(['id' => $id, 'is_del' => 0])->find();
         if ($idinfo == "") {
             return error_show(1002, "未找到数据");
         }

app/admin/controller/Suppler.php

@@ -216,45 +216,56 @@ class Suppler extends BaseController
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
         $size = isset($this->post['size']) && $this->post['size'] !=="" ? intval($this->post['size']):"10";
-        $where =[['a.is_del',"=",0]];
+        $where =[['is_del',"=",0]];
         $name = isset($this->post['name']) && $this->post['name'] !=="" ? trim($this->post['name']):"";
         if($name !==""){
-            $where[]=["a.name","like","%$name%"];
+            $where[]=["name","like","%$name%"];
         }
         $creater = isset($this->post['creater']) && $this->post['creater'] !=="" ? trim($this->post['creater']):"";
         if($creater !==""){
-            $where[] = ["a.creater","like","%$creater%"];
+            $where[] = ["creater","like","%$creater%"];
+        }
+        $person = isset($this->post['person']) && $this->post['person'] !=="" ? trim($this->post['person']):"";
+        if($person !==""){
+            $where[] = ["person","like","%$person%"];
         }
         $status = isset($this->post['status']) && $this->post['status'] !=="" ? intval($this->post['status']):"";
         if($status!==""){
-            $where[]= ["a.status","=",$status];
+            $where[]= ["status","=",$status];
         }
         $start = isset($this->post['start']) && $this->post['start'] !== "" ?  $this->post['start']:"";
         if($start!==""){
-            $where[]=['a.addtime',">=",$start];
+            $where[]=['addtime',">=",$start];
         }
 //        $end = isset($this->post['end']) && $this->post['end'] !== "" ? $this->post['end'] :"";
 //        if($end !=""){
 //            $where[]=['a.addtime',"<=",$end];
 //        }
-        $contactor = isset($this->post['contactor']) && $this->post['contactor'] !==""? trim($this->post['contactor']):"";
-        if($contactor !=""){
-            $where[]=["b.contactor","like","%$contactor%"];
-        }
-        $mobile = isset($this->post['mobile']) && $this->post['mobile'] !=="" ? intval($this->post['mobile']):"";
-        if($mobile !=""){
-            $where[] = ['b.mobile',"like","%$mobile%"];
-        }
-        $count = Db::name('supplier')->alias("a")
-            ->join("supplier_contact b","b.code=a.code","left")
-            ->where($where)->count();
+//        $contactor = isset($this->post['contactor']) && $this->post['contactor'] !==""? trim($this->post['contactor']):"";
+//        if($contactor !=""){
+//            $where[]=["contactor","like","%$contactor%"];
+//        }
+//        $mobile = isset($this->post['mobile']) && $this->post['mobile'] !=="" ? intval($this->post['mobile']):"";
+//        if($mobile !=""){
+//            $where[] = ['mobile',"like","%$mobile%"];
+//        }
+        $count = Db::name('supplier')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list = Db::name('supplier')->alias('a')
-            ->join("supplier_contact b","b.code=a.code","left")
-            ->where($where)->page($page,$size)->order("a.addtime desc")
-            ->field("a.*,b.contactor,b.mobile")->select();
-        return app_show("0","获取成功",['list'=>$list,'count'=>$count]);
+//        $list = Db::name('supplier')->alias('a')
+//            ->join("supplier_contact b","b.code=a.code","left")
+//            ->where($where)->page($page,$size)->order("a.addtime desc")
+//            ->field("a.*,b.contactor,b.mobile")->select();
+        $list = Db::name('supplier')->where($where)->page($page,$size)->order("addtime desc")->select();
+       $var=[];
+        foreach ($list as $value){
+            $tem = Db::name('supplier_contact')->where(['code'=>$value['code']])->field("contactor,mobile")->find();
+            $iten=[];
+            $value['contactor']=$tem['contactor'];
+            $value['mobile']=$tem['mobile'];
+            $var[]=$value;
+        }
+        return app_show("0","获取成功",['list'=>$var,'count'=>$count]);
     }
     public function edit(){
         $token = isset($this->post['token'])&&$this->post['token']!='' ? trim($this->post['token']):"";