列表筛选添加所属公司

app/abutment/controller/Consult.php

@@ -535,6 +535,8 @@ class Consult extends HomeBaseController
         $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)];
 
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") $where[]=['cb.supplierNo','=', $relaComNo];
 
         $count = Db::name('consult_bids')
             ->alias('cb')

app/admin/common/User.php

@@ -47,7 +47,6 @@ class User
         'hqInfo' => 'hqInfo',
         'delete' => 'delete',
         'status' => 'status',
-
         'sGetList' => 'sGetList',
         'sCreate' => 'sCreate',
         'sInfo' => 'sInfo',
@@ -58,6 +57,10 @@ class User
         'bEdit' => 'bEdit',
         'bTitle' => 'bTitle',
         'cTitle' => 'cTitle',
+        'getCodeAndName' => 'getCodeAndName',
+        //组织架构
+        'ulist'=>'ulist',
+        'add'=>'add',
 
     ];
 
@@ -176,6 +179,7 @@ class User
     public function handle(string $key = '', array $param = [])
     {
         $rs = $this->post($this->host . $this->api[$key], $param);
+//        echo $rs;exit;
         return json_decode($rs, true);
     }
 

app/admin/controller/After.php

@@ -215,6 +215,10 @@ class After extends Base
         if($customer_code!=""){
             $where[]=['a.customer_code',"like", "%{$customer_code}%"];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']) :"";
+        if($relaComNo!='') $where[]=['a.customer_code',"=", $relaComNo];
+
         $except_code = isset($this->post['except_code']) && $this->post['except_code']!="" ? trim($this->post['except_code']):"";
         if($except_code!=""){
             $where[]=['a.except_code',"=", $except_code];

app/admin/controller/Check.php

@@ -62,6 +62,13 @@ public function __construct(App $app)
             $wsmcode = Db::name("warehouse_info")->where(['companyNo' => $companyNo, "is_del" => 0])->column("wsm_code");
             $condition[] = ["c.wsm_code", "in", $wsmcode];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") {
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo' => $relaComNo, "is_del" => 0])->column("wsm_code");
+            $condition[] = ["c.wsm_code", "in", $wsmcode];
+        }
+
         $stock_low = isset($this->post['stock_low']) && $this->post['stock_low'] !== "" ? intval($this->post['stock_low'])
             : "";
         if ($stock_low != "") {

app/admin/controller/Consult.php

@@ -48,6 +48,9 @@ class Consult extends Base
             // $where['khNo'] = $khNo;
             $where[]= ["b.companyNo",'like',"%$companyNo%"];
         }
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo !== "")  $where[]= ['b.companyNo','=',$relaComNo];
+
         $start= isset($this->post['start']) && $this->post['start'] !== "" ? $this->post['start']:"";
         if ($start !="") {
             //$where = ["zxtime"=>Db::raw(">= '{$start}'")];
@@ -80,8 +83,7 @@ class Consult extends Base
 //        if(!empty($role['platform']) ){
 //            $where[]=["b.platform_code","in",$role['platform']];
 //        }
-        $count = Db::name('consult_info')->alias("a")->leftJoin("consult_order b","a.zxNo=b.zxNo")->where($where)
-            ->count();
+        $count = Db::name('consult_info')->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_info')
@@ -2217,6 +2219,11 @@ class Consult extends Base
         if ($status !== "") {
             $where[]= ["a.status",'=',$status];
         }
+
+        //查看非本公司的竞价单
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") $where[]=['b.companyNo','<>', $relaComNo];
+
 //        $role=$this->checkRole();
 //        if(!empty($role['platform']) ){
 //            $where[]=["b.platform_code","in",$role['platform']];

app/admin/controller/Good.php

@@ -519,12 +519,7 @@ class Good extends Base
         return app_show(0,"获取成功",$list);
     }
 
-    /**
-     * @return \think\response\Json|void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     */
+    //库存统计 区间统计
     public function GetStockBet(){
         $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;
@@ -548,6 +543,13 @@ class Good extends Base
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["wsm_code","in",$wsmcode];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!=""){
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$relaComNo,"is_del"=>0])->column("wsm_code");
+            $condition[]=["wsm_code","in",$wsmcode];
+        }
+
         $start = isset($this->post['start']) &&$this->post['start'] !=="" ? $this->post['start']:"";
         $end = isset($this->post['end']) &&$this->post['end'] !=="" ? $this->post['end']:"";
         if($start!=""){
@@ -636,13 +638,7 @@ class Good extends Base
         return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
     }
 
-    /**
-     * @return \think\response\Json|void
-     * @throws \think\db\exception\DataNotFoundException
-     * @throws \think\db\exception\DbException
-     * @throws \think\db\exception\ModelNotFoundException
-     * @throws \think\exception\DbException
-     */
+    //库存统计 仓库维度
     public function GetStockWsm(){
         $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;
@@ -661,6 +657,12 @@ class Good extends Base
             $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
             $condition[]=["gs.wsm_code","in",$wsmcode];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!=""){
+            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$relaComNo,"is_del"=>0])->column("wsm_code");
+            $condition[]=["gs.wsm_code","in",$wsmcode];
+        }
         $build= Db::name("good_stock")
             ->alias('gs')
             ->where($condition)
@@ -747,7 +749,7 @@ class Good extends Base
         return app_show(0,"获取成功",["list"=>$data,"count"=>$count]);
     }
 
-    //库存统计
+    //库存统计 商品维度
     public function GetStockGod(){
         $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;
@@ -761,6 +763,10 @@ class Good extends Base
         if ($good_name !== "") {
             $condition[] = ["b.good_name", "like", "%{$good_name}%"];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") $where[]=['b.supplierNo','=', $relaComNo];
+
         $count = Db::name("good")->alias("b")
             ->join("good_stock c","c.spuCode = b.spuCode","left")
             ->leftJoin("warehouse_info a","a.wsm_code=c.wsm_code")
@@ -856,17 +862,26 @@ class Good extends Base
             //$condition["gs.wsm_code"] = $wsm_code;
             $condition[]=["gs.wsm_code","=",$wsm_code];
         }
-        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
-        if($suplierNo!==""){
-            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
-            $condition[]=["gs.wsm_code","in",$wsmcode];
-        }
-        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
-        if ($companyNo !== "") {
-            // $where['khNo'] = $khNo;
-            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
+//        $suplierNo = isset($this->post['supplierNo']) &&$this->post['supplierNo'] !=="" ? trim($this->post['supplierNo']) :"";
+//        if($suplierNo!==""){
+//            $wsmcode = Db::name("warehouse_info")->where(['supplierNo'=>$suplierNo,"is_del"=>0])->column("wsm_code");
+//            $condition[]=["gs.wsm_code","in",$wsmcode];
+//        }
+//        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+//        if ($companyNo !== "") {
+//            // $where['khNo'] = $khNo;
+//            $wsmcode = Db::name("warehouse_info")->where(['companyNo'=>$companyNo,"is_del"=>0])->column("wsm_code");
+//            $condition[]=["gs.wsm_code","in",$wsmcode];
+//        }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") {
+            $wsmcode = Db::name("warehouse_info")
+                ->where(['supplierNo|companyNo'=>$relaComNo,"is_del"=>0])
+                ->column("wsm_code");
             $condition[]=["gs.wsm_code","in",$wsmcode];
         }
+
 //        $type_code = isset($this->post['type_code']) &&$this->post['type_code'] !=="" ? trim($this->post['type_code']):"";
 //        if($type_code!=""){
 //            $condition[] = ["gs.good_type_code","=",$type_code];
@@ -929,7 +944,7 @@ class Good extends Base
     //库存概况
     public function loglist(){
 
-        $param = $this->request->filter('trim')->only(['wsm_code'=>'','supplierNo'=>'','companyNo'=>'','is_stock'=>'','good_name'=>'','spuCode'=>'','page'=>1,'size'=>10],'post');
+        $param = $this->request->filter('trim')->only(['wsm_code'=>'','supplierNo'=>'','companyNo'=>'','is_stock'=>'','good_name'=>'','spuCode'=>'','page'=>1,'size'=>10,'relaComNo'=>''],'post');
 
 //        $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";
@@ -950,6 +965,13 @@ class Good extends Base
             $where[]=["b.wsm_code","in",$wsmcode];
         }
 
+        if ($param['relaComNo'] != '') {
+            $wsmcode = Db::name("warehouse_info")
+                ->where(['supplierNo|companyNo' => $param['relaComNo'], "is_del" => 0])
+                ->column("wsm_code");
+            $where[] = ["b.wsm_code", "in", $wsmcode];
+        }
+
         if($param['is_stock']!="") $where[]=['c.is_stock','=',$param['is_stock']];
         if($param['good_name']!="") $where[]=['c.good_name','like','%'.$param['good_name'].'%'];
         if($param['spuCode']!="") $where[]=['b.spuCode','like','%'.$param['spuCode'].'%'];

app/admin/controller/Newfill.php

@@ -11,42 +11,40 @@ use think\facade\Validate;
 //系统的组织架构
 class Newfill extends Base
 {
-    public function __construct(App $app)
-    {
-        parent::__construct($app);
-    }
-
     public function list()
     {
         $post = $this->request->only(['pid' => '', 'name' => '', 'nickname' => '', 'companyNo' => ''], 'post', 'trim');
 
-        $depart = $condition = [['is_del', '=', 0]];
-        if ($post['pid'] !== '') $condition[] = ["pid", "=", $post['pid']];
-        if ($post['name'] != "") $condition[] = ["name", "like", "%{$post['name']}%"];
-        if ($post['nickname'] != '') {
-            $is = Db::name("depart_user")
-                ->where([['nickname', 'like', "%{$post['nickname']}%"]])
-                ->column('itemid');
-
-            if (empty($is)) return json_show(1004, "未找到数据");
-
-            $condition[] = ["id", "in", $is];
-        }
-        if ($post['pid'] === '' && $post['name'] == '' && $post['nickname'] == '') $condition[] = ["pid", "=", 0];
-
-        $pidlist = Db::name("company_item")
-            ->where($condition)
-            ->column("pid");
-        if (!empty($pidlist)) $depart[] = [["itemid", "in", $pidlist]];
-        else {
-            if ($post['pid'] === "") $depart[] = ['itemid', '=', 0];
-            else $depart[] = ['itemid', '=', $post['pid']];
-        }
+//        $depart = $condition = [['is_del', '=', 0]];
+//        if ($post['pid'] !== '') $condition[] = ["pid", "=", $post['pid']];
+//        if ($post['name'] != "") $condition[] = ["name", "like", "%{$post['name']}%"];
+//        if ($post['nickname'] != '') {
+//            $is = Db::name("depart_user")
+//                ->where([['nickname', 'like', "%{$post['nickname']}%"]])
+//                ->column('itemid');
+//
+//            if (empty($is)) return json_show(1004, "未找到数据");
+//
+//            $condition[] = ["id", "in", $is];
+//        }
+//        if ($post['pid'] === '' && $post['name'] == '' && $post['nickname'] == '') $condition[] = ["pid", "=", 0];
+//
+//        $pidlist = Db::name("company_item")
+//            ->where($condition)
+//            ->column("pid");
+//        if (!empty($pidlist)) $depart[] = [["itemid", "in", $pidlist]];
+//        else {
+//            if ($post['pid'] === "") $depart[] = ['itemid', '=', 0];
+//            else $depart[] = ['itemid', '=', $post['pid']];
+//        }
+//
+//        $item = Db::name("depart_user")->where($depart)->select()->toArray();
+//        $list = Db::name("company_item")->where($condition)->select()->toArray();
 
-        $item = Db::name("depart_user")->where($depart)->select()->toArray();
-        $list = Db::name("company_item")->where($condition)->select()->toArray();
+        $userCommon = new \app\admin\common\User();
+        $rs = $userCommon->handle('ulist',$post);
 
-        return app_show(0, "获取成功", ["depart" => $list, "item" => $item]);
+        return json_show($rs['code'], $rs['message'],$rs['data']);//"获取成功", ["depart" => $list, "item" => $item]);
     }
 
     /*状态*/
@@ -123,77 +121,76 @@ class Newfill extends Base
 
     public function add()
     {
-//        $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']);
-//        }
-        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
-        if ($companyNo == '') return json_show(1004, '所属企业不能为空');
+        $param = $this->request->filter('trim')->post();
 
-        $item_name = isset($this->post['name']) && $this->post['name'] !== "" ? trim($this->post['name']) : "";
-        if ($item_name == "") {
-            return error_show(0, "部门名称不能为空");
-        }
-        $repeat_name = Db::name("company_item")
-            ->where(["is_del" => 0, "name" => $item_name, 'companyNo' => $companyNo])
-            ->findOrEmpty();
-        if (!empty($repeat_name)) {
-            return error_show(1004, "部门名称已存在");
-        }
-        $pid = isset($this->post['pid']) && $this->post['pid'] !== "" ? trim($this->post['pid']) : "";
-        if ($pid === "") {
-            return error_show(1002, "父级id不能为空");
-        }
-        //$spid = Db::name('company_item')->where(['id'=>$pid,'is_del'=>0])->find();
-        $spid = ['depart_link' => ""];
-        if ($pid != 0) {
-            $spid = Db::name('company_item')->where(['id' => $pid, 'is_del' => 0])->find();
-            if (empty($spid)) {
-                return error_show(1004, "父级数据不能为空");
-            }
-        }
-        $level = isset($this->post['level']) && $this->post['level'] !== "" ? trim($this->post['level']) : "1";
-        $weight = isset($this->post['weight']) && $this->post['weight'] !== "" ? trim($this->post['weight']) : "1";
-        Db::startTrans();
-        try {
-            $data = [
-                "name" => $item_name,
-                "pid" => $pid,
-                "level" => $level,
-                "weight" => $weight,
-                "is_del" => 0,
-                'companyNo' => $companyNo,
-                "addtime" => date("Y-m-d H:i:s"),
-                "updatetime" => date("Y-m-d H:i:s"),
-            ];
+        $userCommon = new \app\admin\common\User();
+        $rs = $userCommon->handle('add',$param);
 
-            $t = Db::name("company_item")->insert($data, true);
-            if ($t > 0) {
-                $orde = ["order_code" => $repeat_name['name'], "status" => 0, "action_remark" => '', "action_type" => "creat"];
-                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], $orde, "company_item", 0, $orde);
-                $depart_link = $spid['depart_link'] . "{$t}-";
-                $level = explode('-', $depart_link);
-                $level = array_filter($level);
-                $level = count($level);
-                $i = ['depart_link' => $depart_link, 'level' => $level];
-                $o = Db::name('company_item')->where(['id' => $t])->update($i);
-                if ($o) {
-                    $stn = ["order_code" => $repeat_name['name'], "status" => 0, "action_remark" => '', "action_type" => "edit"];
-                    ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], $stn, "company_item", 0, $stn);
-                    Db::commit();
-                    return error_show(0, "添加成功");
-                }
-            }
-            Db::rollback();
+        return json_show($rs['code'],$rs['message'],$rs['data']);
 
-        } catch (\Exception $e) {
-            Db::rollback();
-            return error_show(1003, $e->getMessage());
-        }
+//        $companyNo = isset($this->post['companyNo']) && $this->post['companyNo'] !== "" ? trim($this->post['companyNo']) : "";
+//        if ($companyNo == '') return json_show(1004, '所属企业不能为空');
+//
+//        $item_name = isset($this->post['name']) && $this->post['name'] !== "" ? trim($this->post['name']) : "";
+//        if ($item_name == "") {
+//            return error_show(0, "部门名称不能为空");
+//        }
+//        $repeat_name = Db::name("company_item")
+//            ->where(["is_del" => 0, "name" => $item_name, 'companyNo' => $companyNo])
+//            ->findOrEmpty();
+//        if (!empty($repeat_name)) {
+//            return error_show(1004, "部门名称已存在");
+//        }
+//        $pid = isset($this->post['pid']) && $this->post['pid'] !== "" ? trim($this->post['pid']) : "";
+//        if ($pid === "") {
+//            return error_show(1002, "父级id不能为空");
+//        }
+//
+//        $spid = ['depart_link' => ""];
+//        if ($pid != 0) {
+//            $spid = Db::name('company_item')->where(['id' => $pid, 'is_del' => 0])->find();
+//            if (empty($spid)) {
+//                return error_show(1004, "父级数据不能为空");
+//            }
+//        }
+//        $level = isset($this->post['level']) && $this->post['level'] !== "" ? trim($this->post['level']) : "1";
+//        $weight = isset($this->post['weight']) && $this->post['weight'] !== "" ? trim($this->post['weight']) : "1";
+//        Db::startTrans();
+//        try {
+//            $data = [
+//                "name" => $item_name,
+//                "pid" => $pid,
+//                "level" => $level,
+//                "weight" => $weight,
+//                "is_del" => 0,
+//                'companyNo' => $companyNo,
+//                "addtime" => date("Y-m-d H:i:s"),
+//                "updatetime" => date("Y-m-d H:i:s"),
+//            ];
+//
+//            $t = Db::name("company_item")->insert($data, true);
+//            if ($t > 0) {
+//                $orde = ["order_code" => $repeat_name['name'], "status" => 0, "action_remark" => '', "action_type" => "creat"];
+//                ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], $orde, "company_item", 0, $orde);
+//                $depart_link = $spid['depart_link'] . "{$t}-";
+//                $level = explode('-', $depart_link);
+//                $level = array_filter($level);
+//                $level = count($level);
+//                $i = ['depart_link' => $depart_link, 'level' => $level];
+//                $o = Db::name('company_item')->where(['id' => $t])->update($i);
+//                if ($o) {
+//                    $stn = ["order_code" => $repeat_name['name'], "status" => 0, "action_remark" => '', "action_type" => "edit"];
+//                    ActionLog::logAdd(['id' => $this->uid, 'nickname' => $this->uname], $stn, "company_item", 0, $stn);
+//                    Db::commit();
+//                    return error_show(0, "添加成功");
+//                }
+//            }
+//            Db::rollback();
+//
+//        } catch (\Exception $e) {
+//            Db::rollback();
+//            return error_show(1003, $e->getMessage());
+//        }
     }
 
     public function refresh()

app/admin/controller/Orderback.php

@@ -45,6 +45,10 @@ class Orderback extends Base
         if($customer_code!=""){
             $where[]=['customer_code',"like", "%{$customer_code}%"];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") $where[]=['customer_code','=', $relaComNo];
+
         $order_code = isset($this->post['order_code']) && $this->post['order_code']!="" ? trim($this->post['order_code']):"";
         if($order_code!=""){
             $where[]=['orderCode',"like", "%{$order_code}%"];

app/admin/controller/Project.php

@@ -355,6 +355,10 @@ class Project extends Base
         if($companyNo!==''){
             $where[]=["p.companyNo","like","%$companyNo%"];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != '') $where[] = ["p.companyNo", "=", $relaComNo];
+
         $platform_id = isset($this->post['platform_id'])&&$this->post['platform_id']!=="" ? intval($this->post['platform_id']):"";
         if($platform_id!==''){
             $where[]=["p.platform_id","=",$platform_id];

app/admin/controller/Purch.php

@@ -115,6 +115,8 @@ class Purch extends Base
         $supplier_name = isset($this->post['supplier_name']) && $this->post['supplier_name'] != "" ? $this->post['supplier_name'] : "";
         if ($supplier_name != '') $where[] = ['po.supplier_name', 'like', '%' . $supplier_name . '%'];
 
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != "") $where[] = ['po.supplierNo|po.companyNo', '=', $relaComNo];
 
 //		$whereor=[];
 //        if(!empty($role['write'])){

app/admin/controller/Purchin.php

@@ -99,6 +99,9 @@ class Purchin extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["a.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!='') $where[]=['b.supplierNo|b.companyNo','=', $relaComNo];
+
         //$count = Db::name('purchease_in')->alias('a')->join("purchease_order b","b.cgdNo=a.cgdNo","left")
         $count = Db::name('purchease_in')
             ->alias('a')
@@ -1364,6 +1367,10 @@ class Purchin extends Base
         if($status!=""){
             $where[]= ["a.status",'=',$status];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!='') $where[]=['b.supplierNo|b.companyNo','=', $relaComNo];
+
 //        $role = $this->checkDataShare();
 //        if (!empty($role[DataGroupModel::$type_全部])) $where[] = ["a.apply_id", "in", $role[DataGroupModel::$type_全部]];
         	    $role = $this->checkDataShare();

app/admin/controller/Reorder.php

@@ -438,6 +438,9 @@ class Reorder extends Base
             $where[] = ['b.skuCode', "like", "%{$skuCode}%"];
         }
 
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] != "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != "") $where[] = ['b.customer_code|b.supplierNo', '=', $relaComNo];
+
         $condition=[];
 //        $role=$this->checkRole();
 //        if(!empty($role['write']) && $this->uid!=""){

app/admin/controller/Resign.php

@@ -98,6 +98,9 @@ class Resign extends Base
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["p.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo !== "") $where[] = ["p.companyNo|p.supplierNo", '=', $relaComNo];
+
 //        if(!empty($role['platform']) ){
 //            $where[]=["p.platform_id","in",$role['platform']];
 //        }

app/admin/controller/Role.php

@@ -305,15 +305,22 @@ class Role extends Base
     {
         $post = $this->request->only(["relaComNo" => "", "companyNo" => ""], "post", "trim");
         $where = [];
-        if (isset($post['relaComNo']) && $post['relaComNo'] != '') $where[] = ["companyNo", "=", $post['relaComNo']];
-        if (isset($post['companyNo']) && $post['companyNo'] != '') $where[] = ["companyNo", "=", $post['companyNo']];
+        if ($post['relaComNo'] != '') $where[] = ["companyNo", "=", $post['relaComNo']];
+        if ($post['companyNo'] != '') $where[] = ["companyNo", "=", $post['companyNo']];
         $list = Db::name("role")
-            ->alias("a")
-            ->leftJoin("supplier_info b", "a.companyNo=b.code")
-            ->field("a.*,b.name as companyName")
+            ->field(true)
             ->where($where)
             ->select()
             ->toArray();
+
+        $companyNo = array_column($list,'companyNo');
+
+        $companyNames = get_headquarters_code_and_name($companyNo);
+
+        foreach ($list as &$value){
+            $value['companyName'] = $companyNames[$value['companyNo']]??'';
+        }
+
         return app_show(0, "获取成功", $list);
     }
 
@@ -348,10 +355,10 @@ class Role extends Base
 
         if (!$val->check($param)) return error_show(1005, $val->getError());
 
-        $user = GetUserInfo($param['token']);
+//        $user = GetUserInfo($param['token']);
 
-        $uid = isset($user['data']['id']) ? $user['data']['id'] : 0;
-        $uname = isset($user['data']['nickname']) ? $user['data']['nickname'] : '';
+        $uid = $this->uid;//isset($user['data']['id']) ? $user['data']['id'] : 0;
+        $uname = $this->uname;//isset($user['data']['nickname']) ? $user['data']['nickname'] : '';
         $date = date('Y-m-d H:i:s');
 
         $res = Db::name('role_process')

app/admin/controller/Sale.php

@@ -2155,6 +2155,10 @@ class Sale extends Base
         if ($supplierNo !== "") {
             $where[] = ['s.supplierNo', "like", "%$supplierNo%"];
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo !== '') $where[] = ['s.supplierNo|s.customer_code', '=', $relaComNo];
+
         $ordertype = isset($this->post['order_type']) && $this->post['order_type'] !== "" ? intval($this->post['order_type']) : "";
         if ($ordertype !== "") {
             $where[] = ['s.order_type', "=", $ordertype];
@@ -3495,6 +3499,10 @@ class Sale extends Base
             $where[] = ['b.customer_code', "like", "%$companyNo%"];
 
         }
+
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo'] !== "" ? trim($this->post['relaComNo']) : "";
+        if ($relaComNo != '') $where[] = ['b.customer_code|b.supplierNo', '=', $relaComNo];
+
         $cgdNo = isset($this->post['cgdNo']) && $this->post['cgdNo'] !== "" ? $this->post['cgdNo'] : "";
         if ($cgdNo != "") {
             $where[] = ["os.cgdNo", 'like', '%' . $cgdNo . '%'];

app/admin/controller/WareHouse.php

@@ -129,10 +129,10 @@ class WareHouse extends Base
 //        if($supplier!=""){
 //            $condition[]=["supplierNo","=",$supplier];
 //        }
-        $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
-        if($companyNo!=""){
-            $condition[]=["companyNo","=",$companyNo];
-        }
+//        $companyNo = isset($post['companyNo'])&&$post['companyNo']!="" ? trim($post['companyNo']) :"";
+//        if($companyNo!=""){
+//            $condition[]=["companyNo","=",$companyNo];
+//        }
         $wsm_code = isset($post['wsm_code'])&&$post['wsm_code']!="" ? trim($post['wsm_code']) :"";
         if($wsm_code!=""){
             $condition[]=["a.wsm_code","like","%{$wsm_code}%"];
@@ -169,6 +169,9 @@ class WareHouse extends Base
         if($companyNo!=""){
             $condition[]=["a.companyNo","like","%{$companyNo}%"];
         }
+        $relaComNo = isset($this->post['relaComNo']) && $this->post['relaComNo']!="" ? trim($this->post['relaComNo']):"";
+        if($relaComNo!="") $condition[]=['a.companyNo','=', $relaComNo];
+
         $wsm_type = isset($post['wsm_type'])&&$post['wsm_type']!="" ? (int)($post['wsm_type']) :0;
         if($wsm_type){
             $condition[]=["a.wsm_type",'=',$wsm_type];

app/common.php

@@ -1536,4 +1536,14 @@ if(!function_exists('menuAction')){
             menuAction($temp,$list);
         }
     }
+}
+
+//获取汇总表中的编码和名称
+if (!function_exists('get_headquarters_code_and_name')) {
+    function get_headquarters_code_and_name(array $code = []): array
+    {
+        $userCommon = new \app\admin\common\User();
+        $res = $userCommon->handle('getCodeAndName', ['code' => $code]);
+        return $res['data'];
+    }
 }