销售退货单优化

app/admin/controller/Base.php

@@ -126,8 +126,6 @@ class Base extends \app\BaseController
          * data[DataGroupModel::$type_只读] 2只读
          */
 
-        if(!empty($data[DataGroupModel::$type_全部])) $data['write']=$data[DataGroupModel::$type_全部];//兼容以前的写法
-
         return $data;
     }
 

app/admin/controller/Reorder.php

@@ -3,6 +3,7 @@
 
 namespace app\admin\controller;
 
+use app\admin\model\DataGroup as DataGroupModel;
 use app\admin\model\GoodLog;
 use app\admin\model\ProcessOrder;
 use think\facade\Db;
@@ -372,13 +373,11 @@ class Reorder extends Base
         if($status!==""){
             $where[]=['sr.status',"=", $status];
         }
-        $orderCode = isset($this->post['orderCode']) && $this->post['orderCode']!="" ? trim($this->post['orderCode'])
-            :"";
+        $orderCode = isset($this->post['orderCode']) && $this->post['orderCode']!="" ? trim($this->post['orderCode']) :"";
         if($orderCode!=""){
             $where[]=['sr.orderCode',"like", "%{$orderCode}%"];
         }
-        $apply_name = isset($this->post['apply_name']) && $this->post['apply_name']!="" ? trim($this->post['apply_name'])
-            :"";
+        $apply_name = isset($this->post['apply_name']) && $this->post['apply_name']!="" ? trim($this->post['apply_name']) :"";
         if($apply_name!=""){
             $where[]=['sr.apply_name',"like", "%{$apply_name}%"];
         }
@@ -390,12 +389,15 @@ class Reorder extends Base
         if($end!==""){
             $where[]=['sr.addtime',"<=", $end.' 23:59:59'];
         }
-        $role=$this->checkRole();
         $condition='';
-        if(!empty($role['write']) && $this->uid!=""){
-            // $where[]=["sr.apply_id","in",$role['write']];
-            $condition .="sr.cgderid = {$this->uid} or sr.apply_id in (".implode(',',$role['write']).")";
-        }
+//        $role=$this->checkRole();
+//        if(!empty($role['write']) && $this->uid!=""){
+//            // $where[]=["sr.apply_id","in",$role['write']];
+//            $condition .="sr.cgderid = {$this->uid} or sr.apply_id in (".implode(',',$role['write']).")";
+//        }
+        $role = $this->checkDataShare();
+        if (!empty($role[DataGroupModel::$type_全部])) $condition .= "sr.cgderid = {$this->uid} or sr.apply_id in (" . implode(',', $role[DataGroupModel::$type_全部]) . ")";
+
         $company_name = isset($this->post['company_name']) && $this->post['company_name'] !== "" ? trim($this->post['company_name']) : "";
         if ($company_name !== "") $where[] = ["sr.apply_id", 'in', get_company_item_user_by_name($company_name)];
 
@@ -424,6 +426,11 @@ class Reorder extends Base
             $value['return_total'] =$value['sale_price']*$value['num'] ;
             $value['total_num'] =$order['good_num'] ;
             $value['company_name'] = implode('/', array_column(GetPart($value['itemid']), 'name'));
+
+            //是否具有编辑权限
+            $value['is_allow_update'] = 0;
+            if (in_array($this->roleid, [1, 33]) || in_array($value['apply_id'], $role[DataGroupModel::$type_可编辑])) $value['is_allow_update'] = 1;
+
             $data[]=$value ;
         }
         return app_show(0,"获取成功",['list'=>$data,"count"=>$count]);