Merge branch 'wugg-dev' of wugg/phpstock into version1.5

app/admin/controller/Activity.php

@@ -57,7 +57,10 @@ class Activity extends Base
         if($createrid!==""){
             $where[]=['createrid',"=",$createrid];
         }
-
+//        $role=$this->checkRole();
+//        if(!empty($role['write'])){
+//            $where[]=["apply_id","in",$role['write']];
+//        }
         $count = Db::name('good_activity')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/After.php

@@ -10,13 +10,13 @@ use think\facade\Db;
 use think\facade\Validate;
 
 //售后
-class After extends \app\BaseController
+class After extends Base
 {
-    public $post=[];
+  //  public $post=[];
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post =$this->request->post();
+//        $this->post =$this->request->post();
     }
 
     public function create(){
@@ -167,6 +167,10 @@ class After extends \app\BaseController
         if($end!==""){
             $where[]=['a.addtime',"<=", $end];
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["apply_id","in",$role['write']];
+        }
         $count=Db::name("order_return")->alias("a")->leftJoin("order_returninfo b","a.returnCode=b.returnCode")->where
         ($where)->count();
         $total = ceil($count/$size);

app/admin/controller/Consult.php

@@ -60,6 +60,10 @@ class Consult extends Base
         if ($status !== "") {
             $where[]= ["a.status",'=',$status];
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["b.createrid","in",$role['write']];
+        }
         $count = Db::name('consult_info')->alias("a")->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)
             ->count();
         $total = ceil($count / $size);
@@ -1885,6 +1889,7 @@ class Consult extends Base
             $bidinfo = Db::name("consult_info")->where([["pgNo","=",$pgNo],["is_del","=",0]])->column("infoNo");
             $where[] = ['infoNo','in',$bidinfo];
         }
+
         $count=Db::name("bargain_order")->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/Orderback.php

@@ -12,13 +12,11 @@ use think\facade\Db;
 use think\facade\Validate;
 
 //退货单
-class Orderback extends \app\BaseController
+class Orderback extends  Base
 {
-    public $post=[];
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post =$this->request->post();
     }
 
     public function list(){
@@ -66,6 +64,10 @@ class Orderback extends \app\BaseController
         if($end!==""){
             $where[]=['addtime',"<=", $end];
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["apply_id","in",$role['write']];
+        }
         $count=Db::name("order_back")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/Project.php

@@ -307,6 +307,10 @@ class Project extends Base
         if($platform_id!==''){
             $where[]=["platform_id","=",$platform_id];
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["createrid","in",$role['write']];
+        }
         $count = Db::name('project')->where($where)->count();
         $total = ceil($count / $size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/Purch.php

@@ -106,7 +106,10 @@ class Purch extends Base
             //$where['lasttime'] = Db::raw(" <= '{$last_end}'");
             $where[]=['lasttime',"<=", $last_end];
         }
-
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["cgder_id","in",$role['write']];
+        }
         $count=Db::name("purchease_order")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/Purchin.php

@@ -9,13 +9,12 @@ use think\facade\Db;
 use think\App;
 
 //采购单入库
-class Purchin extends BaseController
+class Purchin extends Base
 {
-    public $post="";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post=$this->request->post();
+      // $this->post=$this->request->post();
 
     }
 
@@ -81,6 +80,10 @@ class Purchin extends BaseController
                 "is_del"=>0,"supplierNo"=>$supplierNo])->column("wsm_code");
             $where[]=['a.wsm_code',"in",$wsmcode];
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["apply_id","in",$role['write']];
+        }
         $count = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
             ->where($where)->count();
         $total = ceil($count/$size);

app/admin/controller/Reorder.php

@@ -301,6 +301,10 @@ class Reorder extends \app\BaseController
         if($end!==""){
             $where[]=['addtime',"<=", $end];
         }
+//        $role=$this->checkRole();
+//        if(!empty($role['write'])){
+//            $where[]=["apply_id","in",$role['write']];
+//        }
         $count=Db::name("sale_return")->where($where)->count();
         $total = ceil($count/$size);
         $page = $total>=$page ? $page :$total;

app/admin/controller/Resign.php

@@ -8,26 +8,15 @@ namespace app\admin\controller;
 use app\admin\model\ActionLog;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
-use app\BaseController;
 use think\facade\Db;
 use think\App;
 
 //备货
-class Resign extends BaseController
+class Resign extends Base
 {
-    public $post="";
     public function __construct(App $app)
     {
         parent::__construct($app);
-        $this->post = $this->request->post();
-        $token = isset($this->post['token']) ? trim($this->post['token']) : "";
-        if($token==""){
-            return error_show(101,'token不能为空');
-        }
-        $effetc = VerifyTokens($token);
-        if(!empty($effetc) && $effetc['code']!=0) {
-            return error_show($effetc['code'], $effetc['message']);
-        }
     }
     public function list(){
         $page = isset($this->post['page']) && $this->post['page'] !=="" ? intval($this->post['page']):"1";
@@ -81,6 +70,10 @@ class Resign extends BaseController
            // $where['addtime'] = Db::Raw("<= '{$end}'");
             $where[]=['addtime',"<=",$end];
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["apply_id","in",$role['write']];
+        }
         $count=Db::name("purchease")->where($where)->count();
         $total = ceil($count/$size);
         $page = $page >= $total ? $total : $page;

app/admin/controller/Sale.php

@@ -2573,24 +2573,15 @@ class Sale extends Base
         if ($end != "") {
             $where[] = ["a.addtime", '<=', $end];
         }
-//        $apply_name = isset($this->post['apply_name']) && $this->post['apply_name'] !==""? intval($this->post['apply_name']):"";
-//        if($apply_name!==""){
-//            $where[]=['a.apply_name',"like","%$apply_name%"];
-//        }
         $supplierNo = isset($this->post['supplierNo']) && $this->post['supplierNo'] !== "" ? trim($this->post['supplierNo']) : "";
         if ($supplierNo != "") {
-//            $supplier = Db::name("business")->where([['code', "like", "%$supplierNo%"]])->column('code');
-////            if(empty($supplier)){
-////                return error_show(1004,"未找到供应商信息");
-////            }
-//            $wsmcode = Db::name("sale")->where(["is_del" => 0, "supplierNo" => $supplier])->column("orderCode");
             $where[] = ['c.supplierNo', "like", "%$supplierNo%"];
         }
         $companyNo =isset($this->post['companyNo']) &&$this->post['companyNo'] !=="" ? trim($this->post['companyNo']):"";
         if($companyNo!=""){
             $where[]=['c.customer_code',"like","%$companyNo%"];
-
         }
+
         $count = Db::name('sale_diff')->alias('a')
             ->join("sale c", "c.orderCode=a.orderCode", "left")
             ->join("customer_info v", "v.companyNo=c.customer_code", "left")
@@ -2805,6 +2796,10 @@ class Sale extends Base
             $where[]=['b.customer_code',"like","%$companyNo%"];
 
         }
+        $role=$this->checkRole();
+        if(!empty($role['write'])){
+            $where[]=["apply_id","in",$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")