ad

app/admin/controller/After.php

@@ -56,6 +56,10 @@ class After extends Base
         $error =Db::name('result_info')->where(["result_code"=>$errorCode,"is_del"=>0])->find();
         if(empty($error)){
             return error_show(1005,"未找到退货原因数据");
+        }
+         $supplier =Db::name("supplier")->where(["code"=>$goon['supplierNo']])->find();
+        if($supplier==false){
+            return error_show(1005,"未找到商品供应商数据");
         }
         $remark =isset($this->post['remark']) &&$this->post['remark']!=''?trim($this->post['remark']) :"";
         $is_receive =isset($this->post['is_receive']) &&$this->post['is_receive']!==''?intval($this->post['is_receive']):"";
@@ -101,6 +105,8 @@ class After extends Base
                 "apply_name"=>$ri,
                 "cgder"=>$wsm['contactor_name'],
                 "cgderid"=>$wsm['contactor'],
+                "person"=>$supplier['person']??'',
+                "person_id"=>$supplier['personid']??0,
                 'total_num'=>$orderout['send_num'],
                 "error_code"=>$errorCode,
                 "error_num"=>$num,
@@ -204,7 +210,7 @@ class After extends Base
         $condition='';
         if(!empty($role['write']) && $this->uid!=""){
             // $where[]=["a.apply_id","in",$role['write']];
-            $condition .="a.cgderid = {$this->uid} or a.apply_id in (".implode(',',$role['write']).")";
+            $condition .="a.cgderid = {$this->uid} or a.apply_id in (".implode(',',$role['write']).") or a.person_id={$this->uid}";
         }
         $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)];
@@ -1032,6 +1038,8 @@ class After extends Base
                         "apply_name"=>$info['apply_name'],
                         "cgder"=>$info['cgder'],
                         "cgderid"=>$info['cgderid'],
+                        "person"=>$info['person'],
+                        "person_id"=>$info['person_id'],
                         "contactor"=>$returninfo["contactor"],
                         "mobile"=>$returninfo["mobile"],
                         "addr"=>$returninfo["addr"],

app/admin/controller/Orderback.php

@@ -68,7 +68,7 @@ class Orderback extends Base
         $condition='';
         if(!empty($role['write']) && $this->uid!=""){
             // $where[]=["a.apply_id","in",$role['write']];
-            $condition .="cgderid = {$this->uid} or apply_id in (".implode(',',$role['write']).")";
+            $condition .="cgderid = {$this->uid} or apply_id in (".implode(',',$role['write']).") or a.person_id={$this->uid}";
         }
 //        if(!empty($role['platform']) ){
 //            $where[]=["platform_id","in",$role['platform']];