ad

app/admin/controller/Consult.php

@@ -1946,10 +1946,10 @@ class Consult extends Base
     public function bidlist(){
         $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=[['is_del',"=",0]];
+        $where=[['a.is_del',"=",0]];
         $zxNo = isset($this->post['zxNo']) && $this->post['zxNo'] !== "" ? trim($this->post['zxNo']) : "";
         if ($zxNo !== "") {
-            $where[] = ['zxNo','like','%'.$zxNo.'%'];
+            $where[] = ['a.zxNo','like','%'.$zxNo.'%'];
         }
         $infoNo = isset($this->post['infoNo']) && $this->post['infoNo'] !== "" ? trim($this->post['infoNo']) : "";
         if ($infoNo !== "") {
@@ -1971,39 +1971,42 @@ 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");
-            $where[] = ['zxNo','in',$zxlist];
+            $where[] = ['b.projectNo','=',$projectNo];
         }
         $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不能为空');
-//            }
-//            $apply_id =GetUserInfo($token);
-//            if(empty($apply_id)||$apply_id['code']!=0){
-//                return error_show(1002,"申请人数据不存在");
-//            }
             $rm= $this->uid;//isset($apply_id["data"]['id']) ?  $apply_id["data"]['id'] : "";
-            $where[]=['createrid',"=",$rm];
+            $where[]=['a.createrid',"=",$rm];
+        }
+        $status = isset($this->post['status']) && $this->post['status'] !== "" ? intval($this->post['status']) : "";
+        if ($status !== "") {
+            $where[] = ['a.status','=',$status];
+        }
+        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+        if ($companyNo !== "") {
+            $where[] = ['companyNo','=',$companyNo];
+        }
+        $goodName = isset($this->post['goodName']) && $this->post['goodName'] !== "" ? trim($this->post['goodName']) : "";
+        if ($goodName !== "") {
+            $where[] = ['a.good_name','like','%'.$goodName.'%'];
         }
 
-        $count = Db::name('consult_bids')->where($where)->count();
+        $count = Db::name('consult_bids')->alias("a")
+        ->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;
-        $list =Db::name('consult_bids')->where($where)->page($page,$size)->select()->toArray();
+        $list =Db::name('consult_bids')->alias('a')
+        ->leftJoin('consult_order b','a.zxNo=b.zxNo')->where($where)
+        ->field("a.*,b.companyNo,b.companyName")->order("a.id desc")
+        ->page($page,$size)->select()->toArray();
         $data=[];
         $user= \app\admin\common\User::getIns();
         $supplier_temp =$user->handle("getCodeAndName",["code"=>array_column($list,"supplierNo")]);
-//        if($supplier_temp['code']!=0 || empty($supplier_temp['data']) ) throw new Exception('该供应商不存在');
 		$supplier=$supplier_temp['data']??[];
         foreach ($list as $value){
-//            $catinfo = Db::name("cat")->where(["id"=>$value['cat_id']])->find();
             $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[$value['supplierNo']])?$supplier[$value['supplierNo']]:"";
             if($value['brand_id']!=0){
                 $brand=Db::name("brand")->where(["id"=>$value['brand_id']])->find();
@@ -2015,8 +2018,6 @@ class Consult extends Base
             $bidinfo = Db::name("consult_info")->where(["infoNo"=>$value["infoNo"]])->find();
             $zx = Db::name("consult_order")->where(["zxNo"=>$value["zxNo"]])->find();
              $budget = get_budget($value['cat_id'],$zx['companyNo']??'',$zx['platform_code']??0);
-//             if($budget===false) $this->error('未找到业务公司有关的平台分类毛利信息');
-//            $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
                 $god=[
                     "metal_id"=>$value['metal_id'],
                     "weight"=>$value["good_weight"],
@@ -2027,7 +2028,6 @@ class Consult extends Base
                     "mark_fee"=>$value["mark_fee"],
                     "nake_fee"=>$value["nake_fee"],
                     "cert_fee"=>$value["cert_fee"],
-              //      "cost_fee"=>$value["cost_fee"],
                    "cost_fee"=>$value["sale_cost_fee"]!=$value['origin_cost_fee']? $value["sale_cost_fee"]: $value["cost_fee"],
                     //暂时注掉，搞不清楚原因@吴广广
                     "num"=>$bidinfo["num"],
@@ -2067,10 +2067,9 @@ class Consult extends Base
                 list($place['provice_code'],$place['city_code'],$place['area_code'])=explode(",",$value['origin_place']);
             }
             $value['origin_addr']=GetAddr(json_encode($place));
-            $tax = TaxCategory::where(['id'=>$value['tax_id']])->findOrEmpty();
-        $value['tax_short_name'] =$tax['short_name']??'';
-        $value['tax_name'] =$tax['cat_name']??'';
-        $value['tax_code'] =$tax['merge_code']??'';
+           $tax = TaxCategory::where(['id'=>[$value['tax_id'],$value['out_tax_id']]])->column('short_name,cat_name,cat_code,merge_code','id');
+            $value['in_tax'] = $tax[$value['tax_id']]??[];
+            $value['out_tax'] = $tax[$value['out_tax_id']]??[];
 		$good_info = Db::name('good_basic')
             ->field('id,createrid,creater')
             ->where('is_del',0)

app/admin/controller/Goodup.php

@@ -492,12 +492,10 @@ class Goodup extends Base
 	        $cgd_supplier_code =  isset($this->post['cgd_supplier_code'])&&$this->post['cgd_supplier_code']!=''? trim($this->post['cgd_supplier_code']):'';
 	        $cgd_apply_id =  isset($this->post['cgd_apply_id'])&&$this->post['cgd_apply_id']!=''? trim($this->post['cgd_apply_id']):'';
 	        $cgd_apply_name =  isset($this->post['cgd_apply_name'])&&$this->post['cgd_apply_name']!=''? trim($this->post['cgd_apply_name']):'';
-//	        $supplier_origin_price =  isset($this->post['supplier_origin_price'])&&$this->post['supplier_origin_price']!=''? floatval($this->post['supplier_origin_price']):'';
-	        $cgd_supplier_name='';
+            $cgd_supplier_name='';
 	        if(isset($supplierArr['relation_code']) && $supplierArr['relation_code']!='' && $isCombind==0){
 	            if($cgd_supplier_code=="")return error_show(1004,'采购供应商信息不能为空');
 	            if($cgd_apply_id=="")return error_show(1004,'采购竞单人信息不能为空');
-//	            if($supplier_origin_price==="")return error_show(1004,'采购供应商信息采购成本不能为空');
 	              $cgd_supplier =$userCommon->handle('getCodeAndName',['code'=>$cgd_supplier_code]);
 		          $cgd_supplier_name= $cgd_supplier['data'][$cgd_supplier_code]??'';
 	        }