dd

app/admin/controller/After.php

@@ -314,7 +314,7 @@ class After extends \app\BaseController
                 $in=Db::name("order_returninfo")->save($returninfo);
                 if($in){
                     $order = ["order_code"=>$info['returnCode'],"status"=>$var,"action_remark"=>'',"action_type"=>"edit"];
-                    ActionLog::logAdd($this->post['token'],$order,$info['status'],$order);
+                    ActionLog::logAdd($this->post['token'],$order,"AFTER",$info['status'],$order);
                     Db::commit();
                     return app_show(0,"更新成功");
                 }

app/admin/controller/Orderback.php

@@ -76,6 +76,11 @@ class Orderback extends \app\BaseController
                 $value['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
                 $value['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
             }
+            $value['customer_name']='';
+            if($value['customer_code']!=''){
+                $customer = Db::name("customer_info")->where(['companyNo'=>$value['customer_code']])->find();
+                $value['customer_name']=isset($customer['companyName'])?$customer['companyName']:'';
+            }
             $inorder= Db::name("order_backinfo")->where(['thNo'=>$value['thNo'],"is_del"=>0])->select();
             $value['child']=empty($inorder)? [] : $inorder;
             $data[]=$value;
@@ -108,7 +113,8 @@ class Orderback extends \app\BaseController
           $info['wsm_supplier'] =isset($wsmcode['name']) ? $wsmcode['name']:"";
           $info['wsm_supplierNo'] =isset($wsmcode['code']) ? $wsmcode['code']:"";
       }
-      $inorder= Db::name("order_backinfo")->where(['thNo'=>$info['thNo'],"is_del"=>0])->select();
+      $inorder= Db::name("order_backinfo")->alias("a")->leftJoin("result_info b","a.error_code=b.result_code")
+          ->where(['a.thNo'=>$info['thNo'],"a.is_del"=>0])->field("a.*,b.result as error_msg")->select();
       $info['child']=empty($inorder)? [] : $inorder;
       return  app_show(0,"获取成功",$info);
   }