Merge branch 'dev_wf' of wugg/phpstock into version1.5

app/admin/controller/Consult.php

@@ -2209,17 +2209,14 @@ class Consult extends Base
         $size = isset($this->post['size']) && $this->post['size'] !== "" ? intval($this->post['size']) : "10";
         $where = [['cb.is_del', "=", 0],['c.status','<>',6]];//不要'取消转单'状态下的数据
         $zxNo = isset($this->post['zxNo']) && $this->post['zxNo'] !== "" ? trim($this->post['zxNo']) : "";
-        if ($zxNo !== "") {
-            $where[] = ['cb.zxNo', 'like', '%' . $zxNo . '%'];
-        }
+        if ($zxNo !== "") $where[] = ['cb.zxNo', 'like', '%' . $zxNo . '%'];
+
         $infoNo = isset($this->post['infoNo']) && $this->post['infoNo'] !== "" ? trim($this->post['infoNo']) : "";
-        if ($infoNo !== "") {
-            $where[] = ['cb.infoNo', 'like', '%' . $infoNo . '%'];
-        }
+        if ($infoNo !== "") $where[] = ['cb.infoNo', 'like', '%' . $infoNo . '%'];
+
         $bidNo = isset($this->post['bidNo']) && $this->post['bidNo'] !== "" ? trim($this->post['bidNo']) : "";
-        if ($bidNo !== "") {
-            $where[] = ['cb.bidNo', 'like', '%' . $bidNo . '%'];
-        }
+        if ($bidNo !== "") $where[] = ['cb.bidNo', 'like', '%' . $bidNo . '%'];
+
         $pgNo = isset($this->post['pgNo']) && $this->post['pgNo'] !== "" ? trim($this->post['pgNo']) : "";
         if ($pgNo !== "") {
             $bidinfo = Db::name("consult_info")->where([["pgNo", "=", $pgNo], ["is_del", "=", 0]])->column("infoNo");
@@ -2232,31 +2229,35 @@ class Consult extends Base
         }
         $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
-            ("zxNo");
+            $zxlist = Db::name("consult_order")->where(["projectNo" => $projectNo, "is_del" => 0, "is_project" => 1])->column("zxNo");
             $where[] = ['cb.zxNo', 'in', $zxlist];
         }
         $is_own = isset($this->post['is_own']) ? intval($this->post['is_own']) : "0";
         if ($is_own == 1) {
             $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-            if ($token == "") {
-                return error_show(101, 'token不能为空');
-            }
+            if ($token == "") return error_show(101, 'token不能为空');
+
             $apply_id = GetUserInfo($token);
-            if (empty($apply_id) || $apply_id['code'] != 0) {
-                return error_show(1002, "申请人数据不存在");
-            }
+            if (empty($apply_id) || $apply_id['code'] != 0) return error_show(1002, "申请人数据不存在");
+
             $rm = isset($apply_id["data"]['id']) ? $apply_id["data"]['id'] : "";
             $where[] = ['cb.createrid', "=", $rm];
         }
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["cb.createrid", 'in', get_company_item_user_by_name($company_name)];
 
+        $good_name = isset($this->post['good_name']) && $this->post['good_name'] !== "" ? trim($this->post['good_name']) : "";
+        if ($good_name !== "") $where[] = ["cb.good_name", 'like', '%' . $good_name . '%'];
+
+        $supplierName = isset($this->post['supplierName']) && $this->post['supplierName'] !== "" ? trim($this->post['supplierName']) : "";
+        if ($supplierName !== "") $where[] = ["s.name", 'like', '%' . $supplierName . '%'];
+
 
         $count = Db::name('consult_bids')
             ->alias('cb')
             ->leftJoin("depart_user u", "u.uid=cb.createrid AND u.is_del=0")
             ->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
+            ->leftJoin('supplier s', 's.code=cb.supplierNo')
             ->where($where)
             ->count();
 
@@ -2264,9 +2265,10 @@ class Consult extends Base
         $page = $page >= $total ? $total : $page;
         $list = Db::name('consult_bids')
             ->alias('cb')
-            ->field('cb.*,u.itemid')
+            ->field('cb.*,u.itemid,s.name supplierName')
             ->leftJoin("depart_user u", "u.uid=cb.createrid AND u.is_del=0")
             ->leftJoin("consult_info c", "c.infoNo=cb.infoNo")
+            ->leftJoin('supplier s', 's.code=cb.supplierNo')
             ->where($where)
             ->page($page, $size)
             ->order('cb.addtime', 'desc')
@@ -2277,8 +2279,8 @@ class Consult extends Base
             $value['can'] = isset($value['cat_id']) && $value['cat_id'] != 0 ? made($value['cat_id']) : [];
             $unit = Db::name("unit")->where(["id" => $value['unit_id']])->find();
             $value['unit'] = isset($unit['unit']) ? $unit['unit'] : '';
-            $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
-            $value['supplierName'] = isset($supplier['name']) ? $supplier['name'] : "";
+//            $supplier = Db::name("supplier")->where(["code" => $value['supplierNo']])->find();
+//            $value['supplierName'] = isset($supplier['name']) ? $supplier['name'] : "";
             if ($value['brand_id'] != 0) {
                 $brand = Db::name("brand")->where(["id" => $value['brand_id']])->find();
                 $value["brand_name"] = isset($brand['brand_name']) ? $brand['brand_name'] : "";