ad

app/admin/controller/Consult.php

@@ -1634,7 +1634,7 @@ class Consult extends Base
     /**
      * status:
      * 0待审核 1业务主管审核通过 2 业务税率未通过 3 业务驳回 4 专员通过 5 专员驳回 6 财务通过 7 财务税率未通过 8财务驳回 9 boss通过 10 boss 税率越线通过 11 驳回 12取消
-     * change 0待审核 1业务主管审核通过 2 业务驳回 3 业务通过 4 业务主管越线通过 5取消议价
+     * change 0待审核 1业务主管审核通过 2 业务驳回  3 业务主管越线通过4取消议价
      */
     public function bargain_status(){
         $bargainNo = isset($this->post['bargainNo'])&& $this->post['bargainNo']!=""?trim($this->post['bargainNo']):"";
@@ -1645,7 +1645,7 @@ class Consult extends Base
         if($info==false){
             return error_show(1004,"未找到议价数据");
         }
-        if($info['status']==5){
+        if($info['status']==4){
            return error_show(1004,"议价单已取消");
         }
         $bids=Db::name("consult_bids")->where(["bidNo"=>$info["bidsNo"],"is_del"=>0])->find();
@@ -1674,15 +1674,13 @@ class Consult extends Base
 
         $budget = isset($catinfo['order_rate']) ? $catinfo['order_rate']:0;
         $rate = isset($catinfo['rate']) ? $catinfo['rate']/100:0; //业务主管利率
-//        $money_rate = isset($catinfo['money_rate']) ? $catinfo['money_rate']:0;//财务主管利率
-//        $lower_rate = isset($catinfo['lower_rate']) ? $catinfo['lower_rate']:0;//boss主管利率
         if($bids['is_gold_price']==1){
             $gold = Db::name("gold_price1")->where(["type"=>$bids['metal_id'],"is_del"=>0,"status"=>1])->order("addtime desc")
                 ->find();
             //$saleprice(最终售价) = （开模费/购买数量 + 商品重量* 最新金价 + 工艺费* 商品重量+包装费+加标费+证书费+产品裸价）/(1-成本售价/100);
             $total_fe= $bids['demo_fee'] / $coninfo['num']+$bids['delivery_fee']+$bids['open_fee'] / $coninfo['num'] +
                 $bids['good_weight']*$gold["price"] +$bids['cost_fee']*$bids['good_weight'] + $bids['pakge_fee'] +$bids['mark_fee'] + $bids['cert_fee'] + $bids['nake_fee'];
-            $saleprice =$total_fe / (1 - $budget);
+//            $saleprice =$total_fe / (1 - $budget);
             $rate_price = $total_fe / (1 - $rate);
         }else{
             $total_fe= $bids['demo_fee']/$coninfo['num']+$bids['delivery_fee']+$bids['open_fee'] /
@@ -1696,14 +1694,11 @@ class Consult extends Base
 
         }
         $ra_status = $info['status'];
+         $info['status']=$status;
         if($status==1){
 			    if($info['after_price']<$rate_price){
-                    $info['status']=4;
-                }else{
                     $info['status']=3;
                 }
-        }else{
-        	 $info['status']=$status;
         }
         $remark = isset($this->post['remark'])&& $this->post['remark']!=""?trim($this->post['remark']):"";
         $createrid= $this->uid;//isset($user["data"]['id']) ?  $user["data"]['id'] : "";
@@ -1820,15 +1815,6 @@ class Consult extends Base
             //业务主管利率
             $info['rate_status'] =1;
         }
-        elseif ($info['after_rate']>=$catinfo['money_rate']){
-            //财务主管利率
-            $info['rate_status'] =2;
-        }
-        elseif ($info['after_rate']>=$catinfo['lower_rate']){
-            //boss利率
-            $info['rate_status'] =3;
-        }
-
 
         $god=[
             "metal_id"=>$bidinfos['metal_id'],

app/admin/controller/Purchin.php

@@ -224,12 +224,9 @@ class Purchin extends Base
             $data[]=$value;
         }
 
-
-
-
-
         return app_show(0,"获取成功",['list'=>$data,'count'=>$count]);
     }
+
     public function  add(){
         $cgdNo = isset($this->post['cgdNo']) && $this->post['cgdNo']!=""? trim($this->post['cgdNo']):"";
         if($cgdNo==""){
@@ -258,12 +255,6 @@ class Purchin extends Base
         if($sendtype==""){
             return error_show(1004,"参数 sendtype 不能为空");
         }
-
-//        $data = GetUserInfo($this->post['token']);
-//        if((!empty($data) && $data['code']!=0) ||empty($data) ){
-//            return error_show($data['code'],$data['message']);
-//        }
-//        $userinfo = $data['data'];
         $post_company = isset($this->post['post_company'])&&$this->post['post_company']!="" ? trim($this->post['post_company']):"";
         $post_code = isset($this->post['post_code'])&&$this->post['post_code']!="" ? trim($this->post['post_code']):"";
         $post_fee = isset($this->post['post_fee'])&&$this->post['post_fee']!="" ? $this->post['post_fee']:"0";